30 files changed, 50843 insertions, 59726 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 865fc389..42c0d498 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-07
+
+	* POTFILES.in: updated.
+	* updated pt_BR.po.
+
 2005-08-31
 
 	* POTFILES.in: updated.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8405e875..d8943cb6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,23 @@
+libsylph/account.c
 libsylph/base64.c
 libsylph/codeconv.c
+libsylph/filter.c
+libsylph/folder.c
+libsylph/imap.c
+libsylph/mh.c
+libsylph/news.c
+libsylph/nntp.c
+libsylph/pop.c
 libsylph/prefs.c
+libsylph/prefs_account.c
+libsylph/prefs_common.c
+libsylph/procheader.c
+libsylph/procmime.c
+libsylph/procmsg.c
 libsylph/quoted-printable.c
 libsylph/recv.c
 libsylph/session.c
+libsylph/smtp.c
 libsylph/socket.c
 libsylph/ssl.c
 libsylph/stringtable.c
@@ -12,7 +26,6 @@ libsylph/utils.c
 libsylph/uuencode.c
 libsylph/xml.c
 src/about.c
-src/account.c
 src/action.c
 src/addrbook.c
 src/addrcache.c
@@ -32,15 +45,12 @@ src/editldap_basedn.c
 src/editvcard.c
 src/export.c
 src/filesel.c
-src/filter.c
-src/folder.c
 src/foldersel.c
 src/folderview.c
 src/grouplistdialog.c
 src/gtkutils.c
 src/headerview.c
 src/imageview.c
-src/imap.c
 src/import.c
 src/importldif.c
 src/inc.c
@@ -55,15 +65,9 @@ src/menu.c
 src/message_search.c
 src/messageview.c
 src/mgutils.c
-src/mh.c
 src/mimeview.c
-src/news.c
-src/nntp.c
 src/passphrase.c
-src/pop.c
-src/prefs_account.c
 src/prefs_actions.c
-src/prefs_common.c
 src/prefs_customheader.c
 src/prefs_display_header.c
 src/prefs_filter.c
@@ -71,16 +75,12 @@ src/prefs_filter_edit.c
 src/prefs_folder_item.c
 src/prefs_summary_column.c
 src/prefs_template.c
-src/procheader.c
-src/procmime.c
-src/procmsg.c
 src/progressdialog.c
 src/rfc2015.c
 src/select-keys.c
 src/send_message.c
 src/setup.c
 src/sigstatus.c
-src/smtp.c
 src/sourcewindow.c
 src/statusbar.c
 src/summary_search.c
diff --git a/po/bg.po b/po/bg.po
index d181ec43..e8fc86e7 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -16,13 +16,397 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Четене на конфигурация за всеки акаунт...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "неуспешно записване на настройките във файл\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 връзката до %s се разпадна. Свързване...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP директория на сървъра"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "създаване на IMAP4 връзка до %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Не може да се стартира TLS сесия.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Изпращане на съобщение (%d / %d байта)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Копиране на съобщение %s%c%d във %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Копиране на съобщение %s%c%d във %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Получаване на съобщения от %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "не могат да се установят изтрити флагове: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "не може да се заличи\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Получаване на съобщения от %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "не могат да се установят изтрити флагове: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "не може да затвори папка\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "коренната папка %s не съществува\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "грешка при получаване на LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Не може да се създаде '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Не може да се създаде '%s' под Входящи\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "Не може да се създаде пощенска кутия\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "Не може да се изтрие пощенска кутия\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "не може да се вземе envelope\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Изпращане на съобщение (%d / %d байта)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "грешка при вземане на envelope.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "не може да се анализира envelope: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "не може да се получи пространството от имена\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "не може да се избере папка: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 удостоверяване провалено.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 влизане провалено.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "не може да се прибави %s към %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(изпращане на файл...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "съобщението не може да се прибави към %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "не може да се копира %s в %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "грешка при imap команда: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "грешка при imap команда: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "грешка при imap команда: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv не може да преобразува UTF-7 до %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv не може да преобразува %s до UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "не може да се копира съобщението %s във %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Не може да се отвори файлът с маркировките.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "изходната папка е еднаква с назначението.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Копиране на съобщение %s%c%d във %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr ""
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Файлът `%s' вече съществува.\n"
+"Папката не може да се създаде."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "създаване на NNTP връзка до %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP връзката до %s:%d беше прекъсната. Свързване...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "статия %d е вече кеширана.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "взимане на статия %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "не може да се прочете статия %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "не може да се извлече списък на новинарска група\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "не може да се публикува статия.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "не може да се извлече статия %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "не може да се избере група %s\n"
+
+#: libsylph/news.c:778
+#, fuzzy, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "Невалиден обхват на статии: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "няма нови статии.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "получаване на xover %d - %d в %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "не може да се получи xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "грешка при получаването на xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "невалиден xover ред: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "не може да се получи xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "грешка при получаването на xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Не може да се установи връзка с NNTP сървър: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "протоколна грешка: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "протоколна грешка\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Появи се грешка при публикуване\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Появи се грешка изпращане на съобщението."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Не е намерен необходим APOP времеви отпечатък в поздрава\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Синтактична грешка във времевия отпечатък в поздрава\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 протоколна грешка\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "невалиден xover ред: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Изтриване на съобщениe с изтекъл срок %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Прескачане на съобщение %d (%d байта)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "пощенската кутия е заключена\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "сесията е просрочена\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "не може да се стартира TLS сесия\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "грешка при удостоверяване\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "командата не се поддържа\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "грешка при POP3 сесията\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -32,6 +416,53 @@ msgstr "Намерени %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройките са запазени.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Папка"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr ""
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "не може да се отвори файлът с маркировките\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "не може да се вземе съобщението %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Не може да се намери текстовата част\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Невалиден команден ред за печат: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "възникна грешка при получаване на данни.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Не може да се запише във файл.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH не е наличен\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "грешен SMTP отговор\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "грешка при SMTP сесията\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "не е наличен SSLv23\n"
@@ -163,78 +594,6 @@ msgstr ""
 "програмата; в случай, че не сте, обърнете се към Free Software Foundation, "
 "Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Четене на конфигурация за всеки акаунт...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Има отворени прозорци за съставяне.\n"
-"Моля затворете всички прозорци за съставяне преди редакция на акаунтите."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Отваряне на прозорец за редакция на акаунта...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Създаване на прозорец за редакция на акаунта...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Редакция на акаунтите"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
-"в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Име"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Протокол"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Сървър"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Редактиране"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Избиране като акаунт по подразбиране"
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Желаете ли да изтриете този акаунт?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Неозаглавен"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Изтриване на акаунт"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -334,6 +693,14 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Име"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -348,8 +715,8 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Файл"
 
@@ -370,9 +737,9 @@ msgid "/_File/New _Server"
 msgstr "/_Файл/Нов _Сървър"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
@@ -388,7 +755,7 @@ msgstr "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
@@ -420,8 +787,8 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
@@ -429,13 +796,13 @@ msgstr "/_Инструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
@@ -452,17 +819,17 @@ msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
@@ -474,7 +841,7 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -484,14 +851,14 @@ msgstr "Име:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Изтриване"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -502,11 +869,11 @@ msgid "Lookup"
 msgstr "Справка"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -533,7 +900,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -646,7 +1013,7 @@ msgstr "Грешка при конвертиране на адресната к�
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -666,8 +1033,7 @@ msgstr "EMail Адрес"
 msgid "Group"
 msgstr "Група"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Папка"
 
@@ -691,15 +1057,15 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Забележка"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Грешка"
 
@@ -754,8 +1120,8 @@ msgstr "/_Добавяне"
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
@@ -799,8 +1165,8 @@ msgstr "/_Редактиране/_Отмяна"
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
@@ -808,7 +1174,7 @@ msgstr "/_Редактиране/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
@@ -820,7 +1186,7 @@ msgstr "/_Редактиране/_Вмъкване"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
@@ -837,7 +1203,7 @@ msgstr "/_Редактиране/П_ренасяне на всички дълг�
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Изглед"
@@ -859,9 +1225,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
@@ -877,7 +1243,7 @@ msgstr "/_Изглед/_Линия"
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
@@ -889,127 +1255,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
@@ -1017,14 +1383,14 @@ msgstr "/_Инструменти/_Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
@@ -1048,10 +1414,6 @@ msgstr "/_Съобщение/_Криптиране"
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Не може да се намери текстовата част\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
@@ -1128,7 +1490,7 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
@@ -1220,8 +1582,7 @@ msgstr "MIME тип"
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Изпращане"
 
@@ -1261,8 +1622,7 @@ msgstr "Прикрепване"
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Сигнатура"
 
@@ -1270,7 +1630,7 @@ msgstr "Сигнатура"
 msgid "Insert signature"
 msgstr "Вмъкване на сигнатура"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Редактор"
 
@@ -1467,7 +1827,7 @@ msgstr "Променяне"
 msgid "Clear"
 msgstr "Изчистване"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Стойност"
 
@@ -1500,7 +1860,6 @@ msgid " Check File "
 msgstr " Проверка на файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Файл"
 
@@ -1556,12 +1915,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -1578,7 +1937,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1642,7 +2001,7 @@ msgstr "Пауза (сек)"
 msgid "Maximum Entries"
 msgstr "Максимум записи"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Основни"
 
@@ -1699,7 +2058,6 @@ msgid "Exporting file:"
 msgstr "Изходен файл:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "Избор..."
 
@@ -1723,163 +2081,163 @@ msgstr "Желаете ли презаписване на съществуващ
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Създаване на _нова папка..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Изтриване на папка"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Търсене на съобщения..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Няма непрочетени съобщения."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Записване в новинарска група"
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Премахване на новинарска група"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Създаване на изглед на папка...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Нови"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочетени"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Установяване информация за папка...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1889,21 +2247,21 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1914,21 +2272,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1937,34 +2295,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2025,7 +2383,7 @@ msgstr "%d новинарски групи получени (%s прочетен
 msgid "Newsgroups:"
 msgstr "Новинарски групи:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -2049,160 +2407,6 @@ msgstr "Създаване изглед на изображение...\n"
 msgid "Can't load the image."
 msgstr "Не може да се зареди изображението."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 връзката до %s се разпадна. Свързване...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP директория на сървъра"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "създаване на IMAP4 връзка до %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Не може да се стартира TLS сесия.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "не могат да се установят изтрити флагове: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "не може да се заличи\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "не могат да се установят изтрити флагове: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "не може да затвори папка\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "коренната папка %s не съществува\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "грешка при получаване на LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Не може да се създаде '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Не може да се създаде '%s' под Входящи\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "Не може да се създаде пощенска кутия\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "Не може да се изтрие пощенска кутия\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "не може да се вземе envelope\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "грешка при вземане на envelope.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "не може да се анализира envelope: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "не може да се получи пространството от имена\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "не може да се избере папка: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 удостоверяване провалено.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 влизане провалено.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "не може да се прибави %s към %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(изпращане на файл...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "съобщението не може да се прибави към %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "не може да се копира %s в %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "грешка при imap команда: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "грешка при imap команда: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "грешка при imap команда: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv не може да преобразува UTF-7 до %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv не може да преобразува %s до UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Внасяне"
@@ -2300,7 +2504,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Следващ"
 
@@ -2316,144 +2520,144 @@ msgstr "Атрибути"
 msgid "Finish"
 msgstr "Завършване"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Стар Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Получаване (%d съобщения (%s) получени)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2462,28 +2666,28 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2492,11 +2696,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2505,16 +2709,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -2532,29 +2736,20 @@ msgstr "Въведете парола"
 msgid "Protocol log"
 msgstr "Протоколен журнал"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Файлът `%s' вече съществува.\n"
-"Папката не може да се създаде."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не се поддържа от glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr " --compose [адрес]    отваряне на прозорец за съставяне"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2564,23 +2759,23 @@ msgstr ""
 "                         отваряне на прозорец за съставяне с прикрепени\n"
 "                         указаните файлове."
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive             получаване на нови съобщения"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all\t     получаване на нови съобщения от всички акаунти"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 изпращане на всички съобщения в опашката"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...   показване на пълния брой на съобщения"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2588,25 +2783,25 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         показване на състоянието на всяка папка"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr ""
 "  --help                 извеждане на тази помощна информация и излизане"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              извеждане на версията и излизане"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Изходяща кодова таблица"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2620,20 +2815,20 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Съставя се ново съобщение. Желаете ли изход от програмата?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Съобщения в опашката"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2642,660 +2837,660 @@ msgstr ""
 "OpenPGP поддръжката е отменена."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Папка"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Папка/Създаване на _нова папка"
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Папка/_Изтриване на папка"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/П_ремахване на пощенска кутия"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/_Папка/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/_Папка/_Проверка за нови съобщения във всички папки"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Файл/_Внасяне на mbox файл..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Файл/_Изнасяне на mbox файл..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Изпразване на _кошчето"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Файл/Пе_чат..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Файл/_Работа без мрежа"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Файл/Из_ход"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Редактиране/Избор по _тема"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Редактиране/_Търсене в текущото съобщение..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Редактиране/Търсене в _съобщенията..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Изглед/Показване или _скриване"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Изглед/Показване или _скриване/_Дърво на папките"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Изглед/Показване или _скриване/_Изглед на съобщенията"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Изглед/Показване или _скриване/_Лента"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Икони и _текст"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Т_екст"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Без показване"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Изглед/_Сортиране/по _номер"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Изглед/_Сортиране/по _размер"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Изглед/_Сортиране/по п_олучател"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Изглед/_Сортиране/по _тема"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Изглед/_Сортиране/по _цвят"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Изглед/_Сортиране/по _отбелязване"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Изглед/_Сортиране/по _непрочетени"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Изглед/_Сортиране/по _притурка"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Изглед/_Сортиране/_Без сортиране"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Изглед/_Сортиране/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Изглед/_Сортиране/Възходящо"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Изглед/_Сортиране/_Привличане по тема"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Изглед/_Нишков изглед"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Изглед/_Развиване на всички нишки"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Изглед/_Свиване на всички нишки"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Изглед/Атрибути на извадката"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Изглед/П_реход до"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Изглед/П_реход до/_Предишно съобщение"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Изглед/П_реход до/_Следващо съобщение"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Изглед/П_реход до/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Изглед/П_реход до/П_редишно непрочетено съобщение"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Изглед/П_реход до/С_ледващо непрочетено съобщение"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Изглед/П_реход до/Предишно _ново съобщение"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Изглед/П_реход до/Следващо н_ово съобщение"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Изглед/П_реход до/Предишно _маркирано съобщение"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Изглед/П_реход до/Следващо м_аркирано съобщение"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Изглед/П_реход до/Предишно _оцветено съобщение"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Изглед/П_реход до/Следващо о_цветено съобщение"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Изглед/_Показване на заглавните части(headers)"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3305,16 +3500,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3323,153 +3518,152 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
@@ -3585,32 +3779,32 @@ msgstr "Достигнат е краят на съобщението; продъ
 msgid "Search finished"
 msgstr "Търсенето приключи"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Създаване на изглед на съобщениято...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Притурки"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3619,7 +3813,7 @@ msgstr ""
 "Въведете командния ред за печат:\n"
 "(`%s' ще бъде заменен с име на файл)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3628,41 +3822,6 @@ msgstr ""
 "Невалиден команден ред за печат:\n"
 "'%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "не може да се копира съобщението %s във %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Не може да се отвори файлът с маркировките.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "изходната папка е еднаква с назначението.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Копиране на съобщение %s%c%d във %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr ""
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Отваряне"
@@ -3749,116 +3908,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Командния ред за MIME преглед е невалиден: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "създаване на NNTP връзка до %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP връзката до %s:%d беше прекъсната. Свързване...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "статия %d е вече кеширана.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "взимане на статия %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "не може да се прочете статия %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "не може да се извлече списък на новинарска група\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "не може да се публикува статия.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "не може да се извлече статия %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "не може да се избере група %s\n"
-
-#: src/news.c:781
-#, fuzzy, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "Невалиден обхват на статии: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "няма нови статии.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "получаване на xover %d - %d в %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "не може да се получи xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "грешка при получаването на xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "невалиден xover ред: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "не може да се получи xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "грешка при получаването на xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Не може да се установи връзка с NNTP сървър: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "протоколна грешка: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "протоколна грешка\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Появи се грешка при публикуване\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Появи се грешка изпращане на съобщението."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Парола"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[няма потребителски id]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3871,7 +3929,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3879,455 +3937,6 @@ msgstr ""
 "Неправилна парола! Опитайте отново...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Не е намерен необходим APOP времеви отпечатък в поздрава\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Синтактична грешка във времевия отпечатък в поздрава\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 протоколна грешка\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "невалиден xover ред: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Изтриване на съобщениe с изтекъл срок %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Прескачане на съобщение %d (%d байта)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "пощенската кутия е заключена\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "сесията е просрочена\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "не може да се стартира TLS сесия\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "грешка при удостоверяване\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "командата не се поддържа\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "грешка при POP3 сесията\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Отваряне на прозорец с предпочитанията за акаунта...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Акаунт%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Предпочитания за нов акаунт"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Предпочитания за акаунт"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Получаване"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Неприкосновеност"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Напреднал"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Име на акаунтът"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Установяване като подразбиращ се"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Лична информация"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Пълно име"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Пощенски адрес"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Организация"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Информация за сървъра"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Новини (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Без (локално)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Сървърът изисква удостоверяване"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Новинарски сървър"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Сървър за получаване"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP сървър (изпращане)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Потребителски ID"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Парола"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Сървърът изисква удостоверяване"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Изтриване съобщенията от сървъра когато се получат"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Премахване след"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "дни"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 дни: незабавно премахване)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Изтегляне на всички съобщения от сървъра"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Ограничение на размера при получаване"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "КB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Филтриране на съобщенията при получаване"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Входяща кутия"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Метод на удостоверяване"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Автоматично"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Новини"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Максимален брой изтегляни статии\n"
-"(неограничено ако е въведена 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Не е указан получател"
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "'Получаване всички' проверява за нови съобщения в този акаунт"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Заглавна част"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Добавяне на заглавна част Дата"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Генериране на Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Добавяне на заглавна част от потребителя"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Редактиране... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Удостоверяване"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP Удостоверяване (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Ако оставите тези полета празни, ще бъдат използвани\n"
-"същите user ID и парола като за получаване."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Удостоверяване с POP3 преди изпращане"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Изход на команда"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Автоматично установяване на следните адреси"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Отговор-до"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Подписване по подразбиране"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Криптиране по подразбиране"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Използване на ASCII-armored формат за криптиране"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Използване на подпис в чист текст"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Подписващ ключ"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Използване на подразбиращия се GnuPG ключ"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Избор на ключ по вашия email адрес"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Ръчен избор на ключ"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "ID на потребителя или ключа:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Не се използва SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Използване на SSL за POP3 връзка"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Използване на STARTTLS команда за старт на SSL сесия"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Използване на SSL за IMAP4 връзка"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Използване на SSL за NNTP връзка"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Изпращане (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Използване на SSL за SMTP връзка"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Използване на неблокиращ SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(Изключете ако имате проблеми с SSL връзка)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Определяне на SMTP порт"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Определяне на POP3 порт"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Определяне на IMAP4 порт"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Определяне на NNTP порт"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Определяне на име на домейн"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP директория на сървъра"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Поставяне на изпратени съобщения в"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Поставяне на черновите в"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Поставяне на изтрити съобщения в"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Не е въведено име на акаунта."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Не е въведен пощенски адрес."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Не е въведен SMTP сървър."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Не е въведен потребителски ID."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Не е въведен POP3 сървър."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Не е въведен IMAP4 сървър."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Не е въведен NNTP сървър."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Не се препоръчва използването на стария ASCII-armored\n"
-"метод за криптирани съобщения. Той не спазва\n"
-"RFC 3156 - MIME Security with OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Конфигурация на действия"
@@ -4392,17 +4001,17 @@ msgstr " Помощ за синтаксиса"
 msgid "Registered actions"
 msgstr "Регистрирани действия"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Нагоре"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Надолу"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Нов)"
 
@@ -4445,837 +4054,31 @@ msgstr "Изтриване на действие"
 msgid "Do you really want to delete this action?"
 msgstr "Желаете ли изтриване на действието?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Папка"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Създаване на прозорец за общи предпочитания...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Общи Предпочитания"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Цитат"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Дисплей"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Съобщение"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Други"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Използване на външна програма за приемане"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Команда"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Приемане от спул"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Филтриране при приемане"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Автоматично проверяване за нова поща"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "всеки"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "минута(и)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Проверка за нова поща при стартиране"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Обновяване на всички локални папки след приемане"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Взимане на броят на нови съобщения (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Използване на външна програма за изпращане"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Запазване на изпратените съобщения в Изпратени"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Изходяща кодова таблица"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Автоматично (Препоръчително)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Уникод (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Западно европейски (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Западно европейски (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Централно европейски (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Балтийски (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Балтийски (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Гръцки (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Гръцки (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Кирилица (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Турски (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Кирилица (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Кирилица (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Кирилица (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Кирилица (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Японски (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Японски (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Японски (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Опростен китайски (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Опростен китайски (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Традиционен китайски (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Традиционен китайски (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Китайски (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Корейски (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Тайландски (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Тайландски (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Ако е избрано `Автоматично', ще бъде избрано\n"
-"оптималното за текущия локал кодиране."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Преносно кодиране"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Укажете Преносно Кодиране на Съдържанието(Content-Transfer-Encoding)\n"
-"използвано когато тялото на съобщението съдържа не-ASCII знаци."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Разделител на сигнатурата"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Автоматично вмъкване"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Автоматично стартиране на външен редактор"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Ниво на отмяна"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Пренасяне на съобщенията на"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "знака"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Пренасяне на цитат"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Пренасяне при въвеждане"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Пренасяне преди изпращане"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Автоматично избиране на акаунт за отговор"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Цитиране на съобщението при отговаряне"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Бутона за отговор изпълнява отговор до пощенски списък"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Формат на отговора"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Маркиране на цитат"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Формат на препращане"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Описание на символите "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Шрифт"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Превеждане на име на заглавна част (като 'From:', 'Subject:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Показване на броя на непрочетените до името на папката"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Съкращаване на новинарски групи по дълги от"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "букви"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Изглед на извадката"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Показване на получателя в `От' колоната, ако изпращача сте вие"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Развиване на нишките..."
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Формат на датата"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr "Определяне на атрибути на извадката"
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Позволяване на оцветяване на съобщение"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Показване на multi-byte азбука и цифри като\n"
-"ASCII знаци (само за Японски)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Панел със заглавна част над изгледа на съобщението"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Показване на кратки заглавни части в изгледа на съобщението"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Показване на кратки заглавни части в изгледа на съобщението"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Разстояние м/у редовете"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "пиксел(а)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Превъртане"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Половин страница"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Плавно превъртане"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Стъпка"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "Разпъване на прикрепени изображения"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Настройка на показваните заглавки части"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Изпълняване"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Изпълняване"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Папка"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Филтриране на съобщенията при получаване"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Автоматична проверка на подписите"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Показване в отделен прозорец на резултата от проверка на подписа"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Временно съхраняване на паролата в паметта"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Невалидно след"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "минута(и)"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Установяване на `0' ще съхранява паролата\n"
-"през цялата сесия)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Прехващане на входа при въвеждане на парола"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Показване на предупреждение при стартиране, ако GnuPG не работи"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Отваряне винаги на съобщенията избрани в извадката"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Отваряне на първото непрочетено съобщение при влизане в папка"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Маркиране като прочетено само на съобщение отворено в нов прозорец"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Влизане във входящата кутия след получаване на нови съобщения"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Съобщенията ще бъдат маркирани до изпълнението\n"
-"ако това е изключено)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Диалог при получаване"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Показване на диалог при получаване"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Винаги"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Само при ръчно получаване"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Никога"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Без повдигане на диалог за грешка при грешка при получаване"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Затваряне на диалога при получаване когато завърши"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr "Определяне на клавишни комбинации"
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Външни команди (%s ще бъде заменен с име на файл / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Уеб браузър"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Добавяне на адреса в назначението при двойно щракване"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "При излизане"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Потвърждение при излизане"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Изчистване на Кошчето на излизане"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Питане преди изчистване"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Предупреждение ако има съобщения в опашката"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Записване на кеша на извадката (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Просрочка на В/И порт:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "секунда(и)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "напълно съкратеното име на делника"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "пълното име на делника"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "съкратеното име на месеца"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "пълното име на месеца"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "предпочитаната дата и час за текущия локал"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "век (годинa/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "денят от месеца като десетично число"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "часа като десетично число ползвайки 24-часов часовник"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "часа като десетично число ползвайки 12-часов часовник"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "деня от годината като десетично число"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "месеца като десетично число"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "минутата като десетично число"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "или AM или PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "секундата като десетично число"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "деня от седмицата като десетично число"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "предпочитаната дата за текущия локал"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "последните две цифри от годината"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "годината като десетично число"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "времевата зона или име или съкращение"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Идентификатор"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Описание"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Пример"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Определяне на цветове на съобщението"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Цветове"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Цитиран Текст - Първо Ниво"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Цитиран Текст - Второ Ниво"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Цитиран Текст - Трето Ниво"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI връзка"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Преизползване на цветовете за цитат"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Изберете цвят за цитат първо ниво"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Изберете цвят за цитат второ ниво"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Изберете цвят за цитат трето ниво"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Изберете цвят за URL"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Описание на символите"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Дата\n"
-"От\n"
-"Пълно име на подател\n"
-"Първо име на подател\n"
-"Инициали на подател\n"
-"Тема\n"
-"До\n"
-"Cc\n"
-"Новинарски групи\n"
-"Message-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Ако x е установен, показва expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Тяло на съобщение\n"
-"Цитирано тяло на съобщение\n"
-"Тяло на съобщение без подпис\n"
-"Цитирано тяло на съобщение без подпис\n"
-"Символ %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Символ наклонена черта\n"
-"Символ въпросителен знак\n"
-"Символ отваряща къдрава скоба\n"
-"Символ затваряща къдрава скоба"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Клавишни комбинации"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Изберете набор от клавишни комбинации.\n"
-"Можете също да променяте препратките на всяко меню като натиснете\n"
-"кой да е клавиш(и) при поставяне на показалеца на мишката върху тях."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "По подразбиране"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Стар Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Собствена конфигурация на заглавни части"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Заглавна част"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Изтриване"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Настоящи собствени заглавни части"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Не е въведено име на заглавната част."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Изтриване на заглавна част"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Желаете ли да изтриете тази заглавна част?"
 
@@ -5323,12 +4126,21 @@ msgstr "Установяване на филтър"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Редактиране"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Желаете ли да изтриете правилото?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Неозаглавен"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Изтриване на правило"
 
@@ -5417,6 +4229,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "КB"
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5558,6 +4374,10 @@ msgstr "Изтриване на [...] или (...) в началото на те
 msgid "Apply to subfolders"
 msgstr "Прилагане към подпапки"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Автоматично установяване на следните адреси"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "използване и при отговор"
@@ -5632,64 +4452,46 @@ msgstr "Показани атрибути"
 msgid " Revert to default "
 msgstr "Връщане към подразбиращите се"
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Име на шаблон"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Регистриране"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr "Замяна"
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Символи "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Регистрирани шаблони"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Шаблони"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Грешка във формата на шаблона."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Изтриване на шаблона"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Желаете ли да изтриете шаблонът?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr ""
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "не може да се отвори файлът с маркировките\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "не може да се вземе съобщението %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Невалиден команден ред за печат: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Създаване на диалог на прогреса...\n"
@@ -5698,29 +4500,21 @@ msgstr "Създаване на диалог на прогреса...\n"
 msgid "Status"
 msgstr "Статус"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "възникна грешка при получаване на данни.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Не може да се запише във файл.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Не може да се намери потребителски ID за ключът."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Подписът е направен на %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Грешка при проверяване на подписът"
 
@@ -5746,6 +4540,10 @@ msgstr "ID на ключ"
 msgid "Val"
 msgstr ""
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Други"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Добавяне на ключ"
@@ -5766,84 +4564,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Повредена заглавна част на съобщение в опашката.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Изпълняване"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Свързване"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Свързване с SMTP сървър: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Изпращане на HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Удостоверяване"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Изпращане на съобшение..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Изпращане на EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Изпращане на MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Изпращане"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Изпращане на RCPT ДО..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Изпращане на DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Прекъсване..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Изпращане на съобшение"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5944,32 +4742,20 @@ msgstr "НЕВАЛИДЕН подпис"
 msgid "No public key to verify the signature"
 msgstr "Няма публичен ключ за проверка на подписът"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH не е наличен\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "грешен SMTP отговор\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "грешка при SMTP сесията\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Създаване на прозорец с изходния код...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Изходен код на съобщението"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Показване на изходния код на %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Изходен код"
@@ -6364,6 +5150,920 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Има отворени прозорци за съставяне.\n"
+#~ "Моля затворете всички прозорци за съставяне преди редакция на акаунтите."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Отваряне на прозорец за редакция на акаунта...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Създаване на прозорец за редакция на акаунта...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Редакция на акаунтите"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
+#~ "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
+
+#~ msgid "Protocol"
+#~ msgstr "Протокол"
+
+#~ msgid "Server"
+#~ msgstr "Сървър"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Избиране като акаунт по подразбиране"
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Желаете ли да изтриете този акаунт?"
+
+#~ msgid "Delete account"
+#~ msgstr "Изтриване на акаунт"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Отваряне на прозорец с предпочитанията за акаунта...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Акаунт%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Предпочитания за нов акаунт"
+
+#~ msgid "Account preferences"
+#~ msgstr "Предпочитания за акаунт"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Получаване"
+
+#~ msgid "Privacy"
+#~ msgstr "Неприкосновеност"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Напреднал"
+
+#~ msgid "Name of this account"
+#~ msgstr "Име на акаунтът"
+
+#~ msgid "Set as default"
+#~ msgstr "Установяване като подразбиращ се"
+
+#~ msgid "Personal information"
+#~ msgstr "Лична информация"
+
+#~ msgid "Full name"
+#~ msgstr "Пълно име"
+
+#~ msgid "Mail address"
+#~ msgstr "Пощенски адрес"
+
+#~ msgid "Organization"
+#~ msgstr "Организация"
+
+#~ msgid "Server information"
+#~ msgstr "Информация за сървъра"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Новини (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Без (локално)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Сървърът изисква удостоверяване"
+
+#~ msgid "News server"
+#~ msgstr "Новинарски сървър"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Сървър за получаване"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP сървър (изпращане)"
+
+#~ msgid "User ID"
+#~ msgstr "Потребителски ID"
+
+#~ msgid "Password"
+#~ msgstr "Парола"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Сървърът изисква удостоверяване"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Изтриване съобщенията от сървъра когато се получат"
+
+#~ msgid "Remove after"
+#~ msgstr "Премахване след"
+
+#~ msgid "days"
+#~ msgstr "дни"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 дни: незабавно премахване)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Изтегляне на всички съобщения от сървъра"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Ограничение на размера при получаване"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Филтриране на съобщенията при получаване"
+
+#~ msgid "Default inbox"
+#~ msgstr "Входяща кутия"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Метод на удостоверяване"
+
+#~ msgid "Automatic"
+#~ msgstr "Автоматично"
+
+#~ msgid "News"
+#~ msgstr "Новини"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Максимален брой изтегляни статии\n"
+#~ "(неограничено ако е въведена 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Не е указан получател"
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "'Получаване всички' проверява за нови съобщения в този акаунт"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Добавяне на заглавна част Дата"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Генериране на Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Добавяне на заглавна част от потребителя"
+
+#~ msgid " Edit... "
+#~ msgstr " Редактиране... "
+
+#~ msgid "Authentication"
+#~ msgstr "Удостоверяване"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP Удостоверяване (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Ако оставите тези полета празни, ще бъдат използвани\n"
+#~ "същите user ID и парола като за получаване."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Удостоверяване с POP3 преди изпращане"
+
+#~ msgid "Command output"
+#~ msgstr "Изход на команда"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Отговор-до"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Подписване по подразбиране"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Криптиране по подразбиране"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Използване на ASCII-armored формат за криптиране"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Използване на подпис в чист текст"
+
+#~ msgid "Sign key"
+#~ msgstr "Подписващ ключ"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Използване на подразбиращия се GnuPG ключ"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Избор на ключ по вашия email адрес"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Ръчен избор на ключ"
+
+#~ msgid "User or key ID:"
+#~ msgstr "ID на потребителя или ключа:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Не се използва SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Използване на SSL за POP3 връзка"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Използване на STARTTLS команда за старт на SSL сесия"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Използване на SSL за IMAP4 връзка"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Използване на SSL за NNTP връзка"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Изпращане (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Използване на SSL за SMTP връзка"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Използване на неблокиращ SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(Изключете ако имате проблеми с SSL връзка)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Определяне на SMTP порт"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Определяне на POP3 порт"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Определяне на IMAP4 порт"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Определяне на NNTP порт"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Определяне на име на домейн"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP директория на сървъра"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Поставяне на изпратени съобщения в"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Поставяне на черновите в"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Поставяне на изтрити съобщения в"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Не е въведено име на акаунта."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Не е въведен пощенски адрес."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Не е въведен SMTP сървър."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Не е въведен потребителски ID."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Не е въведен POP3 сървър."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Не е въведен IMAP4 сървър."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Не е въведен NNTP сървър."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Не се препоръчва използването на стария ASCII-armored\n"
+#~ "метод за криптирани съобщения. Той не спазва\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Създаване на прозорец за общи предпочитания...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Общи Предпочитания"
+
+#~ msgid "Quote"
+#~ msgstr "Цитат"
+
+#~ msgid "Display"
+#~ msgstr "Дисплей"
+
+#~ msgid "Message"
+#~ msgstr "Съобщение"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Използване на външна програма за приемане"
+
+#~ msgid "Command"
+#~ msgstr "Команда"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Приемане от спул"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Филтриране при приемане"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Автоматично проверяване за нова поща"
+
+#~ msgid "every"
+#~ msgstr "всеки"
+
+#~ msgid "minute(s)"
+#~ msgstr "минута(и)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Проверка за нова поща при стартиране"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Обновяване на всички локални папки след приемане"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Взимане на броят на нови съобщения (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Използване на външна програма за изпращане"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Запазване на изпратените съобщения в Изпратени"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Изходяща кодова таблица"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Автоматично (Препоръчително)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Уникод (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Западно европейски (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Западно европейски (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Централно европейски (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Балтийски (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Балтийски (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Гръцки (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Гръцки (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Кирилица (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Турски (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Кирилица (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Кирилица (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Кирилица (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Кирилица (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Японски (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Японски (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Японски (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Опростен китайски (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Опростен китайски (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Традиционен китайски (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Традиционен китайски (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Китайски (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Корейски (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Тайландски (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Тайландски (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Ако е избрано `Автоматично', ще бъде избрано\n"
+#~ "оптималното за текущия локал кодиране."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Преносно кодиране"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Укажете Преносно Кодиране на Съдържанието(Content-Transfer-Encoding)\n"
+#~ "използвано когато тялото на съобщението съдържа не-ASCII знаци."
+
+#~ msgid "Signature separator"
+#~ msgstr "Разделител на сигнатурата"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Автоматично вмъкване"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Автоматично стартиране на външен редактор"
+
+#~ msgid "Undo level"
+#~ msgstr "Ниво на отмяна"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Пренасяне на съобщенията на"
+
+#~ msgid "characters"
+#~ msgstr "знака"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Пренасяне на цитат"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Пренасяне при въвеждане"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Пренасяне преди изпращане"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Автоматично избиране на акаунт за отговор"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Цитиране на съобщението при отговаряне"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Бутона за отговор изпълнява отговор до пощенски списък"
+
+#~ msgid "Reply format"
+#~ msgstr "Формат на отговора"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Маркиране на цитат"
+
+#~ msgid "Forward format"
+#~ msgstr "Формат на препращане"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Описание на символите "
+
+#~ msgid "Font"
+#~ msgstr "Шрифт"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Превеждане на име на заглавна част (като 'From:', 'Subject:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Показване на броя на непрочетените до името на папката"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Съкращаване на новинарски групи по дълги от"
+
+#~ msgid "letters"
+#~ msgstr "букви"
+
+#~ msgid "Summary View"
+#~ msgstr "Изглед на извадката"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Показване на получателя в `От' колоната, ако изпращача сте вие"
+
+#~ msgid "Expand threads"
+#~ msgstr "Развиване на нишките..."
+
+#~ msgid "Date format"
+#~ msgstr "Формат на датата"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr "Определяне на атрибути на извадката"
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Позволяване на оцветяване на съобщение"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Показване на multi-byte азбука и цифри като\n"
+#~ "ASCII знаци (само за Японски)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Панел със заглавна част над изгледа на съобщението"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Показване на кратки заглавни части в изгледа на съобщението"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Показване на кратки заглавни части в изгледа на съобщението"
+
+#~ msgid "Line space"
+#~ msgstr "Разстояние м/у редовете"
+
+#~ msgid "pixel(s)"
+#~ msgstr "пиксел(а)"
+
+#~ msgid "Scroll"
+#~ msgstr "Превъртане"
+
+#~ msgid "Half page"
+#~ msgstr "Половин страница"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Плавно превъртане"
+
+#~ msgid "Step"
+#~ msgstr "Стъпка"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Разпъване на прикрепени изображения"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Настройка на показваните заглавки части"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Изпълняване"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Изпълняване"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Папка"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Филтриране на съобщенията при получаване"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Автоматична проверка на подписите"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Показване в отделен прозорец на резултата от проверка на подписа"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Временно съхраняване на паролата в паметта"
+
+#~ msgid "Expired after"
+#~ msgstr "Невалидно след"
+
+#~ msgid "minute(s) "
+#~ msgstr "минута(и)"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Установяване на `0' ще съхранява паролата\n"
+#~ "през цялата сесия)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Прехващане на входа при въвеждане на парола"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Показване на предупреждение при стартиране, ако GnuPG не работи"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Отваряне винаги на съобщенията избрани в извадката"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Отваряне на първото непрочетено съобщение при влизане в папка"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Маркиране като прочетено само на съобщение отворено в нов прозорец"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Влизане във входящата кутия след получаване на нови съобщения"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Съобщенията ще бъдат маркирани до изпълнението\n"
+#~ "ако това е изключено)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Диалог при получаване"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Показване на диалог при получаване"
+
+#~ msgid "Always"
+#~ msgstr "Винаги"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Само при ръчно получаване"
+
+#~ msgid "Never"
+#~ msgstr "Никога"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Без повдигане на диалог за грешка при грешка при получаване"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Затваряне на диалога при получаване когато завърши"
+
+#~ msgid " Set key bindings... "
+#~ msgstr "Определяне на клавишни комбинации"
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Външни команди (%s ще бъде заменен с име на файл / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Уеб браузър"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Добавяне на адреса в назначението при двойно щракване"
+
+#~ msgid "On exit"
+#~ msgstr "При излизане"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Потвърждение при излизане"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Изчистване на Кошчето на излизане"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Питане преди изчистване"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Предупреждение ако има съобщения в опашката"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Записване на кеша на извадката (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Просрочка на В/И порт:"
+
+#~ msgid "second(s)"
+#~ msgstr "секунда(и)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "напълно съкратеното име на делника"
+
+#~ msgid "the full weekday name"
+#~ msgstr "пълното име на делника"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "съкратеното име на месеца"
+
+#~ msgid "the full month name"
+#~ msgstr "пълното име на месеца"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "предпочитаната дата и час за текущия локал"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "век (годинa/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "денят от месеца като десетично число"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "часа като десетично число ползвайки 24-часов часовник"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "часа като десетично число ползвайки 12-часов часовник"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "деня от годината като десетично число"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "месеца като десетично число"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "минутата като десетично число"
+
+#~ msgid "either AM or PM"
+#~ msgstr "или AM или PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "секундата като десетично число"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "деня от седмицата като десетично число"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "предпочитаната дата за текущия локал"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "последните две цифри от годината"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "годината като десетично число"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "времевата зона или име или съкращение"
+
+#~ msgid "Specifier"
+#~ msgstr "Идентификатор"
+
+#~ msgid "Description"
+#~ msgstr "Описание"
+
+#~ msgid "Example"
+#~ msgstr "Пример"
+
+#~ msgid "Set message colors"
+#~ msgstr "Определяне на цветове на съобщението"
+
+#~ msgid "Colors"
+#~ msgstr "Цветове"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Цитиран Текст - Първо Ниво"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Цитиран Текст - Второ Ниво"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Цитиран Текст - Трето Ниво"
+
+#~ msgid "URI link"
+#~ msgstr "URI връзка"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Преизползване на цветовете за цитат"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Изберете цвят за цитат първо ниво"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Изберете цвят за цитат второ ниво"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Изберете цвят за цитат трето ниво"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Изберете цвят за URL"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Описание на символите"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Дата\n"
+#~ "От\n"
+#~ "Пълно име на подател\n"
+#~ "Първо име на подател\n"
+#~ "Инициали на подател\n"
+#~ "Тема\n"
+#~ "До\n"
+#~ "Cc\n"
+#~ "Новинарски групи\n"
+#~ "Message-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Ако x е установен, показва expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Тяло на съобщение\n"
+#~ "Цитирано тяло на съобщение\n"
+#~ "Тяло на съобщение без подпис\n"
+#~ "Цитирано тяло на съобщение без подпис\n"
+#~ "Символ %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Символ наклонена черта\n"
+#~ "Символ въпросителен знак\n"
+#~ "Символ отваряща къдрава скоба\n"
+#~ "Символ затваряща къдрава скоба"
+
+#~ msgid "Key bindings"
+#~ msgstr "Клавишни комбинации"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Изберете набор от клавишни комбинации.\n"
+#~ "Можете също да променяте препратките на всяко меню като натиснете\n"
+#~ "кой да е клавиш(и) при поставяне на показалеца на мишката върху тях."
+
+#~ msgid "Default"
+#~ msgstr "По подразбиране"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Стар Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Избор на шрифт"
 
diff --git a/po/cs.po b/po/cs.po
index 3704ecdb..3a77ac69 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -15,13 +15,401 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Načítám nastavení pro všechny účty...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Selhání při zápisu konfigurace do souboru\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 spojení s %s:%d bylo rozpojeno. Obnovuji spojení...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "adresář pro IMAP server"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "vytvářím spojení IMAP4 s %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Nelze spustit TLS sezení.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Posílám zprávu (%d / %d bytů)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Přesouvám zprávu %s%c%d do %s...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopíruji zprávu %s%c%d do %s...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Získávám zprávy z %s do %s...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "nelze nastavit příznak smazání: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "nelze odstranit\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Získávám zprávy z %s do %s...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "nelze nastavit příznak smazané: 1: %d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "nelze vybrat složku: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Označený soubor nebyl nalezen.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "Během příkazu LIST se vyskytla chyba.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Nemohu vytvořit '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Nemohu vytvořit '%s' v Doručené poště\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "nelze vytvořit poštovní schránku\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "nelze přejmenovat poštovní schránku: %s na %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "nelze smazat poštovní schránku\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "Nemohu načíst obálku\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Posílám zprávu (%d / %d bytů)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "Během načítání obálky se vyskytla chyba.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "Nemohu analyzovat obálku: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Nelze navázat relaci s IMAP4 serverem: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "nemohu najít obálku\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "nelze vybrat složku: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Autentikace selhala."
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Neúspěšné přihlášení k IMAP4.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "Nemohu přidat %s do %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(posílám soubor...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "nelze přidat zprávu %s\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "nelze kopírovat %d na %s\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "chyba příkazu služby imap: STORE %d %d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "chyba příkazu služby imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "chyba příkazu služby imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv nemůže konvertovat %s na UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "Nemohu zkopírovat zprávu %s do %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Nemohu otevřít označený soubor.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "zdrojová složka je stejná jako cílová.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopíruji zprávu %s%c%d do %s...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Poslední počet v adresáři %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Soubor '%s' už existuje.\n"
+"Nemohu vytvořit složku."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "Vytvářím NNTP spojení s %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP spojení %s:%d bylo přerušeno. Obnovuji spojení...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "příspěvek %d už byl v mezipaměti.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "Získávám příspěvek %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "Nemohu číst příspěvek %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "Nemohu načíst seznam diskuzních skupin\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "Nemohu odeslat příspěvek.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "Nemohu načíst příspěvek %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "Nemohu vybrat skupinu: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "neplatný rozsah příspěvků: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "Žádný nový příspěvek.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "získávám xover %d - %d v %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "nelze získat xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "Během získávání xover se vyskytla chyba.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "Neplatná xover řádka: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "nelze získat xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "Během získávání xhdr se vyskytla chyba .\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Nemohu se spojit s NNTP serverem: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "Chyba protokolu: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "Chyba protokolu\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Během odesílání se vyskytla chyba\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Během odesílání pošty se vyskytla chyba ."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "V pozdravu nebyla nalezena APOP časová značka\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Chyba syntaxe pro časovou značku při pozdravu\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Chyba protokolu POP3\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "Neplatná xover řádka: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Vymazávám starou zprávu %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Přeskakuji zprávu %d (%d bytů)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "poštovní schránka je zamčena\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "vypršel čas relace\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "Nelze spustit TLS relaci\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "Vyskytla se chyba v autentizaci\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "Příkaz není podporován\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "v POP3 relaci se vyskytla\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -31,6 +419,53 @@ msgstr "Nalezený %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurace je uložena.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Složka"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "nelze otevřít označený soubor\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "nelze načíst zprávu %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Nelze získat část textu\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Neplatný příkazový řádek tisku: '%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "Během obnovy dat se vyskytla chyba.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Nemohu zapisovat do souboru.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH je nedostupná\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "špatná odpověď od SMTP\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "v SMTP relaci se vyskytla chyba\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 je nedostupné\n"
@@ -162,78 +597,6 @@ msgstr ""
 "programem, pokud ne, napište na adresu Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Načítám nastavení pro všechny účty...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Jsou stále otevřena nějaká okna s rozepsanou zprávou.\n"
-"Před úpravou tohoto účtu zavřete prosím všechna tato okna."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Otevírám okno pro úpravu účtu...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Vytvářím okno pro úpravu účtu...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Úpravy účtů"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nové zprávy budou kontrolovány v tomto pořadí. Pokud má být účet\n"
-"kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Jméno"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Upravit"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Nastavit účet jako výchozí "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Opravdu chcete tento účet smazat?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neoznačený"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Smazat účet"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -333,6 +696,14 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do databáze"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Jméno"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -347,8 +718,8 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro databázi adres"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Soubor"
 
@@ -369,9 +740,9 @@ msgid "/_File/New _Server"
 msgstr "/_Soubor/Nový _server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
@@ -387,7 +758,7 @@ msgstr "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
@@ -419,8 +790,8 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
@@ -428,13 +799,13 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
@@ -451,17 +822,17 @@ msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
@@ -473,7 +844,7 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Databáze adres"
 
@@ -483,14 +854,14 @@ msgstr "Jméno:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Smazat"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -501,11 +872,11 @@ msgid "Lookup"
 msgstr "Hledat"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Kopie:"
 
@@ -531,7 +902,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Smazat složku "
 
@@ -643,7 +1014,7 @@ msgstr "Chyba při konverzi databáze adres"
 msgid "Addressbook Conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Rozhraní"
 
@@ -663,8 +1034,7 @@ msgstr "Email adresa"
 msgid "Group"
 msgstr "Skupina"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Složka"
 
@@ -688,15 +1058,15 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Chyba"
 
@@ -751,8 +1121,8 @@ msgstr "/_Přidat..."
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -796,8 +1166,8 @@ msgstr "/Úp_ravy/_Zpět"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_nova"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
@@ -805,7 +1175,7 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
@@ -817,7 +1187,7 @@ msgstr "/Úp_ravy/V_ložit"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
@@ -834,7 +1204,7 @@ msgstr "/Úp_ravy/Zarovnat _všechny dlouhá řádky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Z_obrazit"
@@ -856,9 +1226,9 @@ msgid "/_View/_Reply to"
 msgstr "/Z_obrazit/_Odpověď komu "
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
@@ -874,7 +1244,7 @@ msgstr "/Z_obrazit/Praví_tko"
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
@@ -886,127 +1256,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
@@ -1014,14 +1384,14 @@ msgstr "/_Nástroje/_Databáze adres"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
@@ -1045,10 +1415,6 @@ msgstr "/_Zpráva/Zaši_frovat"
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Nelze získat část textu\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Chyba v uvozovkách."
@@ -1125,7 +1491,7 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
@@ -1217,8 +1583,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Odeslat"
 
@@ -1258,8 +1623,7 @@ msgstr "Příloha"
 msgid "Attach file"
 msgstr "Připojí soubor"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1267,7 +1631,7 @@ msgstr "Podpis"
 msgid "Insert signature"
 msgstr "Vloží podpis"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1464,7 +1828,7 @@ msgstr "Změnit"
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Hodnota"
 
@@ -1497,7 +1861,6 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Soubor"
 
@@ -1554,12 +1917,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -1576,7 +1939,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upravit JPilot soubor"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1640,7 +2003,7 @@ msgstr "Timeout (vteřin)"
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Základní"
 
@@ -1697,7 +2060,6 @@ msgid "Exporting file:"
 msgstr "Exportovaný soubor:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Vybrat... "
 
@@ -1721,164 +2083,164 @@ msgstr "Přepsat existující soubor?"
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvořit složku '%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/_Vytvořit novou složku..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Přej_menovat složku..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Přej_menovat složku..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Smazat složku"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Na_jít zprávy..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Při_hlásit diskusní skupinu..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Smazat d_iskusní skupinu"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Vytvářím náhled pro složku...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nová"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Nastavuji informace o složce...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Posílám zprávu"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1888,21 +2250,21 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít další\n"
 "podsložky, přidejte nakonec názvu '/')"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro '%s' :"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1913,21 +2275,21 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1936,34 +2298,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
@@ -2024,7 +2386,7 @@ msgstr "%d diskuzních skupin přijato (%s čteno)"
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Předmět:"
 
@@ -2048,164 +2410,6 @@ msgstr "Vytvářím náhled na obrázek...\n"
 msgid "Can't load the image."
 msgstr "Nemohu nahrát obrázek."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 spojení s %s:%d bylo rozpojeno. Obnovuji spojení...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "adresář pro IMAP server"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "vytvářím spojení IMAP4 s %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Nelze spustit TLS sezení.\n"
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "nelze nastavit příznak smazání: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "nelze odstranit\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "nelze nastavit příznak smazané: 1: %d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "nelze vybrat složku: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Označený soubor nebyl nalezen.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "Během příkazu LIST se vyskytla chyba.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Nemohu vytvořit '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Nemohu vytvořit '%s' v Doručené poště\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "nelze vytvořit poštovní schránku\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "nelze přejmenovat poštovní schránku: %s na %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "nelze smazat poštovní schránku\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "Nemohu načíst obálku\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "Během načítání obálky se vyskytla chyba.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "Nemohu analyzovat obálku: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Nelze navázat relaci s IMAP4 serverem: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "nemohu najít obálku\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "nelze vybrat složku: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Autentikace selhala."
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Neúspěšné přihlášení k IMAP4.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "Nemohu přidat %s do %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(posílám soubor...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "nelze přidat zprávu %s\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "nelze kopírovat %d na %s\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "chyba příkazu služby imap: STORE %d %d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "chyba příkazu služby imap: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "chyba příkazu služby imap: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv nemůže konvertovat %s na UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Import"
@@ -2303,7 +2507,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Další"
 
@@ -2319,145 +2523,145 @@ msgstr "Atributy"
 msgid "Finish"
 msgstr "Konec"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Starý Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (vteřin)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (nejsou nové zprávy)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Během načítání zpráv se vyskytly chyby."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Získávám nové zprávy z účtu %s ...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojuji se na POP3 server: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávám zprávu %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Spojení selhalo"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2466,28 +2670,28 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Chyba soketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2496,11 +2700,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Autentikace selhala."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2509,16 +2713,16 @@ msgstr ""
 "Autentikace selhala:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 #, fuzzy
 msgid "Session timed out."
 msgstr "vypršel čas relace\n"
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Načítám nové zprávy z %s do %s...\n"
@@ -2536,29 +2740,20 @@ msgstr "Zadejte heslo"
 msgid "Protocol log"
 msgstr "Záznamový protokol"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Soubor '%s' už existuje.\n"
-"Nemohu vytvořit složku."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread není v glib podporován.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otevře okno pro psaní nové zprávy"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2568,48 +2763,48 @@ msgstr ""
 "                           otevře okno pro psaní zprávy s připojeným\n"
 "                           souborem(y)"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive             načte nové zprávy"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          načte všechny nové zprávy ze všech účtů"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send              pošle všechny pozdržené zprávy"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status             vypíše celkový počet zpráv"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status             vypíše celkový počet zpráv"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug              režim trasování"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help            vypíše tento text a skončí"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version             vypíše informace o verzi a skončí"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Výstupní znaková sada"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2623,19 +2818,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Právě se vytváří zpráva. Opravdu skončit?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2644,661 +2839,661 @@ msgstr ""
 "Podpora pro OpenPGP je zakázána."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavení akcí"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Soubor/_Složka"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Soubor/_Složka/_Vytvořit novou složku..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Soubor/_Složka/_Smazat složku"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odebrat _poštovní schránku"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Soubor/_Složka/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Soubor/_Složka/_Zkontrolovat nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Soubor/_Importovat soubor mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Soubor/E_xportovat do mbox souboru..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Soubor/_Vyprázdnit koš"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Soubor/_Vložit soubor"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Soubor/_Konec"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/Úp_ravy/Vybrat _vlákno"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/_Najít v aktuální zprávě..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/Na_jít zprávy..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Strom složek "
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Ná_hled na zprávu"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/Ikony _a text"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Text"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nic"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Samostatné pro_hlédnutí zprávy"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/Z_obrazit/Setříd_it"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/Z_obrazit/Setříd_it/podle čí_sla"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Z_obrazit/Setříd_it/podle _velikosti"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/Z_obrazit/Setříd_it/podle _data"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/Z_obrazit/Setříd_it/podle _od koho"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Z_obrazit/Setříd_it/podle odesí_latele"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/Z_obrazit/Setříd_it/podle př_edmětu"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/Z_obrazit/Setříd_it/podle _barevné značky"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/Z_obrazit/Setříd_it/podle o_značení"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/Z_obrazit/Setříd_it/podle ne_přečtených"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Z_obrazit/Setříd_it/podle připo_jených souborů"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Z_obrazit/Setříd_it/_Netřídit"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/Z_obrazit/Setříd_it/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/Z_obrazit/Setříd_it/Vzestupně"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Z_obrazit/Setříd_it/_Získat z předmětu"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/Z_obrazit/Zobrazit _vlákna"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/Z_obrazit/_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/Z_obrazit/Nastavit zobrazené po_ložky..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/Z_obrazit/_Přejít"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/Z_obrazit/_Přejít/_Další zpráva"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/Z_obrazit/_Přejít/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Z_obrazit/_Přejít/Předchozí nepřečtená zp_ráva"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Z_obrazit/_Přejít/Další nepřeč_tená zpráva"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Z_obrazit/_Přejít/Další n_ová zpráva"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Z_obrazit/_Přejít/Další oz_načená zpráva"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Z_obrazit/_Přejít/Předchozí _zpráva s návěštím"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Z_obrazit/_Přejít/Da_lší zpráva s návěštím"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Autodetekce "
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/Z_obrazit/Zobrazit všechna zá_hlaví"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Zpráva/Přerušit pří_jem zpráv"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_všem"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpráva/Označ_it/_Označit"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpráva/Označ_it/_Zrušit označení"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit _všechny jako přečtené"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/S_pustit"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamů "
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_ení/_Změna aktuálního účtu"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Manuál"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_věda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_věda/_FAQ/_Německy"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_věda/_FAQ/Š_panělsky"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_věda/_FAQ/_Francouzsky"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_věda/_FAQ/_Italsky"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Měním typ oddělovače oken z %d na %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3308,16 +3503,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3327,153 +3522,152 @@ msgstr ""
 "Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva\n"
 "pro zápis."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavit jako výchozí"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
@@ -3589,32 +3783,32 @@ msgstr "Dosažen konec zprávy, pokračovat od začátku?"
 msgid "Search finished"
 msgstr "Hledání ukončeno"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Vyvolávám zobrazení zprávy...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3623,7 +3817,7 @@ msgstr ""
 "Vložte příkazovou řádku pro tisk:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3632,41 +3826,6 @@ msgstr ""
 "Příkazová řádka pro tisk je neplatná:\n"
 "'%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "Nemohu zkopírovat zprávu %s do %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Nemohu otevřít označený soubor.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "zdrojová složka je stejná jako cílová.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopíruji zprávu %s%c%d do %s...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Poslední počet v adresáři %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Otevřít"
@@ -3753,116 +3912,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Neplatná příkazová řádka prohlížeče MIME: '%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "Vytvářím NNTP spojení s %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP spojení %s:%d bylo přerušeno. Obnovuji spojení...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "příspěvek %d už byl v mezipaměti.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "Získávám příspěvek %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "Nemohu číst příspěvek %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "Nemohu načíst seznam diskuzních skupin\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "Nemohu odeslat příspěvek.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "Nemohu načíst příspěvek %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "Nemohu vybrat skupinu: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "neplatný rozsah příspěvků: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "Žádný nový příspěvek.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "získávám xover %d - %d v %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "nelze získat xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "Během získávání xover se vyskytla chyba.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "Neplatná xover řádka: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "nelze získat xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "Během získávání xhdr se vyskytla chyba .\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Nemohu se spojit s NNTP serverem: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "Chyba protokolu: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "Chyba protokolu\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Během odesílání se vyskytla chyba\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Během odesílání pošty se vyskytla chyba ."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[bez id uživatele]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3875,7 +3933,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3883,454 +3941,6 @@ msgstr ""
 "Špatná passphrase! Zkuste to znovu...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "V pozdravu nebyla nalezena APOP časová značka\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Chyba syntaxe pro časovou značku při pozdravu\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Chyba protokolu POP3\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "Neplatná xover řádka: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Vymazávám starou zprávu %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Přeskakuji zprávu %d (%d bytů)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "poštovní schránka je zamčena\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "vypršel čas relace\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "Nelze spustit TLS relaci\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "Vyskytla se chyba v autentizaci\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "Příkaz není podporován\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "v POP3 relaci se vyskytla\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Otevření okna s nastavením účtu...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Účet%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Nastavení pro nový účet"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Nastavení účtu"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Vyvolání okna pro nastavení účtu...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Příjem"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Soukromí"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Rozšíření"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Název tohoto účtu"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Nastavit jako výchozí"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Osobní informace"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Celé jméno"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Poštovní adresa"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizace"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informace o serveru"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Žádný (místní)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Tento server vyžaduje autentizaci"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "News server"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server pro příjem"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP server (odesílání)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Uživatelské jméno"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Heslo"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Tento server vyžaduje autentizaci"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Smazat zprávy na serveru po jejich přijmutí"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Odstranit po"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dnech"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dnů: odstranit ihned)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Přijmout všechny zprávy ze serveru"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Limit velikosti pro příjem"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtr zpráv pro příjem"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Výchozí inbox"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Metoda autentizace"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automaticky"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Diskuzní skupiny"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maximální počet příspěvků pro stažení\n"
-"(0 pro neomezený počet)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Není uveden příjemce."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "Při volbě 'Stáhnout vše' zjistit nové zprávy"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Záhlaví"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Přidat do záhlaví pole s datumem"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generovat číslo zprávy"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Přidat uživatelsky definované záhlaví"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Upravit..."
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autentizace"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP autentizace (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Pokud necháte tyto položky prázdné, bude\n"
-"použito stejné jméno uživatele a heslo."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autentizace s POP3 před posláním"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Výstup příkazu"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Automaticky nastavit následující adresy"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Kopie"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Slepá kopie"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Odpovědět komu"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Vždy přidat podpis"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Vždy zašifrovat zprávu"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Použít formát ASCII-armored pro zašifrování"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Použít čistý textový podpis"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Klíč pro podpis"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Použít výchozí GnuPG klíč"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Vybrat klíč podle email adresy"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Zadat klíč ručně"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Uživatel nebo ID klíče:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Nepoužívat SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Použít SSL pro POP3 spojení"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Použít příkaz STARTTLS pro spuštění SSL relace"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Použít SSL pro IMAP4 spojení"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Použít SSL pro NNTP připojení"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Odesílání (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Použít SSL pro SMTP připojení"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Určete SMTP port"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Určete POP3 port"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Určete IMAP4 port"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Určete NNTP port"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Určete název domény"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "adresář pro IMAP server"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Ukládat odeslané zprávy do"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Ukládat koncepty do"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Ukládat smazané zprávy do"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Nebylo zadáno jméno účtu."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Nebyla zadána poštovní adresa."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Nebyl zadán SMTP server."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Nebylo zadáno uživatelské číslo."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Nebyl zadán POP3 server."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Nebyl zadán IMAP4 server."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Nebyl zadán NNTP server."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Není doporučeno používat starší styl šifrování zpráv\n"
-"ASCII-armored. Nevyhovuje totiž specifikaci\n"
-"RFC 3156 - MIME Security s OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Nastavení akcí"
@@ -4395,17 +4005,17 @@ msgstr " Nápověda k syntaxi "
 msgid "Registered actions"
 msgstr "Registrované akce"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Dolů"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nový)"
 
@@ -4448,837 +4058,31 @@ msgstr "Smazat akci"
 msgid "Do you really want to delete this action?"
 msgstr "Opravdu chcete smazat tuto akci?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Složka"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Vytvářím okno hlavního nastavení...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Společná nastavení"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citování"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Zobrazení"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Zpráva"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Ostatní"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Použít externí program k začlenění"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Příkaz"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Začlenit ze spoolu"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtr na začlenění"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Automatická kontrola nové pošty"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "každých"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minut(y)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Kontrola nové pošty při spuštění"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Po začlenění aktualizovat všechny lokální složky"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Zjišťuji počet nových zpráv (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Použít externí program pro posílání"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Výstupní znaková sada"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatická (doporučeno)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bitový ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Západní Evropa (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Západní Evropa(ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Středoevropská (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltická (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltická (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Řecká (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Řecká (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Azbuka (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turecká (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Azbuka (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Azbuka (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Azbuka (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Azbuka (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonská (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonská (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonská (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Zjednodušená čínská (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Zjednodušená čínská (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradiční čínská (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradiční čínská (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Čínská (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korejská (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thajská (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thajská (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Pokud je zvoleno 'Automatická', bude použita\n"
-"znaková sada podle locale."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Kódování přenosu"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Určuje jak v jaké znakové sadě bude zpráva\n"
-"poslána když obsahuje ne-ASCII znaky."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Oddělovač podpisu"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Automaticky vložit"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Automaticky spustit externí editor"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Úroveň zpětných kroků"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Zarovnat zprávu na"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "znaků"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Zalomit citaci"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Zalomit při přijmutí"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Zalomit před odesláním"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Automaticky vybrat účet pro odpovědi"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citovat zprávy při odpovídání"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Tlačítko s odpovědí zvolí odpověď do diskusního listu"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Formát odpovědi"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Značka pro citaci"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Formát přeposlání"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Popis symbolů "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Písmo"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Překládat názvy záhlaví (jako například 'Od:', 'Předmět:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Zobrazit počet nepřečtených za názvem složky"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Zkrátit názvy diskuzních skupin delší než"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "dopisy(ů)"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Souhrnný pohled"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Zobrazit příjemce ve sloupci 'Od', jestliže odesílatel jste vy sám"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Rozbalit vlákna"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Formát datumu"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Nastavení zobrazených položek v souhrnu... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Povolit zabarvení zpráv"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Zobrazit více-bytovou abecedu a číslice\n"
-"jako ASCII znaky (pouze pro Japonsko)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Zobrazit okno se záhlavím nad zprávou"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Prázdná řádka"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(y)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Posun"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Polovina stránky"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Jemný posun"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Krok"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "Změnit velikost připojených obrázků"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Zobrazit nastavení záhlaví"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Provést"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Provést"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Složka"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtr zpráv pro příjem"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automaticky zkontrolovat podpis"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Zobrazit výsledek testování podpisu v popup okně"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Uložit passphrase dočasně v paměti"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Vyprší za"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minut(y) "
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Nastavení na '0' uloží passphrase\n"
-" pro celou relaci)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr ""
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Zobrazit varování pokud GnuPG nefunguje"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Vybrané zprávy vždy otvírat v přehledu"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Při vstupu do složky otevřít první nepřečtenou zprávu"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Označit zprávu za přečtěnou pouze při otevření v novém okně"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Po přijetí nových zpráv přejít na Doručenou poštu"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Pokud je tato volba vypnuta,\n"
-"zprávy budou označeny až do vykonání)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Dialog o přijetí"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Zobrazit dialog o přijetí"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Vždy"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nikdy"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Při příjmu chyby nezobrazovat popup dialog"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Zavřít dialog o přijetí po dokončení"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Nastavit klávesové zkratky... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externí příkaz (%s bude nahrazen jménem souboru / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Webový prohlížeč"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Přidat adresu do cíle dvojklikem"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Při ukončení"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Potvrdit ukončení"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Při ukončení vyprázdnit koš"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Potvrdit vyprázdnění"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Varovat pokud jsou zprávy ve frontě"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Zapisuji celkovou mezipaměť (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Čas vypršení pro I/O:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "sekund(a)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "zkratky pro názvy dnů v týdnu"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "plný název dne v týdnu"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "zkratka pro měsíc"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "plný název měsíce"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "preferované datum a čas podle aktuálního locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "století (rok/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "den v měsíci číselně"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "hodiny číselně s 24 hodinových cyklem"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "hodiny číselně s 12 hodinových cyklem"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "rok číselně"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "měsíc číselně"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minuty číselně"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM nebo PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "vteřiny číselně"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "den v týdnu číselně"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "preferovaný datum pro aktuální locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "poslední dvě číslice z roku"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "rok jako desítkové číslo"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "časová zóna, název nebo zkratka"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Specifikátor"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Popis"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Příklad"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Nastavení barev pro zprávy"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Barvy"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Citovaný text - První úroveň"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Citovaný text - Druhá úroveň"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Citovaný text - Třetí úroveň"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI odkaz"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Rotovat barvy citací"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Zvolte barvu pro 1 úroveň citace"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Zvolte barvu pro 2 úroveň citace"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Zvolte barvu pro 3 úroveň citace"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Získat barvu z URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Popis symbolů"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Datum\n"
-"Od\n"
-"Celé jméno odesílatele\n"
-"Křestní jméno odesílatele\n"
-"Iniciály odesílatele\n"
-"Předmět\n"
-"Komu\n"
-"Kopie\n"
-"Diskuzní skupina\n"
-"Číslo zprávy"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr ""
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Tělo zprávy\n"
-"Citované tělo zprávy\n"
-"Tělo zprávy bez podpisu\n"
-"Citované tělo zprávy bez podpisu\n"
-"Znak %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Znak zpětné lomítko\n"
-"Znak otazník\n"
-"Znak levá složená závorka\n"
-"Znak pravá složená závorka"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Klávesové zkratky"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Vyberte klávesové zkratky.\n"
-"Klávesovou zkratku pro nabídku můžete také změnit tak,\n"
-"že při najetí myší na položku stisknete odpovídající klávesu."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Výchozí"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Starý Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Vlastní nastavení záhlaví"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Záhlaví"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Smazat "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Vlastní záhlaví"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Smazat záhlaví"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Opravdu chcete smazat toto záhlaví?"
 
@@ -5326,12 +4130,21 @@ msgstr "Nastavení filtru"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Upravit"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Opravdu chcete smazat toto pravidlo?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neoznačený"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Smazat pravidlo"
 
@@ -5420,6 +4233,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5562,6 +4379,10 @@ msgstr "Při odpovědi smazat ze začátku předmětu [...] nebo (...)"
 msgid "Apply to subfolders"
 msgstr "Zahrnout podsložky"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Automaticky nastavit následující adresy"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "použít také při odpovědi"
@@ -5635,64 +4456,46 @@ msgstr "Zobrazené položky"
 msgid " Revert to default "
 msgstr " Návrat k výchozí "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Název šablony"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registrovat"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Nahradit "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Symboly "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrované šablony"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Šablona"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Chyba formátu v šabloně."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Smazat šablonu"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete smazat tuto šablonu?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "nelze otevřít označený soubor\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "nelze načíst zprávu %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Neplatný příkazový řádek tisku: '%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Vytvářím dialog procesu...\n"
@@ -5701,29 +4504,21 @@ msgstr "Vytvářím dialog procesu...\n"
 msgid "Status"
 msgstr "Stav"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "Během obnovy dat se vyskytla chyba.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Nemohu zapisovat do souboru.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Nemohu najít ID uživatele pro tento klíč."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpis vyrobil %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Chyba při verifikaci podpisu"
 
@@ -5749,6 +4544,10 @@ msgstr "ID klíče"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Ostatní"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Přidat klíč"
@@ -5769,85 +4568,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Fronta hlaviček zpráv je poškozená.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Nelze spustit externí příkaz: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Během odesílání pošty se vyskytla chyba ."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Připojení"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Připojuji se na SMTP server: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Posílám HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Posílám EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Posílám MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Odesílání"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Posílám RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Posílám DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Ukončuji..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Při posílání zprávy nastala chyba."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5949,32 +4748,20 @@ msgstr "ŠPATNÝ podpis"
 msgid "No public key to verify the signature"
 msgstr "Nelze najít veřejný klíč pro podpis"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH je nedostupná\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "špatná odpověď od SMTP\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "v SMTP relaci se vyskytla chyba\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Vytvářím zdrojové okno...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Zdroj zprávy"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Zobrazuji zdroj pro %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Zdroj"
@@ -6371,6 +5158,904 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Jsou stále otevřena nějaká okna s rozepsanou zprávou.\n"
+#~ "Před úpravou tohoto účtu zavřete prosím všechna tato okna."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Otevírám okno pro úpravu účtu...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Vytvářím okno pro úpravu účtu...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Úpravy účtů"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nové zprávy budou kontrolovány v tomto pořadí. Pokud má být účet\n"
+#~ "kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokol"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Nastavit účet jako výchozí "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Opravdu chcete tento účet smazat?"
+
+#~ msgid "Delete account"
+#~ msgstr "Smazat účet"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Otevření okna s nastavením účtu...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Účet%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Nastavení pro nový účet"
+
+#~ msgid "Account preferences"
+#~ msgstr "Nastavení účtu"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Vyvolání okna pro nastavení účtu...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Příjem"
+
+#~ msgid "Privacy"
+#~ msgstr "Soukromí"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Rozšíření"
+
+#~ msgid "Name of this account"
+#~ msgstr "Název tohoto účtu"
+
+#~ msgid "Set as default"
+#~ msgstr "Nastavit jako výchozí"
+
+#~ msgid "Personal information"
+#~ msgstr "Osobní informace"
+
+#~ msgid "Full name"
+#~ msgstr "Celé jméno"
+
+#~ msgid "Mail address"
+#~ msgstr "Poštovní adresa"
+
+#~ msgid "Organization"
+#~ msgstr "Organizace"
+
+#~ msgid "Server information"
+#~ msgstr "Informace o serveru"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Žádný (místní)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Tento server vyžaduje autentizaci"
+
+#~ msgid "News server"
+#~ msgstr "News server"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server pro příjem"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP server (odesílání)"
+
+#~ msgid "User ID"
+#~ msgstr "Uživatelské jméno"
+
+#~ msgid "Password"
+#~ msgstr "Heslo"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Tento server vyžaduje autentizaci"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Smazat zprávy na serveru po jejich přijmutí"
+
+#~ msgid "Remove after"
+#~ msgstr "Odstranit po"
+
+#~ msgid "days"
+#~ msgstr "dnech"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dnů: odstranit ihned)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Přijmout všechny zprávy ze serveru"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Limit velikosti pro příjem"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtr zpráv pro příjem"
+
+#~ msgid "Default inbox"
+#~ msgstr "Výchozí inbox"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Metoda autentizace"
+
+#~ msgid "Automatic"
+#~ msgstr "Automaticky"
+
+#~ msgid "News"
+#~ msgstr "Diskuzní skupiny"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maximální počet příspěvků pro stažení\n"
+#~ "(0 pro neomezený počet)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Není uveden příjemce."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "Při volbě 'Stáhnout vše' zjistit nové zprávy"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Přidat do záhlaví pole s datumem"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generovat číslo zprávy"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Přidat uživatelsky definované záhlaví"
+
+#~ msgid " Edit... "
+#~ msgstr " Upravit..."
+
+#~ msgid "Authentication"
+#~ msgstr "Autentizace"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP autentizace (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Pokud necháte tyto položky prázdné, bude\n"
+#~ "použito stejné jméno uživatele a heslo."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autentizace s POP3 před posláním"
+
+#~ msgid "Command output"
+#~ msgstr "Výstup příkazu"
+
+#~ msgid "Cc"
+#~ msgstr "Kopie"
+
+#~ msgid "Bcc"
+#~ msgstr "Slepá kopie"
+
+#~ msgid "Reply-To"
+#~ msgstr "Odpovědět komu"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Vždy přidat podpis"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Vždy zašifrovat zprávu"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Použít formát ASCII-armored pro zašifrování"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Použít čistý textový podpis"
+
+#~ msgid "Sign key"
+#~ msgstr "Klíč pro podpis"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Použít výchozí GnuPG klíč"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Vybrat klíč podle email adresy"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Zadat klíč ručně"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Uživatel nebo ID klíče:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Nepoužívat SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Použít SSL pro POP3 spojení"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Použít příkaz STARTTLS pro spuštění SSL relace"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Použít SSL pro IMAP4 spojení"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Použít SSL pro NNTP připojení"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Odesílání (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Použít SSL pro SMTP připojení"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Určete SMTP port"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Určete POP3 port"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Určete IMAP4 port"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Určete NNTP port"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Určete název domény"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "adresář pro IMAP server"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Ukládat odeslané zprávy do"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Ukládat koncepty do"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Ukládat smazané zprávy do"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Nebylo zadáno jméno účtu."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Nebyla zadána poštovní adresa."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Nebyl zadán SMTP server."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Nebylo zadáno uživatelské číslo."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Nebyl zadán POP3 server."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Nebyl zadán IMAP4 server."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Nebyl zadán NNTP server."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Není doporučeno používat starší styl šifrování zpráv\n"
+#~ "ASCII-armored. Nevyhovuje totiž specifikaci\n"
+#~ "RFC 3156 - MIME Security s OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Vytvářím okno hlavního nastavení...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Společná nastavení"
+
+#~ msgid "Quote"
+#~ msgstr "Citování"
+
+#~ msgid "Display"
+#~ msgstr "Zobrazení"
+
+#~ msgid "Message"
+#~ msgstr "Zpráva"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Použít externí program k začlenění"
+
+#~ msgid "Command"
+#~ msgstr "Příkaz"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Začlenit ze spoolu"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtr na začlenění"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Automatická kontrola nové pošty"
+
+#~ msgid "every"
+#~ msgstr "každých"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut(y)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Kontrola nové pošty při spuštění"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Po začlenění aktualizovat všechny lokální složky"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Zjišťuji počet nových zpráv (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Použít externí program pro posílání"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Výstupní znaková sada"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatická (doporučeno)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bitový ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Západní Evropa (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Západní Evropa(ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Středoevropská (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltická (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltická (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Řecká (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Řecká (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Azbuka (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turecká (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Azbuka (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Azbuka (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Azbuka (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Azbuka (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonská (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonská (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonská (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Zjednodušená čínská (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Zjednodušená čínská (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradiční čínská (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradiční čínská (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Čínská (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korejská (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thajská (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thajská (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Pokud je zvoleno 'Automatická', bude použita\n"
+#~ "znaková sada podle locale."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Kódování přenosu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Určuje jak v jaké znakové sadě bude zpráva\n"
+#~ "poslána když obsahuje ne-ASCII znaky."
+
+#~ msgid "Signature separator"
+#~ msgstr "Oddělovač podpisu"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Automaticky vložit"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Automaticky spustit externí editor"
+
+#~ msgid "Undo level"
+#~ msgstr "Úroveň zpětných kroků"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Zarovnat zprávu na"
+
+#~ msgid "characters"
+#~ msgstr "znaků"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Zalomit citaci"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Zalomit při přijmutí"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Zalomit před odesláním"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Automaticky vybrat účet pro odpovědi"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citovat zprávy při odpovídání"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Tlačítko s odpovědí zvolí odpověď do diskusního listu"
+
+#~ msgid "Reply format"
+#~ msgstr "Formát odpovědi"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Značka pro citaci"
+
+#~ msgid "Forward format"
+#~ msgstr "Formát přeposlání"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Popis symbolů "
+
+#~ msgid "Font"
+#~ msgstr "Písmo"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Překládat názvy záhlaví (jako například 'Od:', 'Předmět:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Zobrazit počet nepřečtených za názvem složky"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Zkrátit názvy diskuzních skupin delší než"
+
+#~ msgid "letters"
+#~ msgstr "dopisy(ů)"
+
+#~ msgid "Summary View"
+#~ msgstr "Souhrnný pohled"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Zobrazit příjemce ve sloupci 'Od', jestliže odesílatel jste vy sám"
+
+#~ msgid "Expand threads"
+#~ msgstr "Rozbalit vlákna"
+
+#~ msgid "Date format"
+#~ msgstr "Formát datumu"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Nastavení zobrazených položek v souhrnu... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Povolit zabarvení zpráv"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Zobrazit více-bytovou abecedu a číslice\n"
+#~ "jako ASCII znaky (pouze pro Japonsko)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Zobrazit okno se záhlavím nad zprávou"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
+
+#~ msgid "Line space"
+#~ msgstr "Prázdná řádka"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(y)"
+
+#~ msgid "Scroll"
+#~ msgstr "Posun"
+
+#~ msgid "Half page"
+#~ msgstr "Polovina stránky"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Jemný posun"
+
+#~ msgid "Step"
+#~ msgstr "Krok"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Změnit velikost připojených obrázků"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Zobrazit nastavení záhlaví"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Provést"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Provést"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Složka"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtr zpráv pro příjem"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Automaticky zkontrolovat podpis"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Zobrazit výsledek testování podpisu v popup okně"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Uložit passphrase dočasně v paměti"
+
+#~ msgid "Expired after"
+#~ msgstr "Vyprší za"
+
+#~ msgid "minute(s) "
+#~ msgstr "minut(y) "
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Nastavení na '0' uloží passphrase\n"
+#~ " pro celou relaci)"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Zobrazit varování pokud GnuPG nefunguje"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Vybrané zprávy vždy otvírat v přehledu"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Při vstupu do složky otevřít první nepřečtenou zprávu"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Označit zprávu za přečtěnou pouze při otevření v novém okně"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Po přijetí nových zpráv přejít na Doručenou poštu"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Pokud je tato volba vypnuta,\n"
+#~ "zprávy budou označeny až do vykonání)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Dialog o přijetí"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Zobrazit dialog o přijetí"
+
+#~ msgid "Always"
+#~ msgstr "Vždy"
+
+#~ msgid "Never"
+#~ msgstr "Nikdy"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Při příjmu chyby nezobrazovat popup dialog"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Zavřít dialog o přijetí po dokončení"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Nastavit klávesové zkratky... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Externí příkaz (%s bude nahrazen jménem souboru / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Webový prohlížeč"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Přidat adresu do cíle dvojklikem"
+
+#~ msgid "On exit"
+#~ msgstr "Při ukončení"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Potvrdit ukončení"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Při ukončení vyprázdnit koš"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Potvrdit vyprázdnění"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Varovat pokud jsou zprávy ve frontě"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Zapisuji celkovou mezipaměť (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Čas vypršení pro I/O:"
+
+#~ msgid "second(s)"
+#~ msgstr "sekund(a)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "zkratky pro názvy dnů v týdnu"
+
+#~ msgid "the full weekday name"
+#~ msgstr "plný název dne v týdnu"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "zkratka pro měsíc"
+
+#~ msgid "the full month name"
+#~ msgstr "plný název měsíce"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "preferované datum a čas podle aktuálního locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "století (rok/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "den v měsíci číselně"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "hodiny číselně s 24 hodinových cyklem"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "hodiny číselně s 12 hodinových cyklem"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "rok číselně"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "měsíc číselně"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minuty číselně"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM nebo PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "vteřiny číselně"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "den v týdnu číselně"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "preferovaný datum pro aktuální locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "poslední dvě číslice z roku"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "rok jako desítkové číslo"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "časová zóna, název nebo zkratka"
+
+#~ msgid "Specifier"
+#~ msgstr "Specifikátor"
+
+#~ msgid "Description"
+#~ msgstr "Popis"
+
+#~ msgid "Example"
+#~ msgstr "Příklad"
+
+#~ msgid "Set message colors"
+#~ msgstr "Nastavení barev pro zprávy"
+
+#~ msgid "Colors"
+#~ msgstr "Barvy"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Citovaný text - První úroveň"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Citovaný text - Druhá úroveň"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Citovaný text - Třetí úroveň"
+
+#~ msgid "URI link"
+#~ msgstr "URI odkaz"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Rotovat barvy citací"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Zvolte barvu pro 1 úroveň citace"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Zvolte barvu pro 2 úroveň citace"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Zvolte barvu pro 3 úroveň citace"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Získat barvu z URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Popis symbolů"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Datum\n"
+#~ "Od\n"
+#~ "Celé jméno odesílatele\n"
+#~ "Křestní jméno odesílatele\n"
+#~ "Iniciály odesílatele\n"
+#~ "Předmět\n"
+#~ "Komu\n"
+#~ "Kopie\n"
+#~ "Diskuzní skupina\n"
+#~ "Číslo zprávy"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Tělo zprávy\n"
+#~ "Citované tělo zprávy\n"
+#~ "Tělo zprávy bez podpisu\n"
+#~ "Citované tělo zprávy bez podpisu\n"
+#~ "Znak %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Znak zpětné lomítko\n"
+#~ "Znak otazník\n"
+#~ "Znak levá složená závorka\n"
+#~ "Znak pravá složená závorka"
+
+#~ msgid "Key bindings"
+#~ msgstr "Klávesové zkratky"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Vyberte klávesové zkratky.\n"
+#~ "Klávesovou zkratku pro nabídku můžete také změnit tak,\n"
+#~ "že při najetí myší na položku stisknete odpovídající klávesu."
+
+#~ msgid "Default"
+#~ msgstr "Výchozí"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Starý Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Výběr písma"
 
@@ -6736,9 +6421,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Nastavuji grafické prvky..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Přesouvám zprávu %s%c%d do %s...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tOznačuji zprávy..."
 
diff --git a/po/da.po b/po/da.po
index 847faff8..6c0fd6b1 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -14,13 +14,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Læs konfiguration for hver konto...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "kunne ikke gemme konfiguration til fil\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 forbindelse til %s blev afbrudt. Forbinder...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP server sti."
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Kan ikke starte TLS session.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Sender meddelelse (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Flytter meddelelse %s%c%d til %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Modtager meddelelse fra %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "kan ikke sætte slettede flag: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "kan ikke slette\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Modtager meddelelse fra %s..."
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "kan ikke sætte slettet flag: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "kan ikke vælge mappe %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Markéret fil ikke fundet.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "fejl ved modtagelse af LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "kan ikke oprette '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "kan ikke oprette '%s'\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "kan ikke oprette mailbox: LIST fejlet\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "kan ikke oprette mailbox\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "kan ikke omdøbe mailbox: %s til %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "kan ikke slette mailbox\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "kan ikke modtage kovert\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Sender meddelelse (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "fejl ved modtagelse af kuvert.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "kan ikke læse kuvert: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "kan ikke modtage namespace\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "kan ikke vælge mappe %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 godkendelse fejlede.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4-Login fejlet.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "kan ikke tilføje %s til %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(sender fil...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "kan ikke tilføje meddelelse %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "kan ikke kopiere %s til %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "fejl ved IMAP kommando: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "fejl ved IMAP kommand: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "fejl ved IMAP kommand: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv can ikke konvertere %s til UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "kan ikke kopiere meddelelse %s til %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Kan ikke åbne markéret fil.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "fra og til mappe er ens.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Sidste nummer i sti %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Filen `%s' eksisterer allerede.\n"
+"Kan ikke oprette mappe."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "oprettet NNTP forbindelse til %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP forbindelse til %s:%d blev afbrudt. Genforbinder...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "Artikel %d er allerede gemt.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "modtager artikel %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "kann ikke læse artikel %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "kann ikke modtage nyhedsgruppe liste\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "kan ikke sende artikel.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "kan ikke modtage artikel %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "kan ikke vælge gruppe: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "ugyldigt artikel område: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "ingen nye artikler.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "modtager XOVER %d - %d i %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "kan ikke modtage XOVER\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "fejl ved modtagelse af XOVER.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "ugyldig XOVER linie: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "kan ikke modtage XHDR\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "fejl ved modtagelse af XHDR.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Kan ikke forbinde til NNTP server: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protokol fejl: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protokol fejl\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Fejl ved afsendelse\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Fejl ved afsendelse af e-post."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Nødvendig APOP tid blev ikke fundet i velkomst\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Tid syntax fejl i velkomst\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 protokol fejl\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "ugyldig XOVER linie: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Sletter udløben meddelelse %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Sender meddelelse (%d / %d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "postkasse er låst\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "tid udløbet\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "kan ikke starte TLS session\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "fejl ved godkendelse\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Kommando tekst"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "fejl under POP3 session\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +418,53 @@ msgstr "Fundet %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration er gemt.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Mappe"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "kan ikke åbne markéret fil\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "kan ikke hente meddelelse %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Kan ikke læse tekst afsnit\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Udskrift kommando er ugyldig: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "fejl ved modtagelse af data.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Kan ikke skrive til fil.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH ikke tilgænglig\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "forkert SMTP svar\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "fejl under SMTP session\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ikke tilgænglig\n"
@@ -161,78 +596,6 @@ msgstr ""
 "program.Hvis ikke, så skriv til Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Læs konfiguration for hver konto...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Der er ny post vinduer åbent.\n"
-"Luk alle ny post vinduer inden rettelse af konti."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Åbn konto redigérings vindue...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Opret konto redigérings vindue...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Redigér konti"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nye meddelelser bliver testet i denne rækkefølge. Afmærk\n"
-"`G'-kolonnen, for at aktivere hentning via `hent alle'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Navn"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Redigér"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Standard konto "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Vil du virkelig slette denne konto?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Uden titel"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Slet konto"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -332,6 +695,14 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Navn"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -346,8 +717,8 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Filer"
 
@@ -368,9 +739,9 @@ msgid "/_File/New _Server"
 msgstr "/_Filer/Ny _server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
@@ -386,7 +757,7 @@ msgstr "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
@@ -418,8 +789,8 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
@@ -427,13 +798,13 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
@@ -450,17 +821,17 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Redigér"
 
@@ -472,7 +843,7 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -482,14 +853,14 @@ msgstr "Navn:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Slet"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -500,11 +871,11 @@ msgid "Lookup"
 msgstr "Overblik"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -530,7 +901,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -638,7 +1009,7 @@ msgstr "Adressebog konverterings fejl"
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Brugerflade"
 
@@ -658,8 +1029,7 @@ msgstr "E-post adresse"
 msgid "Group"
 msgstr "Gruppe"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Mappe"
 
@@ -683,15 +1053,15 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Note"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Fejl"
 
@@ -746,8 +1116,8 @@ msgstr "/_Tilføj..."
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
@@ -791,8 +1161,8 @@ msgstr "/_Redigér/_Fortryd"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
@@ -800,7 +1170,7 @@ msgstr "/_Redigér/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
@@ -812,7 +1182,7 @@ msgstr "/_Redigér/_Sæt ind"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
@@ -829,7 +1199,7 @@ msgstr "/_Redigér/Formater _alle lange linier"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vis"
@@ -851,9 +1221,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
@@ -869,7 +1239,7 @@ msgstr "/_Vis/_Linieal"
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
@@ -881,127 +1251,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
@@ -1009,14 +1379,14 @@ msgstr "/_Funktioner/_Adressebog"
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
@@ -1040,10 +1410,6 @@ msgstr "/_Meddelelse/_Kryptere"
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Kan ikke læse tekst afsnit\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
@@ -1120,7 +1486,7 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
@@ -1212,8 +1578,7 @@ msgstr "MIME type"
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Send"
 
@@ -1253,8 +1618,7 @@ msgstr "Vedhæft"
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Underskrift"
 
@@ -1262,7 +1626,7 @@ msgstr "Underskrift"
 msgid "Insert signature"
 msgstr "Indsæt underskrift"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1459,7 +1823,7 @@ msgstr "Ændre"
 msgid "Clear"
 msgstr "Tøm"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Værdi"
 
@@ -1492,7 +1856,6 @@ msgid " Check File "
 msgstr " Check fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Fil"
 
@@ -1548,12 +1911,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -1570,7 +1933,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1634,7 +1997,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. indtastninger"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Enkelt"
 
@@ -1691,7 +2054,6 @@ msgid "Exporting file:"
 msgstr "Eksporterer fil:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Vælg... "
 
@@ -1715,164 +2077,164 @@ msgstr "Overskrive eksisterende fil?"
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/_Opret ny mappe..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Slet mappe"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Søg meddelelse..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ingen ulæste meddelelser."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Abonner på nyhedsgruppe..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Slet nyhedsgruppe"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe træ...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ulæst"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1882,21 +2244,21 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1907,21 +2269,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1930,34 +2292,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2018,7 +2380,7 @@ msgstr "%d Nyhedsgruppe(r) modtaget (%s læst)"
 msgid "Newsgroups:"
 msgstr "Nyhedsgrupper:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Emne:"
 
@@ -2042,162 +2404,6 @@ msgstr "Opretter billed visning...\n"
 msgid "Can't load the image."
 msgstr "Kan ikke læse billede."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 forbindelse til %s blev afbrudt. Forbinder...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP server sti."
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Kan ikke starte TLS session.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "kan ikke sætte slettede flag: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "kan ikke slette\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "kan ikke sætte slettet flag: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "kan ikke vælge mappe %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Markéret fil ikke fundet.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "fejl ved modtagelse af LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "kan ikke oprette '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "kan ikke oprette '%s'\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "kan ikke oprette mailbox: LIST fejlet\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "kan ikke oprette mailbox\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "kan ikke omdøbe mailbox: %s til %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "kan ikke slette mailbox\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "kan ikke modtage kovert\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "fejl ved modtagelse af kuvert.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "kan ikke læse kuvert: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "kan ikke modtage namespace\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "kan ikke vælge mappe %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 godkendelse fejlede.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4-Login fejlet.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "kan ikke tilføje %s til %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(sender fil...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "kan ikke tilføje meddelelse %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "kan ikke kopiere %s til %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "fejl ved IMAP kommando: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "fejl ved IMAP kommand: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "fejl ved IMAP kommand: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv can ikke konvertere %s til UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importere"
@@ -2295,7 +2501,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Næste"
 
@@ -2311,148 +2517,148 @@ msgstr "Egenskaber"
 msgid "Finish"
 msgstr "Slut"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Gl. Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2461,29 +2667,29 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2492,11 +2698,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2505,16 +2711,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -2532,29 +2738,20 @@ msgstr "Indtast adgangskode"
 msgid "Protocol log"
 msgstr "Protokol log"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Filen `%s' eksisterer allerede.\n"
-"Kan ikke oprette mappe."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread er ikke understøttet i glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbner nyt meddelelses vindue"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2564,23 +2761,23 @@ msgstr ""
 "                         åbn ny meddelelse med disse filer vedhæftet\n"
 "                         ."
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              modtager nye meddelelser"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          modtager nye meddelelser fra alle konti"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i kø"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   viser antal meddelelser"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2588,24 +2785,24 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         viser status for hver mappe"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 viser denne hjælp"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              viser version og afslutter"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Udgående tegnsæt"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2619,19 +2816,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Du er ved at skrive ny meddelelse. Virklig afslutte?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Meddeleser i kø"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2640,661 +2837,661 @@ msgstr ""
 "OpenPGP ikke mulig."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Filer/_Mappe"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Filer/_Mappe/Opret _ny mappe..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Filer/_Mappe/_Slet mappe"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Slet _mappe"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Filer/_Mappe/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Filer/_Mappe/_Hent nye meddelelser i alle mapper"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Filer/_Importere mbox fil..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Filer/_Eksportere mbox fil..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Filer/_Tøm slettet post"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Filer/_Udskriv..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Filer/_Indsæt fil"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Filer/_Afslut"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigér/Markér _tråd"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigér/_Søg i aktuel meddelelse"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Søg meddelelser..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Vis/_Vis eller skjul"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vis/_Vis eller skjul/_Mappe træ"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vis/_Vis eller skjul/_Besked"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/Ikon _og tekst"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ingen"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vis/_Sortere/_Nummer orden"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vis/_Sortere/_Størrelses orden"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vis/_Sortere/Efter _modtager"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vis/_Sortere/_Farvet label orden"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vis/_Sortere/_Markéret orden"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vis/_Sortere/_Ulæst orden"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vis/_Sortere/_Vedhæft orden"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vis/_Sortere/Sorter _ikke"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Vis/_Sortere/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vis/_Sortere/Stigende"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Vis/_Trådet"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "_Vis/Åbn tråde"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vis/_Saml alle tråde"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Vis/_Sæt visning ..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Vis/_Gå til"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vis/_Gå til/_Forrige meddelelse"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vis/_Gå til/_Næste meddelelse"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Vis/_Gå til/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Vis/_Gå til/Forrige ulæste meddelelse"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vis/_Gå til/Næste ulæste meddelelse"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vis/_Gå til/_Forrige nye meddelelse"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vis/_Gå til/_Næste nye meddelelse"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vis/_Gå til/Forrige _markéret meddelelse"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vis/_Gå til/Næste  _markéret meddelelse"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vis/_Gå til/Forrige _label meddelelse"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Vis/_Alle hoved linier"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ændre vindue adskillelse type fra %d til %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3304,16 +3501,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3322,153 +3519,152 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -3586,32 +3782,32 @@ msgstr "Slutnigen af meddelelse nået; fortsæt fra starten?"
 msgid "Search finished"
 msgstr "Søgning afsluttet"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Opretter meddelelses vindue...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Vedhæftet"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3620,7 +3816,7 @@ msgstr ""
 "Indtast udkrift kommando:\n"
 "(`%s' bliver erstattat af fil navn)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3629,41 +3825,6 @@ msgstr ""
 "Udskriv kommando er ugyldig:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "kan ikke kopiere meddelelse %s til %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Kan ikke åbne markéret fil.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "fra og til mappe er ens.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Sidste nummer i sti %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Åbn"
@@ -3750,116 +3911,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME visnings kommando ugyldig: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "oprettet NNTP forbindelse til %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP forbindelse til %s:%d blev afbrudt. Genforbinder...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "Artikel %d er allerede gemt.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "modtager artikel %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "kann ikke læse artikel %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "kann ikke modtage nyhedsgruppe liste\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "kan ikke sende artikel.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "kan ikke modtage artikel %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "kan ikke vælge gruppe: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "ugyldigt artikel område: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "ingen nye artikler.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "modtager XOVER %d - %d i %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "kan ikke modtage XOVER\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "fejl ved modtagelse af XOVER.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "ugyldig XOVER linie: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "kan ikke modtage XHDR\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "fejl ved modtagelse af XHDR.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Kan ikke forbinde til NNTP server: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protokol fejl: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protokol fejl\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Fejl ved afsendelse\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Fejl ved afsendelse af e-post."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Adganssætning"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[ingen bruger ID]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3872,7 +3932,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s) an\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3880,455 +3940,6 @@ msgstr ""
 "Forkert adgangssætning! Prøv igen...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Nødvendig APOP tid blev ikke fundet i velkomst\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Tid syntax fejl i velkomst\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 protokol fejl\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "ugyldig XOVER linie: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Sletter udløben meddelelse %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Sender meddelelse (%d / %d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "postkasse er låst\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "tid udløbet\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "kan ikke starte TLS session\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "fejl ved godkendelse\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Kommando tekst"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "fejl under POP3 session\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Åbner konti egenskaber...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Konto%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Opsæt af ny konto"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Konto opsæt"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Opretter konto egenskaber...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Modtag"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privat"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Navn på denne konto"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Standard konto"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Personlige informationener"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Fuldt navn"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-post adresse"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organisation"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Server data"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Ingen (lokal)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Dennes server kræver godkendelse"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Nyheds server"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server til modtagelse"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP server (afsendelse)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Bruger ID"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Adgangskode"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Dennes server kræver godkendelse"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Slet meddelelser fra server efter modtagelse"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Slet efter"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dage"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dage: slet straks)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Hent alle meddelelser fra server"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Modtagelses størrelse maks."
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "kB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrere meddelelse ved modtagelse"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Standard indbakke"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Godkendelses metode"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Nyheder"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr "Max antal artikler ved hentning (0 angiver alle)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Mangler modtager"
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Hent alle' henter post fra denne konto"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Hoved"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Tilføj dato linie"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Opret meddelelses ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Tilføj bruger defineret hoved"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Redigér... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Godkendelse"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP godkendelse (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Hvis du lader disse være tomme, benyttes\n"
-"samme bruger ID og adgangskode som ved modtagelse."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Godkend med POP3 før afsendelse"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Kommando tekst"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Udfyld automatisk følgende adresser"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Svar til"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Signer altid meddelelse"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Krypter altid meddelelser"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Benyt ASCII format til kodning"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Benyt klar tekst underskrift"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Underskrifts nøgle"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Benyt standard GnuPg nøgle"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Vælg nøgle efter e-post adresse"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Angiv nøgle manuelt"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Bruger eller nøgle ID"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Benyt ikke SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Benyt SSL til POP3 forbindelse"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Benyt STARTTLS kommando til at starte SSL session"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Benyt SSL til IMAP4 forbindelse"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Benyt SSL til NNTP forbindelse"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Send (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Benyt SSL til SMTP forbindelse"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Benyt ublokerende SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(Slp dette fra hvis du har problemer med SSL forbindelser)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Angiv SMTP port"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Angiv POP3 port"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Angiv IMAP4 port"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Angiv NNTP port"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Angiv domæne navn"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP server sti."
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Gem sendte meddelelser i"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Gem kladde i"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Gem slettede meddelelser i"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Konto navn er ikke angivet."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "E-post adresse ikke angivet."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP server ikke angivet."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Bruger ID ikke angivet."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3 server ikke angivet."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4 server ikke angivet"
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP server ikke angivet."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Det anbefales ikke at anvende det gamle ASCII format\n"
-"til at kode meddelelser. Derved overholdes RFC-3156 - MIME\n"
-"Security med OpenPGP ikke."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Handlingsopsæt"
@@ -4393,17 +4004,17 @@ msgstr " Syntaks hjælp"
 msgid "Registered actions"
 msgstr "Registrerede handlinger"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Op"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Ned"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nye)"
 
@@ -4446,835 +4057,31 @@ msgstr "Slet handling"
 msgid "Do you really want to delete this action?"
 msgstr "Vil du virkelig slette denne handling?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Mappe"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Opretter generelt opsæt vindue...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Generelt opsæt"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Vis"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Meddelelse"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Anden"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Benyt eksternt program til modtagelse af e-post"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Kommando"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Modtager fra lokal spool"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filter ved modtagelse"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Automatisk hentning af ny post"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "hver"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minut(er)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Hent e-post ved programstart"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Opdater alle mapper efter modtagelse"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Modtager antal nye meddelelser (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Benyt eksternt program for afsendelse"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Gem sendte meddelelser i Sendt"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Udgående tegnsæt"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatisk (Anbefalet)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Western European (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Western European (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Central European (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltic (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltic (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Greek (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Greek (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turkish (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrillic (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrillic (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cyrillic (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japanese (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japanese (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japanese (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Simplified Chinese (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Simplified Chinese (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Traditional Chinese (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Traditional Chinese (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chinese (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korean (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Hvis `Automatisk' er valgt benyttes det optimale\n"
-"tegnsæt for den valgte locale."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Kodning af overførsel"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Angiv Content-Transfer-Encoding anvendt hvis\n"
-"besked inholder andet end ASCII tegn."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Underskriftsdeling"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Tilføj automatisk"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Start automatisk ekstern editor"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Fortryd niveauer"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Del linier ved"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "tegn"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Del citat linier"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Del ved indtastning"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Del linier før afsendelse"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Vælg automatisk konto ved besvarelse"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citat af meddelelse i svar"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Svar knap starter svar til mail liste"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Svar format"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Citat tegn"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Videresend format"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Beskrivelse af symboler "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Skrifttype"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Oversæt hoved navn (fx. `Fra:', `Emne:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Vis antal ulæste ved siden af mappe navn"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Forkort nyhedsgruppe længere end"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "bogstaver"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Meddelelses visning"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Vis modtager i `Fra' hvis du er afsender"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Åbn tråde"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Dato format"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Vælg oplysninger i oversigt... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Benyt farver i meddelelser"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Vis 2-byte alfabet og tal som ASCII\n"
-"tegn (kun japansk)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Vis hoved linier over meddelelses vindue"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Vis korte hoved linier i meddelelses vindue"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Vis korte hoved linier i meddelelses vindue"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Linie afstand"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "punkter"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Scrol"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Halv side"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Blød scroll"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Skrift"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "Ændre størrelse på vedhæftede billeder"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Hoved opsæt"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Udfør"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Udfør"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Mappe"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrere meddelelse ved modtagelse"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Check signatur automatisk"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Vis signatur check resultat i separat vindue"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Gem  adgangssætning midlertidigt i hukommelsen"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Udløb efter"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minut(er)"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Sæt til '0' vil gemme adgangssætningen\n"
-" for hele sessionen)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Overtag indtastning mens adgangssætning indtastes"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Advarsel ved start hvis GnuPG ikke virker"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Åbn altid besked i oversigtsbilledet hvis valgt"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Åbn første ulæste meddelelse ved indgang til mappe"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Markér kun meddelelser som læst hvis åbnet i nyt vindue"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Gå til Indbakke efter modtagelse af ny post"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr "(Ellers markéres meddelelese indtil der vælges 'Udfør')"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Vis modtag billede"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Vis modtag billede"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Altid"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Aldrig"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Vis ikke fejlmeddelelse ved fejl"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Luk modtag vindue efter overførsel"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Vælg tast bindinger... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Web browser"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Tilføj adresse til 'Til' ved dobbeltklik"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Ved afslut"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Spørg ved afslut"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Tøm Slettet ved afslut"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Spørg før tømning"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Advar ved meddelelser i kø"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Skriver oversigt (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Socket I/O timeout:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "sekund(er)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "kort ugedags navn"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "Ugedags navn"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "kort måneds navn"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "måneds navn"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "ønsket dato format for nuværende locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "århundrede (år/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "dag i måned som tal"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "time som tal (24 timers visning)"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "time som tal (12 timers visning)"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "århundrede som tal"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "måned som tal"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minut som tal"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "enten AM eller PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekund som tal"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "ugedag som tal"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "ønsket dato format for nuværende locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "de sidste to cifre i året"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "året som tal"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "tidszone som navn eller forkortelse"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Vælger"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Eksempel"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Angiv meddelelses farve"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Farve"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Citeret tekst - 1. niveau"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Citeret tekst - 2. niveau"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Citeret tekst - 3. nivaur"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI-Link"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Genbrug citat farver"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Vælg farve for nivau 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Vælg farve for nivau 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Vælg farve for nivau 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Vælg farve for URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Beskrivelse af symboler"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Dato\n"
-"Fra\n"
-"Afsenders fulde navn\n"
-"Afsenders fornavn\n"
-"Afsenders initaler\n"
-"Emne\n"
-"Til\n"
-"CC\n"
-"Nyhedsgrupper\n"
-"Meddelelses ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Hvis x er valgt vises expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Meddelelses krop\n"
-"Citeret meddelelses krop\n"
-"Meddelelses krop uden signatur\n"
-"Citeret meddelelses krop uden signatur\n"
-"%"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"\\\n"
-"?\n"
-"{\n"
-"}"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Tast bindinger"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Vælg standarden for genvejdstaster.\n"
-"Du kan også ændre hver menus genvejstast ved at taste enhver ved at placere\n"
-"mus over menu punkt og taste en tast."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Standard"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Gl. Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Bruger defineret hoved opsæt"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Hoved"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Slet "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Brugerdef. hoved"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Hoved navn ikke opsat."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Slet hoved"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Virklig slette denne hoved linie?"
 
@@ -5322,12 +4129,21 @@ msgstr "Filter opsæt"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Redigér"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wollen Sie wirklich diese Regel Slet?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Uden titel"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Slet regel"
 
@@ -5416,6 +4232,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "kB"
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5557,6 +4377,10 @@ msgstr "Slet [...] og (...) i starten af Emne i besvarelser"
 msgid "Apply to subfolders"
 msgstr "Benyt til undermapper"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Udfyld automatisk følgende adresser"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "benyt også ved svar"
@@ -5630,64 +4454,46 @@ msgstr "Viste oplysninger"
 msgid " Revert to default "
 msgstr " Standard indstilling "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Skabelon navn"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registrere"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Erstat "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Symbol "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrerede skabloner"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Skabeloner"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Skabelon"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Skabelon format fejl."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Slet Skabelon"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Vil du virkelig slette denne Skabelon?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "kan ikke åbne markéret fil\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "kan ikke hente meddelelse %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Udskrift kommando er ugyldig: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Opretter dialog...\n"
@@ -5696,29 +4502,21 @@ msgstr "Opretter dialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "fejl ved modtagelse af data.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Kan ikke skrive til fil.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Kan ikke finde bruger ID for denne nøgle."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Underskrift fra %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Fejl ved verificering af underskrift"
 
@@ -5744,6 +4542,10 @@ msgstr "Nøgle ID"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Anden"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Tilføj nøgle"
@@ -5765,87 +4567,87 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Hoved ugyldigt på meddelelse i kø.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Kan ikke udføre ekstern kommando: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fejl ved afsendelse af e-post."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Forbinder"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Forbindelse med SMTP server: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Sende meddelelse..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Sender"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Sender DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Sende Meddelelse"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 #, fuzzy
 msgid "Error occurred while sending the message."
 msgstr ""
 "Fejl ved afsendelse meddelelse:\n"
 "%s"
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5946,32 +4748,20 @@ msgstr "DÅRLIG underskrift"
 msgid "No public key to verify the signature"
 msgstr "Ingen offentlig nøgle til verificering af denne underskrift"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH ikke tilgænglig\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "forkert SMTP svar\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "fejl under SMTP session\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Opretter kilde vindue...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Meddelelses kilde"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Viser kilder %s...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Kilde"
@@ -6370,6 +5160,914 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Der er ny post vinduer åbent.\n"
+#~ "Luk alle ny post vinduer inden rettelse af konti."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Åbn konto redigérings vindue...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Opret konto redigérings vindue...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Redigér konti"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nye meddelelser bliver testet i denne rækkefølge. Afmærk\n"
+#~ "`G'-kolonnen, for at aktivere hentning via `hent alle'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokol"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Standard konto "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Vil du virkelig slette denne konto?"
+
+#~ msgid "Delete account"
+#~ msgstr "Slet konto"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Åbner konti egenskaber...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Konto%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Opsæt af ny konto"
+
+#~ msgid "Account preferences"
+#~ msgstr "Konto opsæt"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Opretter konto egenskaber...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Modtag"
+
+#~ msgid "Privacy"
+#~ msgstr "Privat"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanceret"
+
+#~ msgid "Name of this account"
+#~ msgstr "Navn på denne konto"
+
+#~ msgid "Set as default"
+#~ msgstr "Standard konto"
+
+#~ msgid "Personal information"
+#~ msgstr "Personlige informationener"
+
+#~ msgid "Full name"
+#~ msgstr "Fuldt navn"
+
+#~ msgid "Mail address"
+#~ msgstr "E-post adresse"
+
+#~ msgid "Organization"
+#~ msgstr "Organisation"
+
+#~ msgid "Server information"
+#~ msgstr "Server data"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Ingen (lokal)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Dennes server kræver godkendelse"
+
+#~ msgid "News server"
+#~ msgstr "Nyheds server"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server til modtagelse"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP server (afsendelse)"
+
+#~ msgid "User ID"
+#~ msgstr "Bruger ID"
+
+#~ msgid "Password"
+#~ msgstr "Adgangskode"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Dennes server kræver godkendelse"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Slet meddelelser fra server efter modtagelse"
+
+#~ msgid "Remove after"
+#~ msgstr "Slet efter"
+
+#~ msgid "days"
+#~ msgstr "dage"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dage: slet straks)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Hent alle meddelelser fra server"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Modtagelses størrelse maks."
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrere meddelelse ved modtagelse"
+
+#~ msgid "Default inbox"
+#~ msgstr "Standard indbakke"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Godkendelses metode"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatisk"
+
+#~ msgid "News"
+#~ msgstr "Nyheder"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "Max antal artikler ved hentning (0 angiver alle)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Mangler modtager"
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Hent alle' henter post fra denne konto"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Tilføj dato linie"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Opret meddelelses ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Tilføj bruger defineret hoved"
+
+#~ msgid " Edit... "
+#~ msgstr " Redigér... "
+
+#~ msgid "Authentication"
+#~ msgstr "Godkendelse"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP godkendelse (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Hvis du lader disse være tomme, benyttes\n"
+#~ "samme bruger ID og adgangskode som ved modtagelse."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Godkend med POP3 før afsendelse"
+
+#~ msgid "Command output"
+#~ msgstr "Kommando tekst"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Svar til"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Signer altid meddelelse"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Krypter altid meddelelser"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Benyt ASCII format til kodning"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Benyt klar tekst underskrift"
+
+#~ msgid "Sign key"
+#~ msgstr "Underskrifts nøgle"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Benyt standard GnuPg nøgle"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Vælg nøgle efter e-post adresse"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Angiv nøgle manuelt"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Bruger eller nøgle ID"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Benyt ikke SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Benyt SSL til POP3 forbindelse"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Benyt STARTTLS kommando til at starte SSL session"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Benyt SSL til IMAP4 forbindelse"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Benyt SSL til NNTP forbindelse"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Send (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Benyt SSL til SMTP forbindelse"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Benyt ublokerende SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(Slp dette fra hvis du har problemer med SSL forbindelser)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Angiv SMTP port"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Angiv POP3 port"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Angiv IMAP4 port"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Angiv NNTP port"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Angiv domæne navn"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP server sti."
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Gem sendte meddelelser i"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Gem kladde i"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Gem slettede meddelelser i"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Konto navn er ikke angivet."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "E-post adresse ikke angivet."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP server ikke angivet."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Bruger ID ikke angivet."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3 server ikke angivet."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4 server ikke angivet"
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP server ikke angivet."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Det anbefales ikke at anvende det gamle ASCII format\n"
+#~ "til at kode meddelelser. Derved overholdes RFC-3156 - MIME\n"
+#~ "Security med OpenPGP ikke."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Opretter generelt opsæt vindue...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Generelt opsæt"
+
+#~ msgid "Quote"
+#~ msgstr "Citat"
+
+#~ msgid "Display"
+#~ msgstr "Vis"
+
+#~ msgid "Message"
+#~ msgstr "Meddelelse"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Benyt eksternt program til modtagelse af e-post"
+
+#~ msgid "Command"
+#~ msgstr "Kommando"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Modtager fra lokal spool"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filter ved modtagelse"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Automatisk hentning af ny post"
+
+#~ msgid "every"
+#~ msgstr "hver"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut(er)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Hent e-post ved programstart"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Opdater alle mapper efter modtagelse"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Modtager antal nye meddelelser (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Benyt eksternt program for afsendelse"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Gem sendte meddelelser i Sendt"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Udgående tegnsæt"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatisk (Anbefalet)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Western European (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Western European (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Central European (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltic (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltic (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Greek (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Greek (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Cyrillic (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turkish (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cyrillic (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cyrillic (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cyrillic (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cyrillic (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japanese (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japanese (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japanese (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Simplified Chinese (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Simplified Chinese (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Traditional Chinese (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Traditional Chinese (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chinese (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korean (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Hvis `Automatisk' er valgt benyttes det optimale\n"
+#~ "tegnsæt for den valgte locale."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Kodning af overførsel"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Angiv Content-Transfer-Encoding anvendt hvis\n"
+#~ "besked inholder andet end ASCII tegn."
+
+#~ msgid "Signature separator"
+#~ msgstr "Underskriftsdeling"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Tilføj automatisk"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Start automatisk ekstern editor"
+
+#~ msgid "Undo level"
+#~ msgstr "Fortryd niveauer"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Del linier ved"
+
+#~ msgid "characters"
+#~ msgstr "tegn"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Del citat linier"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Del ved indtastning"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Del linier før afsendelse"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Vælg automatisk konto ved besvarelse"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citat af meddelelse i svar"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Svar knap starter svar til mail liste"
+
+#~ msgid "Reply format"
+#~ msgstr "Svar format"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Citat tegn"
+
+#~ msgid "Forward format"
+#~ msgstr "Videresend format"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Beskrivelse af symboler "
+
+#~ msgid "Font"
+#~ msgstr "Skrifttype"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Oversæt hoved navn (fx. `Fra:', `Emne:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Vis antal ulæste ved siden af mappe navn"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Forkort nyhedsgruppe længere end"
+
+#~ msgid "letters"
+#~ msgstr "bogstaver"
+
+#~ msgid "Summary View"
+#~ msgstr "Meddelelses visning"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Vis modtager i `Fra' hvis du er afsender"
+
+#~ msgid "Expand threads"
+#~ msgstr "Åbn tråde"
+
+#~ msgid "Date format"
+#~ msgstr "Dato format"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Vælg oplysninger i oversigt... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Benyt farver i meddelelser"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Vis 2-byte alfabet og tal som ASCII\n"
+#~ "tegn (kun japansk)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Vis hoved linier over meddelelses vindue"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Vis korte hoved linier i meddelelses vindue"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Vis korte hoved linier i meddelelses vindue"
+
+#~ msgid "Line space"
+#~ msgstr "Linie afstand"
+
+#~ msgid "pixel(s)"
+#~ msgstr "punkter"
+
+#~ msgid "Scroll"
+#~ msgstr "Scrol"
+
+#~ msgid "Half page"
+#~ msgstr "Halv side"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Blød scroll"
+
+#~ msgid "Step"
+#~ msgstr "Skrift"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Ændre størrelse på vedhæftede billeder"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Hoved opsæt"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Udfør"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Udfør"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Mappe"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrere meddelelse ved modtagelse"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Check signatur automatisk"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Vis signatur check resultat i separat vindue"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Gem  adgangssætning midlertidigt i hukommelsen"
+
+#~ msgid "Expired after"
+#~ msgstr "Udløb efter"
+
+#~ msgid "minute(s) "
+#~ msgstr "minut(er)"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Sæt til '0' vil gemme adgangssætningen\n"
+#~ " for hele sessionen)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Overtag indtastning mens adgangssætning indtastes"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Advarsel ved start hvis GnuPG ikke virker"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Åbn altid besked i oversigtsbilledet hvis valgt"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Åbn første ulæste meddelelse ved indgang til mappe"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Markér kun meddelelser som læst hvis åbnet i nyt vindue"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Gå til Indbakke efter modtagelse af ny post"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr "(Ellers markéres meddelelese indtil der vælges 'Udfør')"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Vis modtag billede"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Vis modtag billede"
+
+#~ msgid "Always"
+#~ msgstr "Altid"
+
+#~ msgid "Never"
+#~ msgstr "Aldrig"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Vis ikke fejlmeddelelse ved fejl"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Luk modtag vindue efter overførsel"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Vælg tast bindinger... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Web browser"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Tilføj adresse til 'Til' ved dobbeltklik"
+
+#~ msgid "On exit"
+#~ msgstr "Ved afslut"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Spørg ved afslut"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Tøm Slettet ved afslut"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Spørg før tømning"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Advar ved meddelelser i kø"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Skriver oversigt (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Socket I/O timeout:"
+
+#~ msgid "second(s)"
+#~ msgstr "sekund(er)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "kort ugedags navn"
+
+#~ msgid "the full weekday name"
+#~ msgstr "Ugedags navn"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "kort måneds navn"
+
+#~ msgid "the full month name"
+#~ msgstr "måneds navn"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "ønsket dato format for nuværende locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "århundrede (år/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "dag i måned som tal"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "time som tal (24 timers visning)"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "time som tal (12 timers visning)"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "århundrede som tal"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "måned som tal"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minut som tal"
+
+#~ msgid "either AM or PM"
+#~ msgstr "enten AM eller PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekund som tal"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "ugedag som tal"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "ønsket dato format for nuværende locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "de sidste to cifre i året"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "året som tal"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "tidszone som navn eller forkortelse"
+
+#~ msgid "Specifier"
+#~ msgstr "Vælger"
+
+#~ msgid "Description"
+#~ msgstr "Beskrivelse"
+
+#~ msgid "Example"
+#~ msgstr "Eksempel"
+
+#~ msgid "Set message colors"
+#~ msgstr "Angiv meddelelses farve"
+
+#~ msgid "Colors"
+#~ msgstr "Farve"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Citeret tekst - 1. niveau"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Citeret tekst - 2. niveau"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Citeret tekst - 3. nivaur"
+
+#~ msgid "URI link"
+#~ msgstr "URI-Link"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Genbrug citat farver"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Vælg farve for nivau 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Vælg farve for nivau 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Vælg farve for nivau 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Vælg farve for URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Beskrivelse af symboler"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Dato\n"
+#~ "Fra\n"
+#~ "Afsenders fulde navn\n"
+#~ "Afsenders fornavn\n"
+#~ "Afsenders initaler\n"
+#~ "Emne\n"
+#~ "Til\n"
+#~ "CC\n"
+#~ "Nyhedsgrupper\n"
+#~ "Meddelelses ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Hvis x er valgt vises expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Meddelelses krop\n"
+#~ "Citeret meddelelses krop\n"
+#~ "Meddelelses krop uden signatur\n"
+#~ "Citeret meddelelses krop uden signatur\n"
+#~ "%"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "\\\n"
+#~ "?\n"
+#~ "{\n"
+#~ "}"
+
+#~ msgid "Key bindings"
+#~ msgstr "Tast bindinger"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Vælg standarden for genvejdstaster.\n"
+#~ "Du kan også ændre hver menus genvejstast ved at taste enhver ved at "
+#~ "placere\n"
+#~ "mus over menu punkt og taste en tast."
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Gl. Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Skrifttype"
 
@@ -6735,9 +6433,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Sætter Widgets..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Flytter meddelelse %s%c%d til %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tMarkérer meddelelser..."
 
diff --git a/po/de.po b/po/de.po
index 6a736850..ef5f1faa 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2005-07-22 18:18+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -16,13 +16,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Lese alle Einstellungen für jeden Account...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Verbinde erneut...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP-Server verhindert LOGIN.\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Kann TLS-Sitzung nicht beginnen.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Sende Nachricht (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Erhaltene Nachrichten von %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "kann gelöschte Flags nicht setzen: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "kann nicht löschen\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Erhaltene Nachrichten von %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "kann Ablage nicht schließen\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "Wurzelverzeichnis %s existiert nicht\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "Fehler beim Empfang von LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Kann '%s' nicht erstellen\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Kann '%s' in INBOX nicht erstellen\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "kann Mailbox nicht erstellen\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "kann Mailbox %s nicht in %s umbenennen\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "kann Mailbox nicht löschen\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Sende Nachricht (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "kann Namensraum nicht empfangen\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "kann Ablage %s nicht auswählen\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4-Login fehlgeschlagen.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "kann %s nicht an %s anhängen\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(Datei versenden...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "kann Nachricht nicht anhängen an %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "kann %s nicht nach %s kopieren\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "kann Nachricht %s nicht nach %s kopieren\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Kann markierte Datei nicht öffnen.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Letzte Nummer im Verzeichnis %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Datei '%s' existiert bereits.\n"
+"Kann Ablage nicht erstellen."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"Verzeichnisname '%s' ist keine gültige UTF-8 Zeichenkette.\n"
+"Vielleicht ist der lokale Zeichensatz im Dateinamen verwendet worden.\n"
+"In diesem Fall musst Du die folgende Umgebungsvariable setzen (siehe README "
+"für Details):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "erstelle NNTP-Verbindung zu %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP-Verbindung mit %s:%d wurde aufgehoben. Erneut verbinden...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "Artikel %d wurde schon zwischengespeichert.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "empfange Artikel %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "kann Artikel %d nicht lesen\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "kann die Newsgroup-Liste nicht empfangen\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "kann Artikel nicht senden.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "kann Artikel %d nicht empfangen\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "kann die Gruppe: %s nicht wählen\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "ungültiger Artikelbereich: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "Keine neuen Artikel.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "bekomme Newsübersicht %d - %d in %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "kann Newsübersicht nicht bekommen\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "Fehler beim Empfang der Newsübersicht.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "ungültige Newsübersichtszeile: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "kann XHDR nicht bekommen\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "Fehler beim Empfang von XHDR.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "Protokollfehler: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "Protokollfehler\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Fehler beim Senden\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Fehler aufgetreten beim Senden eines Befehls\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Erforderlichen APOP-Zeitstempel in der Begrüßung nicht gefunden\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3-Protokollfehler\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "ungültige UIDL-Antwort: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Lösche abgelaufene Nachricht %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Nachricht %d überspringen (%d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "Mailbox ist blockiert\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "Sitzungszeit abgelaufen\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "kann TLS-Sitzung nicht beginnen\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "Fehler während der Beglaubigung\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "Befehl wird nicht unterstützt\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "Fehler während einer POP3-Sitzung\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -32,6 +420,52 @@ msgstr "Gefunden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration wurde gespeichert.\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "Spam Mail Filter"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "kann markierte Datei nicht öffnen\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "kann Nachricht %d nicht holen\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Kann Textabschnitt nicht lesen\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Druck-Befehlszeile ist ungültig: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "Fehler beim Empfang von Daten.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Kann nicht in Datei schreiben.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH nicht verfügbar\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "fehlerhafte SMTP-Antwort\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "Fehler während einer SMTP-Sitzung\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nicht verfügbar\n"
@@ -165,77 +599,6 @@ msgstr ""
 "erhalten haben; wenn nicht, dann schreiben Sie an Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Lese alle Einstellungen für jeden Account...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Es sind einige Fenster zum Verfassen von Nachrichten geöffnet.\n"
-"Bitte schließen Sie diese Fenster vor dem Beabeiten der Accounts."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Öffne Accountbearbeitungsfenster...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Erstelle Accountbearbeitungsfenster...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Bearbeite Accounts"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Neue Nachrichten werden in dieser Reihenfolge geprüft. Wählen Sie die "
-"Schalter\n"
-"in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Name"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr "Setze als _Standardaccount "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Wollen Sie den Account '%s' wirklich löschen?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "Unbenannt"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Account löschen"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -335,6 +698,14 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Name"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -349,8 +720,8 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datei"
 
@@ -371,9 +742,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
@@ -389,7 +760,7 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
@@ -421,8 +792,8 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
@@ -430,13 +801,13 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
@@ -453,17 +824,17 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
@@ -475,7 +846,7 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -485,14 +856,14 @@ msgstr "Name:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Löschen"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -503,11 +874,11 @@ msgid "Lookup"
 msgstr "Vorschau"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -534,7 +905,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -646,7 +1017,7 @@ msgstr "Adressbuch-Konvertierungs-Fehler"
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
@@ -666,8 +1037,7 @@ msgstr "E-Mail Adresse"
 msgid "Group"
 msgstr "Gruppe"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Ablage"
 
@@ -691,15 +1061,15 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Notiz"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Fehler"
 
@@ -754,8 +1124,8 @@ msgstr "/_Hinzufügen..."
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
@@ -795,8 +1165,8 @@ msgstr "/_Bearbeiten/_Zurück"
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
@@ -804,7 +1174,7 @@ msgstr "/_Bearbeiten/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
@@ -816,7 +1186,7 @@ msgstr "/_Bearbeiten/_Einfügen"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
@@ -832,7 +1202,7 @@ msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ansicht"
@@ -854,9 +1224,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
@@ -872,7 +1242,7 @@ msgstr "/_Ansicht/_Lineal"
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichensatz"
 
@@ -883,103 +1253,103 @@ msgstr "/_Ansicht/_Zeichensatz/_Automatisch"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Hebräisch (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
@@ -987,14 +1357,14 @@ msgstr "/_Werkzeug/_Adressbuch"
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
@@ -1015,10 +1385,6 @@ msgstr "/_Werkzeug/PGP _Verschlüsseln"
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Kann Textabschnitt nicht lesen\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
@@ -1094,7 +1460,7 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
@@ -1187,8 +1553,7 @@ msgstr "MIME-Typ"
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Senden"
 
@@ -1228,8 +1593,7 @@ msgstr "Anhängen"
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Unterschrift"
 
@@ -1237,7 +1601,7 @@ msgstr "Unterschrift"
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1429,7 +1793,7 @@ msgstr "Ändern"
 msgid "Clear"
 msgstr "Leeren"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Wert"
 
@@ -1462,7 +1826,6 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Datei"
 
@@ -1518,12 +1881,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -1540,7 +1903,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1604,7 +1967,7 @@ msgstr "Timeout (Sek.)"
 msgid "Maximum Entries"
 msgstr "Einträge (Max.)"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Einfach"
 
@@ -1661,7 +2024,6 @@ msgid "Exporting file:"
 msgstr "Exportiere Datei:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Auswählen... "
 
@@ -1685,160 +2047,160 @@ msgstr "Überschreibe existierende Datei?"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/Ablage _verschieben..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Ablage _löschen"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Leere _Papierkorb"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten prüfen"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/A_blagebaum erneuern"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Suche Nachrichten..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Herunterladen"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1848,21 +2210,21 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1875,21 +2237,21 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1898,34 +2260,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -1986,7 +2348,7 @@ msgstr "%d Newsgruppe(n) empfangen (%s gelesen)"
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -2010,159 +2372,6 @@ msgstr "Erstelle Bilderansicht...\n"
 msgid "Can't load the image."
 msgstr "Kann das Bild nicht laden."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Verbinde erneut...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP-Server verhindert LOGIN.\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Kann TLS-Sitzung nicht beginnen.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "kann gelöschte Flags nicht setzen: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "kann nicht löschen\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "kann Ablage nicht schließen\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "Wurzelverzeichnis %s existiert nicht\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "Fehler beim Empfang von LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Kann '%s' nicht erstellen\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Kann '%s' in INBOX nicht erstellen\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "kann Mailbox nicht erstellen\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "kann Mailbox %s nicht in %s umbenennen\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "kann Mailbox nicht löschen\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "kann Namensraum nicht empfangen\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "kann Ablage %s nicht auswählen\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4-Login fehlgeschlagen.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "kann %s nicht an %s anhängen\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(Datei versenden...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "kann Nachricht nicht anhängen an %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "kann %s nicht nach %s kopieren\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importieren"
@@ -2261,7 +2470,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Nächste"
 
@@ -2277,143 +2486,143 @@ msgstr "Eigenschaften"
 msgid "Finish"
 msgstr "Ende"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Altes Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2422,28 +2631,28 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2452,11 +2661,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2465,15 +2674,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -2491,29 +2700,20 @@ msgstr "Kennwort eingeben"
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Datei '%s' existiert bereits.\n"
-"Kann Ablage nicht erstellen."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird nicht unterstützt von Glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2523,23 +2723,23 @@ msgstr ""
 "                         öffne Verfassen-Fenster mit angegebenen Dateien\n"
 "                         angehängt"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle Nachrichten aus der Warteschlange"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2547,23 +2747,23 @@ msgstr ""
 "  --status-full [Ablage]...\n"
 "                         zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                Fehlersuche"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "Dateiname Zeichensatz"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2587,19 +2787,19 @@ msgstr ""
 "\n"
 "Weiter?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Verfasste Nachricht existiert. Wirklich beenden?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2608,15 +2808,15 @@ msgstr ""
 "OpenPGP-Unterstützung ausgeschaltet"
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2624,616 +2824,616 @@ msgstr ""
 "Ein frühere Konfiguration wurde gefunden.\n"
 "Soll sie migriert werden?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Datei/Ab_lage"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/Ab_lage/_Neue Ablage erstellen..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/Ab_lage/Ablage _umbenennen..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datei/Ab_lage/Ablage _verschieben..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/Ab_lage/Ablage _löschen"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Datei/_Mailbox"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datei/_Mailbox/Mailbox _hinzufügen..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Datei/_Mailbox/Mailbox _entfernen"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datei/_Mailbox/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Datei/_Mailbox/Auf neue Nachrichten _prüfen"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datei/_Mailbox/_Alle Ablagen auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//_Datei/_Mailbox/Ablagebaum _erneuern"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datei/_Importiere Mbox-Datei..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datei/_Exportiere in Mbox-Datei..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Datei/Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datei/Speichern _als..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Datei/_Ohne Verbindung arbeiten"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Thread auswählen"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/_Aktuelle Nachricht durchsuchen..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Bearbeiten/_Suche Nachrichten..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/Zeigen oder Verstecken"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht//Zeigen oder Verstecken/Ablagebaum"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Nachrichtenansicht"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/Bilder _und Text"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Bilder"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Text"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Nichts"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Statuszeile"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Einzelner _Ablagebaum"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Einzelne _Nachrichtenansicht"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/_Sortieren"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Sender"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbetikett"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach An_hang"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/Nicht S_ortieren"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff _aufbauen"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Threads einschalten"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads entfalten"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads zusammenfalten"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Ansicht/Anzuzeigende _Informationen setzen..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger Nachricht"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster Nachricht"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/_Gehe _zu/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/V_orheriger ungelesener Nachricht"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/N_ächster ungelesener Nachricht"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger ne_uer Nachricht"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _neuer Nachricht"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _markierter Nachricht"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster m_arkierter Nachricht"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _etikettierter Nachricht"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster e_tikettierter Nachricht"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatische Erkennung"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_Shift_JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinesisch (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Ansicht/Zeige alle _Kopfzeilen"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Nachricht/Markiere als Spam-Mail"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Markiere als Nicht-Spam Mail"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Werkzeug/Nachrichten einer Ablage nach Spams _filtern"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten nach Spams filtern"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeug/A_usführen"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für den aktuellen Account..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3243,16 +3443,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3261,149 +3461,148 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "Spam"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "Markiere als Spam Mail"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind nicht verbunden. Wählen sie das Bild zum Verbinden."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind verbunden. Wählen sie das Bild, um die Verbindung zu beenden."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -3521,32 +3720,32 @@ msgstr "Ende der Liste erreicht; weiter vom Anfang?"
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Erstelle Nachrichtenansicht...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3555,7 +3754,7 @@ msgstr ""
 "Geben Sie den Druckbefehl ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3564,47 +3763,6 @@ msgstr ""
 "Druck-Befehlszeile ist ungültig:\n"
 "'%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "kann Nachricht %s nicht nach %s kopieren\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Kann markierte Datei nicht öffnen.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Letzte Nummer im Verzeichnis %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"Verzeichnisname '%s' ist keine gültige UTF-8 Zeichenkette.\n"
-"Vielleicht ist der lokale Zeichensatz im Dateinamen verwendet worden.\n"
-"In diesem Fall musst Du die folgende Umgebungsvariable setzen (siehe README "
-"für Details):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Öffnen"
@@ -3688,115 +3846,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME Betrachterbefehl ist ungültig: '%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "erstelle NNTP-Verbindung zu %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP-Verbindung mit %s:%d wurde aufgehoben. Erneut verbinden...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "Artikel %d wurde schon zwischengespeichert.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "empfange Artikel %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "kann Artikel %d nicht lesen\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "kann die Newsgroup-Liste nicht empfangen\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "kann Artikel nicht senden.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "kann Artikel %d nicht empfangen\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "kann die Gruppe: %s nicht wählen\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "ungültiger Artikelbereich: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "Keine neuen Artikel.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "bekomme Newsübersicht %d - %d in %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "kann Newsübersicht nicht bekommen\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "Fehler beim Empfang der Newsübersicht.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "ungültige Newsübersichtszeile: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "kann XHDR nicht bekommen\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "Fehler beim Empfang von XHDR.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "Protokollfehler: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "Protokollfehler\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Fehler beim Senden\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Fehler aufgetreten beim Senden eines Befehls\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Mantra"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[keine Benutzer-ID]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3809,7 +3867,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s) an\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3817,448 +3875,6 @@ msgstr ""
 "Falsches Mantra! Nochmal...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Erforderlichen APOP-Zeitstempel in der Begrüßung nicht gefunden\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3-Protokollfehler\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "ungültige UIDL-Antwort: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Lösche abgelaufene Nachricht %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Nachricht %d überspringen (%d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "Mailbox ist blockiert\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "Sitzungszeit abgelaufen\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "kann TLS-Sitzung nicht beginnen\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "Fehler während der Beglaubigung\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "Befehl wird nicht unterstützt\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "Fehler während einer POP3-Sitzung\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Öffne Accounteinstellungenfenster...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Account%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Einstellungen eines neuen Accounts"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Accounteinstellungen"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Erstelle Accounteinstellungenfenster...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Empfangen"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privat"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Speziell"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Name dieses Accounts"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Standard-Account"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Persönliche Informationen"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Vollständiger Name"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-Mail-Adresse"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organisation"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Serverdaten"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Keiner (lokal)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Dieser Server benötigt Beglaubigung"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Newsserver"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server zum Empfangen"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP-Server (senden)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Benutzer-ID"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Kennwort"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Verwende sichere Beglaubigung (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Nachrichten vom Server nach Empfang löschen"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Entfernen nach"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "Tag(en)"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 Tage: sofort entfernen)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Lade alle Nachrichten vom Server herunter"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Grenze für Nachrichtengöße beim Empfang"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Nachrichten beim Empfang filtern"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Standard Posteingang"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "Ungefilterte Nachrichten werden in dieser Ablage gespeichert."
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Beglaubigungsmethode"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatisch"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "News"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "Maximum an herunterzuladenden Artikeln"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "Ohne Begrenzung, wenn 0 angegeben"
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr ""
-"`Hole alle' übeprüft ob neue Nachrichten für diesen Account vorhanden sind"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Kopfzeilen"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Füge Datum in Kopfzeile ein"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Erzeuge Nachrichten-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Füge benutzerdefinierte Kopfzeile ein"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Bearbeiten... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Beglaubigung"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP-Beglaubigung (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Wenn Sie diese Einträge frei lassen, wird\n"
-"dieselbe ID und dasselbe Passwort wie zum Empfang verwendet."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Beglaubige mit POP3 vor dem Senden"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Befehlsausgabe"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Setze folgende Adressen automatisch"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Antwort an"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Nachrichten immer digital unterschreiben"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Nachrichten immer verschlüsseln"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "Verschlüssele beim Antworten auf verschlüsselte Nachricht"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Benutze ASCII-Hüllen Format zum Verschlüsseln"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Benutze digitale Klartext-Unterschrift"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Schlüssel für digitale Unterschrift"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Benutze voreingestellten GnuPG-Schlüssel"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Wähle Schlüssel nach E-Mail Adresse"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Schlüssel manuell angeben"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Benutzer- oder Schlüssel-ID"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "SSL nicht benutzen"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "SSL für POP3-Verbindung benutzen"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Für SSL-Sitzung STARTTLS-Befehl benutzen"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "SSL für IMAP4-Verbindung benutzen"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "SSL für NNTP-Verbindung benutzen"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Senden (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "SSL für SMTP-Verbindung benutzen"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Benutze non-blocking SSL"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "Ausschalten, wenn Probleme mit der SSL-Verbindung."
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "SMTP-Port angeben"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "POP3-Port angeben"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "IMAP4-Port angeben"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "NNTP-Port angeben"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Domännamen angeben"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP-Serververzeichnis."
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Gesendete Nachrichten speichern in"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Entwürfe speichern in"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Gelöschte Nachrichten speichern in"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Keine Account-Name angegeben."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Keine E-Mail-Adresse angegeben."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Keinen SMTP-Server angegeben."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Keine Benutzer-ID angegeben."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Keinen POP3-Server angegeben."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Keinen IMAP4-Server angegeben."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Keinen NNTP-Server angegeben."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Es wird nicht empfohlen den alten ASCII-Hüllen Modus\n"
-"für verschlüsselte Nachrichten zu verwenden. Es entspricht\n"
-"nicht dem RFC 3156 - MIME Security with OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Aktionen-Einstellung"
@@ -4321,17 +3937,17 @@ msgstr "  Syntax Hilfe "
 msgid "Registered actions"
 msgstr "Registrierte Aktionen"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Auf"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Ab"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Neue)"
 
@@ -4374,831 +3990,31 @@ msgstr "Aktion löschen"
 msgid "Do you really want to delete this action?"
 msgstr "Wollen Sie diese Aktion wirklich löschen?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "Spam Mail Filter"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Erstelle Allgemeine-Einstellungenfenster...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Allgemeine Einstellungen"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Zitat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Anzeige"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Nachricht"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Spam Mail"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Weiteres"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Benutze externes Programm, um E-Mails zu empfangen"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Befehl"
-
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "Übernehme aus lokaler Mailboxdatei"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtern beim Empfang"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Pfad zur Mailboxdatei"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Automatische Aktualisierung"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "jedes"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "Minute(n)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Hole neue E-Mail beim Programmstart"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Aktualisiere alle lokalen Ablagen nach dem Empfang"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr ""
-"Ausführen des folgenden Befehls, wenn neue Nachrichten empfangen wurden"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "'%d' wird ersetzt durch die Anzahl der neuen Nachrichten."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Benutze externes Programm zum Senden"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Gesendete Nachrichten in Gesendet-Ablage speichern"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "Anwenden des Filters beim Versenden von Nachrichten"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Ausgehender Zeichensatz"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatisch (Empfohlen)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Western European (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Western European (ISO-8859-15"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Central European (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltic (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltic (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Greek (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Hebräisch (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebräiisch (Windows-1255)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turkish (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrillic (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrillic (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cyrillic (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japanese (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japanese (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japanese (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Simplified Chinese (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Einfaches Chinesisch (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Traditional Chinese (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Traditional Chinese (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chinese (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korean (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Wenn 'Automatisch' gewählt ist, wird der optimale Zeichensatz für die "
-"aktuelle Locale-Einstellung benutzt."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Übertragungscodierung"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Geben Sie den Übertragungs-Zeichensatz für den Nachrichteninhalt an, falls "
-"dieser Nicht-ASCII-Zeichen enthält."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Unterschriftentrenner"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Automatisch einfügen"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Starte externen Editor automatisch"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Stufen der Rückgängigmachung"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Zeilenumbruch nach"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "Zeichen"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Zitat umbrechen"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Bei der Eingabe umbrechen"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Zeilenumbruch vor dem Senden"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Wähle automatisch den Account für die Antworten"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Zitiere Nachricht in der Antwort"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Antwort-Knopf führt Antwort an Mailing-Liste aus"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Antwort-Format"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Zitatzeichen"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Weiterleiten-Format"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Beschreibung der Symbole "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Schriftart"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Übersetze Kopfzeilennamen (wie 'Von:', 'Betreff:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Kürze Newsgroups länger als"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "Zeichen"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Ablageninhaltsansicht"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Zeige Empfänger in `Von'-Spalte, wenn Sie selbst der Sender sind"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Threads entfalten"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Datumsformat"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Setze Ablageninhalt-Einträge... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Benutze Farben für Nachrichten"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Stelle Mehr-byte Alphabet und Zahlen als\n"
-"ASCII-Zeichen dar (nur Japanisch)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "Wandle HTML Nachrichten um in Nur-Text"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Zeige Cursor in der Nachrichtenansicht an"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Zeilenabstand"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "Pixel"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Scroll"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Halbe Seite"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Fließendes Scrollen"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Schritt"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "Bilder"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Größe angehängter Bilder in das Fenster einpassen"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Anzeige Bilder eingebettet an"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "Aktiviere Spam Mail Kontrolle"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "Lerne Befehl:"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "Kein Spam"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "Klassifizier-Befehl"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "Spam Mail Ablage"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-"Nachrichten, die als Spam Mails markiert wurden, werden in diese Ablage "
-"verschoben."
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr ""
-"Nachrichten beim Empfang ausfiltern, wenn sie als Spam Mails erkannt wurden"
-
-#: src/prefs_common.c:2051
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"Gefilterte Nachrichten werden in die Spam Mail Ablage verschoben und vom "
-"Server gelöscht."
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Überprüfe digitale Unterschriften automatisch"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr ""
-"Zeige das Ergebnis der Überprüfung der digitalen Unterschrift in einem POPUP-"
-"Fenster an"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Mantra zeitweise speichern"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Läuft aus nach"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "Minute(n)"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"('0' speichert das Mantra für die gesamte\n"
-"Sitzung)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Nachrichten immer öffnen, wenn in der Ablageninhaltsansicht ausgewählt"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Erste Nachricht anzeigen beim Öffnen einer Ablage"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr ""
-"Nachrichten als gelesen markieren, wenn sie in einem neuen Fenster geöffnet "
-"werden"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Zum Posteingang wechseln, nach dem Empfang neuer E-Mail"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Nachricht wird markiert bis zur Ausführung,\n"
-" wenn das ausgeschaltet ist)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Empfangen-Dialog"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Zeige Empfangen-Dialog"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Immer"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Nur bei manuellem Empfang"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nie"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Empfangen-Dialog schließen nach Beendigung"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "Ordnen der Buttons kompatibel zu GNOME HIG"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Tastenkombinationen wählen... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Internet-Browser"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Adresse bei Doppel-Klick ins Ziel einfügen"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Beim Beenden"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Nachfragen beim Beenden"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Leere Papierkorb beim Beenden"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Fragen vor dem Leeren"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Warnen, wenn wartende Nachrichten vorhanden"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Aktiviere strengen Integritätstest des Summen-Zwischenspeichers"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-"Aktiviere dieses, wenn die Möglichkeit besteht, dass andere Anwendungen den "
-"Inhalt von Ablagen verändern könnten.\n"
-"Diese Option verringert die Performance der Summen-Anzeige."
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Socket I/O timeout:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "Sekunde(n)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "gekürzter Wochentagsname"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "Wochentagsname"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "gekürzter Monatsname"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "Monatsname"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "Jahrhundert (Jahr/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "Tag des Monats als Zahl"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "Stunde als Zahl (24h Anzeige)"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "Stunde als Zahl (12h Anzeige)"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "Tag des Jahres als Zahl"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "Monat als Zahl"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "Minute als Zahl"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "entweder AM oder PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "Sekunde als Zahl"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "Wochentag als Zahl"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "letzten beiden Stellen des Jahres"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "Jahr als Zahl"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "Zeitzone oder Name oder Abkürzung"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Steuerzeichen"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Beschreibung"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Beispiel"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Setze Nachrichtenfarbe"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Farben"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Zitierter Text - Erste Ebene"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Zitierter Text - Zweite Ebene"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Zitierter Text - Dritte Ebene"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI-Link"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Stelle Zitatfarben wiederher"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Wähle Farbe für Zitatebene 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Wähle Farbe für Zitatebene 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Wähle Farbe für Zitatebene 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Wähle Farbe für URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Beschreibung der Symbole"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Datum\n"
-"Von\n"
-"Vollständiger Name des Absenders\n"
-"Vorname des Absenders\n"
-"Initialen des Absenders\n"
-"Betreff\n"
-"An\n"
-"CC\n"
-"News-Gruppen\n"
-"Nachrichten-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Wenn x gesetzt ist, zeige expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Nachrichteninhalt\n"
-"Zitierter  Nachrichteninhalt\n"
-"Nachrichteninhalt ohne Unterschrift\n"
-"Zitierter Nachrichteninhalt ohne Unterschrift\n"
-"Wörtlich %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Backslash\n"
-"Fragenmarkierung\n"
-"öffnende Klammer\n"
-"schließende Klammer"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Tastenkombinationen"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Wählen Sie die Voreinstellungen für die Abkürzungstasten.\n"
-"Durch benutzen einer Tastekombination, wenn der Mauszeiger über einem "
-"Menüeintrag\n"
-"ist, können Sie die Abkürzungstastenkombination jedes Menüeintrags ändern."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Standard"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Altes Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Benutzerdefinierte Kopfzeileneinstellungen"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Kopfzeilen"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Löschen "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Benutzerdefinierte Kopfzeilen"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Kopfzeilen löschen"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Wollen Sie wirklich diese Kopfzeile löschen?"
 
@@ -5246,12 +4062,20 @@ msgstr "Filtereinstellungen"
 msgid "Enabled"
 msgstr "An"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wollen Sie wirklich die Regel '%s' löschen?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "Unbenannt"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Lösche Regel"
 
@@ -5335,6 +4159,10 @@ msgstr "ist länger als"
 msgid "is shorter than"
 msgstr "ist kürzer als"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Bewege zu"
@@ -5458,6 +4286,10 @@ msgstr "[...] oder (...) am Anfang des Betreffes der Antwort löschen"
 msgid "Apply to subfolders"
 msgstr "Auf Unterablagen anwenden"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Setze folgende Adressen automatisch"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "auch bei Antwort benutzen"
@@ -5533,64 +4365,46 @@ msgstr "Angezeigte Einträge"
 msgid " Revert to default "
 msgstr " Standardeinstellung"
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Schablonenname"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Ersetzen "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Symbole "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrierte Schablonen"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Schablonen"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Schablone"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Schablonen-Format-Fehler."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Schablone löschen"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Wollen Sie diese Schablone wirklich löschen?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "kann markierte Datei nicht öffnen\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "kann Nachricht %d nicht holen\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Druck-Befehlszeile ist ungültig: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Erstelle Fortschrittsdialog...\n"
@@ -5599,29 +4413,21 @@ msgstr "Erstelle Fortschrittsdialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "Fehler beim Empfang von Daten.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Kann nicht in Datei schreiben.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Finde keine User-ID für diesen Schlüssel."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\taka \"%s\"\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Digitale Unterschrift erstellt %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Fehler beim Verifizieren der digitalen Unterschrift"
 
@@ -5647,6 +4453,10 @@ msgstr "Schlüssel-ID"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Weiteres"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Schlüüsel hinzufügen"
@@ -5672,84 +4482,84 @@ msgstr ""
 "sicher sein, dass sie an die von Ihnen vorgesehene Person geht.\n"
 "Vertrauen Sie ihm genug, um ihn trotzdem zu verwenden?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Kopfzeilen wartender Nachricht ist defekt.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Sende Nachricht mit dem Befehl %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Kann den Befehl %s nicht ausführen"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fehler aufgetreten beim Senden des Befehls %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Verbindung mit SMTP-Server: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Sende HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Beglaubigen"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Sende Nachricht..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Sende EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Sende MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Sende"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Sende RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Sende DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Beende..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sende Nachricht (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Sende Nachricht"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Fehler aufgetreten beim Senden der Nachricht."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5858,32 +4668,20 @@ msgid "No public key to verify the signature"
 msgstr ""
 "Kein öffentlicher Schlüssel zum Verifizieren der digitalen Unterschrift"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH nicht verfügbar\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "fehlerhafte SMTP-Antwort\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "Fehler während einer SMTP-Sitzung\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Erstelle Quellen-Fenster...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Nachrichtenquellen"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Anzeige der Quellen von %s...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Quellen"
@@ -6273,6 +5071,947 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Es sind einige Fenster zum Verfassen von Nachrichten geöffnet.\n"
+#~ "Bitte schließen Sie diese Fenster vor dem Beabeiten der Accounts."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Öffne Accountbearbeitungsfenster...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Erstelle Accountbearbeitungsfenster...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Bearbeite Accounts"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Neue Nachrichten werden in dieser Reihenfolge geprüft. Wählen Sie die "
+#~ "Schalter\n"
+#~ "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' "
+#~ "einzuschalten."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokoll"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid " _Set as default account "
+#~ msgstr "Setze als _Standardaccount "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Wollen Sie den Account '%s' wirklich löschen?"
+
+#~ msgid "Delete account"
+#~ msgstr "Account löschen"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Öffne Accounteinstellungenfenster...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Account%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Einstellungen eines neuen Accounts"
+
+#~ msgid "Account preferences"
+#~ msgstr "Accounteinstellungen"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Erstelle Accounteinstellungenfenster...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Empfangen"
+
+#~ msgid "Privacy"
+#~ msgstr "Privat"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Speziell"
+
+#~ msgid "Name of this account"
+#~ msgstr "Name dieses Accounts"
+
+#~ msgid "Set as default"
+#~ msgstr "Standard-Account"
+
+#~ msgid "Personal information"
+#~ msgstr "Persönliche Informationen"
+
+#~ msgid "Full name"
+#~ msgstr "Vollständiger Name"
+
+#~ msgid "Mail address"
+#~ msgstr "E-Mail-Adresse"
+
+#~ msgid "Organization"
+#~ msgstr "Organisation"
+
+#~ msgid "Server information"
+#~ msgstr "Serverdaten"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Keiner (lokal)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Dieser Server benötigt Beglaubigung"
+
+#~ msgid "News server"
+#~ msgstr "Newsserver"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server zum Empfangen"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP-Server (senden)"
+
+#~ msgid "User ID"
+#~ msgstr "Benutzer-ID"
+
+#~ msgid "Password"
+#~ msgstr "Kennwort"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Verwende sichere Beglaubigung (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Nachrichten vom Server nach Empfang löschen"
+
+#~ msgid "Remove after"
+#~ msgstr "Entfernen nach"
+
+#~ msgid "days"
+#~ msgstr "Tag(en)"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 Tage: sofort entfernen)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Lade alle Nachrichten vom Server herunter"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Grenze für Nachrichtengöße beim Empfang"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Nachrichten beim Empfang filtern"
+
+#~ msgid "Default inbox"
+#~ msgstr "Standard Posteingang"
+
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "Ungefilterte Nachrichten werden in dieser Ablage gespeichert."
+
+#~ msgid "Authentication method"
+#~ msgstr "Beglaubigungsmethode"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatisch"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "Maximum an herunterzuladenden Artikeln"
+
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Ohne Begrenzung, wenn 0 angegeben"
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr ""
+#~ "`Hole alle' übeprüft ob neue Nachrichten für diesen Account vorhanden sind"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Füge Datum in Kopfzeile ein"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Erzeuge Nachrichten-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Füge benutzerdefinierte Kopfzeile ein"
+
+#~ msgid " Edit... "
+#~ msgstr " Bearbeiten... "
+
+#~ msgid "Authentication"
+#~ msgstr "Beglaubigung"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP-Beglaubigung (SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Wenn Sie diese Einträge frei lassen, wird\n"
+#~ "dieselbe ID und dasselbe Passwort wie zum Empfang verwendet."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Beglaubige mit POP3 vor dem Senden"
+
+#~ msgid "Command output"
+#~ msgstr "Befehlsausgabe"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Antwort an"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Nachrichten immer digital unterschreiben"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Nachrichten immer verschlüsseln"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "Verschlüssele beim Antworten auf verschlüsselte Nachricht"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Benutze ASCII-Hüllen Format zum Verschlüsseln"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Benutze digitale Klartext-Unterschrift"
+
+#~ msgid "Sign key"
+#~ msgstr "Schlüssel für digitale Unterschrift"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Benutze voreingestellten GnuPG-Schlüssel"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Wähle Schlüssel nach E-Mail Adresse"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Schlüssel manuell angeben"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Benutzer- oder Schlüssel-ID"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "SSL nicht benutzen"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "SSL für POP3-Verbindung benutzen"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Für SSL-Sitzung STARTTLS-Befehl benutzen"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "SSL für IMAP4-Verbindung benutzen"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "SSL für NNTP-Verbindung benutzen"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Senden (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "SSL für SMTP-Verbindung benutzen"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Benutze non-blocking SSL"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "Ausschalten, wenn Probleme mit der SSL-Verbindung."
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "SMTP-Port angeben"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "POP3-Port angeben"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "IMAP4-Port angeben"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "NNTP-Port angeben"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Domännamen angeben"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP-Serververzeichnis."
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Gesendete Nachrichten speichern in"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Entwürfe speichern in"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Gelöschte Nachrichten speichern in"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Keine Account-Name angegeben."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Keine E-Mail-Adresse angegeben."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Keinen SMTP-Server angegeben."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Keine Benutzer-ID angegeben."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Keinen POP3-Server angegeben."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Keinen IMAP4-Server angegeben."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Keinen NNTP-Server angegeben."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Es wird nicht empfohlen den alten ASCII-Hüllen Modus\n"
+#~ "für verschlüsselte Nachrichten zu verwenden. Es entspricht\n"
+#~ "nicht dem RFC 3156 - MIME Security with OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Erstelle Allgemeine-Einstellungenfenster...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Allgemeine Einstellungen"
+
+#~ msgid "Quote"
+#~ msgstr "Zitat"
+
+#~ msgid "Display"
+#~ msgstr "Anzeige"
+
+#~ msgid "Message"
+#~ msgstr "Nachricht"
+
+#~ msgid "Junk mail"
+#~ msgstr "Spam Mail"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Benutze externes Programm, um E-Mails zu empfangen"
+
+#~ msgid "Command"
+#~ msgstr "Befehl"
+
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Übernehme aus lokaler Mailboxdatei"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtern beim Empfang"
+
+#~ msgid "Spool path"
+#~ msgstr "Pfad zur Mailboxdatei"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Automatische Aktualisierung"
+
+#~ msgid "every"
+#~ msgstr "jedes"
+
+#~ msgid "minute(s)"
+#~ msgstr "Minute(n)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Hole neue E-Mail beim Programmstart"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Aktualisiere alle lokalen Ablagen nach dem Empfang"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr ""
+#~ "Ausführen des folgenden Befehls, wenn neue Nachrichten empfangen wurden"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "'%d' wird ersetzt durch die Anzahl der neuen Nachrichten."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Benutze externes Programm zum Senden"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Gesendete Nachrichten in Gesendet-Ablage speichern"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "Anwenden des Filters beim Versenden von Nachrichten"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Ausgehender Zeichensatz"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatisch (Empfohlen)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Western European (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Western European (ISO-8859-15"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Central European (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltic (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltic (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Greek (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Hebräisch (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Hebräiisch (Windows-1255)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turkish (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cyrillic (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cyrillic (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cyrillic (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cyrillic (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japanese (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japanese (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japanese (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Simplified Chinese (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Einfaches Chinesisch (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Traditional Chinese (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Traditional Chinese (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chinese (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korean (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Wenn 'Automatisch' gewählt ist, wird der optimale Zeichensatz für die "
+#~ "aktuelle Locale-Einstellung benutzt."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Übertragungscodierung"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Geben Sie den Übertragungs-Zeichensatz für den Nachrichteninhalt an, "
+#~ "falls dieser Nicht-ASCII-Zeichen enthält."
+
+#~ msgid "Signature separator"
+#~ msgstr "Unterschriftentrenner"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Automatisch einfügen"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Starte externen Editor automatisch"
+
+#~ msgid "Undo level"
+#~ msgstr "Stufen der Rückgängigmachung"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Zeilenumbruch nach"
+
+#~ msgid "characters"
+#~ msgstr "Zeichen"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Zitat umbrechen"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Bei der Eingabe umbrechen"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Zeilenumbruch vor dem Senden"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Wähle automatisch den Account für die Antworten"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Zitiere Nachricht in der Antwort"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Antwort-Knopf führt Antwort an Mailing-Liste aus"
+
+#~ msgid "Reply format"
+#~ msgstr "Antwort-Format"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Zitatzeichen"
+
+#~ msgid "Forward format"
+#~ msgstr "Weiterleiten-Format"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Beschreibung der Symbole "
+
+#~ msgid "Font"
+#~ msgstr "Schriftart"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Übersetze Kopfzeilennamen (wie 'Von:', 'Betreff:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Kürze Newsgroups länger als"
+
+#~ msgid "letters"
+#~ msgstr "Zeichen"
+
+#~ msgid "Summary View"
+#~ msgstr "Ablageninhaltsansicht"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Zeige Empfänger in `Von'-Spalte, wenn Sie selbst der Sender sind"
+
+#~ msgid "Expand threads"
+#~ msgstr "Threads entfalten"
+
+#~ msgid "Date format"
+#~ msgstr "Datumsformat"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Setze Ablageninhalt-Einträge... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Benutze Farben für Nachrichten"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Stelle Mehr-byte Alphabet und Zahlen als\n"
+#~ "ASCII-Zeichen dar (nur Japanisch)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "Wandle HTML Nachrichten um in Nur-Text"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Zeige Cursor in der Nachrichtenansicht an"
+
+#~ msgid "Line space"
+#~ msgstr "Zeilenabstand"
+
+#~ msgid "pixel(s)"
+#~ msgstr "Pixel"
+
+#~ msgid "Scroll"
+#~ msgstr "Scroll"
+
+#~ msgid "Half page"
+#~ msgstr "Halbe Seite"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Fließendes Scrollen"
+
+#~ msgid "Step"
+#~ msgstr "Schritt"
+
+#~ msgid "Images"
+#~ msgstr "Bilder"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Größe angehängter Bilder in das Fenster einpassen"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Anzeige Bilder eingebettet an"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "Aktiviere Spam Mail Kontrolle"
+
+#~ msgid "Learning command:"
+#~ msgstr "Lerne Befehl:"
+
+#~ msgid "Not Junk"
+#~ msgstr "Kein Spam"
+
+#~ msgid "Classifying command"
+#~ msgstr "Klassifizier-Befehl"
+
+#~ msgid "Junk folder"
+#~ msgstr "Spam Mail Ablage"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr ""
+#~ "Nachrichten, die als Spam Mails markiert wurden, werden in diese Ablage "
+#~ "verschoben."
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr ""
+#~ "Nachrichten beim Empfang ausfiltern, wenn sie als Spam Mails erkannt "
+#~ "wurden"
+
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "Gefilterte Nachrichten werden in die Spam Mail Ablage verschoben und vom "
+#~ "Server gelöscht."
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Überprüfe digitale Unterschriften automatisch"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr ""
+#~ "Zeige das Ergebnis der Überprüfung der digitalen Unterschrift in einem "
+#~ "POPUP-Fenster an"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Mantra zeitweise speichern"
+
+#~ msgid "Expired after"
+#~ msgstr "Läuft aus nach"
+
+#~ msgid "minute(s) "
+#~ msgstr "Minute(n)"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "('0' speichert das Mantra für die gesamte\n"
+#~ "Sitzung)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr ""
+#~ "Nachrichten immer öffnen, wenn in der Ablageninhaltsansicht ausgewählt"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Erste Nachricht anzeigen beim Öffnen einer Ablage"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr ""
+#~ "Nachrichten als gelesen markieren, wenn sie in einem neuen Fenster "
+#~ "geöffnet werden"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Zum Posteingang wechseln, nach dem Empfang neuer E-Mail"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Nachricht wird markiert bis zur Ausführung,\n"
+#~ " wenn das ausgeschaltet ist)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Empfangen-Dialog"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Zeige Empfangen-Dialog"
+
+#~ msgid "Always"
+#~ msgstr "Immer"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Nur bei manuellem Empfang"
+
+#~ msgid "Never"
+#~ msgstr "Nie"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Empfangen-Dialog schließen nach Beendigung"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "Ordnen der Buttons kompatibel zu GNOME HIG"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Tastenkombinationen wählen... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
+
+#~ msgid "Web browser"
+#~ msgstr "Internet-Browser"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Adresse bei Doppel-Klick ins Ziel einfügen"
+
+#~ msgid "On exit"
+#~ msgstr "Beim Beenden"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Nachfragen beim Beenden"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Leere Papierkorb beim Beenden"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Fragen vor dem Leeren"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Warnen, wenn wartende Nachrichten vorhanden"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Aktiviere strengen Integritätstest des Summen-Zwischenspeichers"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Aktiviere dieses, wenn die Möglichkeit besteht, dass andere Anwendungen "
+#~ "den Inhalt von Ablagen verändern könnten.\n"
+#~ "Diese Option verringert die Performance der Summen-Anzeige."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Socket I/O timeout:"
+
+#~ msgid "second(s)"
+#~ msgstr "Sekunde(n)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "gekürzter Wochentagsname"
+
+#~ msgid "the full weekday name"
+#~ msgstr "Wochentagsname"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "gekürzter Monatsname"
+
+#~ msgid "the full month name"
+#~ msgstr "Monatsname"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr ""
+#~ "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "Jahrhundert (Jahr/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "Tag des Monats als Zahl"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "Stunde als Zahl (24h Anzeige)"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "Stunde als Zahl (12h Anzeige)"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "Tag des Jahres als Zahl"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "Monat als Zahl"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "Minute als Zahl"
+
+#~ msgid "either AM or PM"
+#~ msgstr "entweder AM oder PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "Sekunde als Zahl"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "Wochentag als Zahl"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "letzten beiden Stellen des Jahres"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "Jahr als Zahl"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "Zeitzone oder Name oder Abkürzung"
+
+#~ msgid "Specifier"
+#~ msgstr "Steuerzeichen"
+
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+
+#~ msgid "Example"
+#~ msgstr "Beispiel"
+
+#~ msgid "Set message colors"
+#~ msgstr "Setze Nachrichtenfarbe"
+
+#~ msgid "Colors"
+#~ msgstr "Farben"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Zitierter Text - Erste Ebene"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Zitierter Text - Zweite Ebene"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Zitierter Text - Dritte Ebene"
+
+#~ msgid "URI link"
+#~ msgstr "URI-Link"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Stelle Zitatfarben wiederher"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Wähle Farbe für Zitatebene 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Wähle Farbe für Zitatebene 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Wähle Farbe für Zitatebene 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Wähle Farbe für URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Beschreibung der Symbole"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Datum\n"
+#~ "Von\n"
+#~ "Vollständiger Name des Absenders\n"
+#~ "Vorname des Absenders\n"
+#~ "Initialen des Absenders\n"
+#~ "Betreff\n"
+#~ "An\n"
+#~ "CC\n"
+#~ "News-Gruppen\n"
+#~ "Nachrichten-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Wenn x gesetzt ist, zeige expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Nachrichteninhalt\n"
+#~ "Zitierter  Nachrichteninhalt\n"
+#~ "Nachrichteninhalt ohne Unterschrift\n"
+#~ "Zitierter Nachrichteninhalt ohne Unterschrift\n"
+#~ "Wörtlich %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Backslash\n"
+#~ "Fragenmarkierung\n"
+#~ "öffnende Klammer\n"
+#~ "schließende Klammer"
+
+#~ msgid "Key bindings"
+#~ msgstr "Tastenkombinationen"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Wählen Sie die Voreinstellungen für die Abkürzungstasten.\n"
+#~ "Durch benutzen einer Tastekombination, wenn der Mauszeiger über einem "
+#~ "Menüeintrag\n"
+#~ "ist, können Sie die Abkürzungstastenkombination jedes Menüeintrags ändern."
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Altes Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Schriftauswahl"
 
diff --git a/po/el.po b/po/el.po
index 1676459e..104f7ff2 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,407 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Διαβάζω τις ρυθμίσεις για κάθε λογαριασμό...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "απέτυχα να γράψω τις ρυθμίσεις στο αρχείο\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "Η IMAP4 σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "δημιουργία IMAP4 σύνδεσης στο %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr ""
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Μετακινώ το μήνυμα  %s%c%d στο %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "δεν μπορώ να τα απαλείψω\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Το αρχείο σημάνσεων δεν βρέθηκε.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "συνέβη σφάλμα καθώς λάμβανα LIST.\n"
+
+#: libsylph/imap.c:1981
+#, fuzzy, c-format
+msgid "Can't create '%s'\n"
+msgstr "δεν μπορώ να δημιουργήσω %s\n"
+
+#: libsylph/imap.c:1986
+#, fuzzy, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "δεν μπορώ να δημιουργήσω %s\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "δεν μπορώ να δημιουργήσω το mailbox: η LIST απέτυχε\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
+
+#: libsylph/imap.c:2163
+#, fuzzy, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "δεν μπορώ να διαγράψω το mailbox\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "δεν μπορώ να λάβω τον φάκελο\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "συνέβη σφάλμα καθώς λάμβανα τον φάκελο.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "δεν μπορώ να διαβάσω τον φάκελο: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, fuzzy, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr ""
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Πιστοποίηση"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Η είσοδος στο IMAP4 απέτυχε.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "δεν μπορώ να προσθέσω το %s στο %s\n"
+
+#: libsylph/imap.c:3593
+#, fuzzy
+msgid "(sending file...)"
+msgstr "Στέλνω DATA..."
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "δεν μπορώ να προσθέσω το μήνυμα %s\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "δεν μπορώ να αντιγράψω το %d στο %s\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "σφάλμα κατά την εντολή imap: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr ""
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr ""
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Δεν μπορώ να ανοίξω σημειωμένο αρχείο.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "ο πηγαίος κατάλογος είναι ίδιος με τον κατάλογο προορισμού.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Τελευταίος αριθμός στον κατάλογο %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Το αρχείο `%s' υπάρχει ήδη.\n"
+"Δεν μπορώ να δημιουργήσω τον κατάλογο."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "δημιουργώ NNTP σύνδεση στο %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "Η NNTP σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "το άρθρο %d έχει προσπελαστεί ήδη.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "λαμβάνω το άρθρο %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "δεν μπορώ να διαβάσω το άρθρο %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "δεν μπορώ να λάβω την λίστα newsgroup\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "δεν μπορώ να στείλω το άρθρο.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "δεν μπορώ να λάβω το άρθρο %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "δεν μπορώ να επιλέξω την ομάδα %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "μη έγκυρη ακολουθία άρθρων: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "δεν υπάρχουν νέα άρθρα.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "λαμβάνω xover %d - %d στο %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "δεν μπορώ να λάβω xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "συνέβη σφάλμα καθώς λάμβανα xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "μη έγκυρη γραμμή xover: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "δεν μπορώ να λάβω xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "συνέβη σφάλμα καθώς λάμβανα xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "σφάλμα πρωτοκόλλου: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "σφάλμα πρωτοκόλλου\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Προαπαιτούμενη timestamp APOP δεν βρέθηκε στο χαιρετισμό\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Συντακτικό σφάλμα timestamp στο χαιρετισμό\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Σφάλμα πρωτοκόλλου POP3\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "μη έγκυρη γραμμή xover: %s\n"
+
+#: libsylph/pop.c:616
+#, fuzzy, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "διαγράφω το μήνυμα %d...\n"
+
+#: libsylph/pop.c:624
+#, fuzzy, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
+
+#: libsylph/pop.c:655
+#, fuzzy
+msgid "mailbox is locked\n"
+msgstr "Ρυθμίσεις Mailbox"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+#, fuzzy
+msgid "can't start TLS session\n"
+msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Εντολή"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +424,56 @@ msgstr "Βρέθηκε %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Οι ρυθμίσεις αποθηκεύτηκαν.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Κατάλογος"
+
+#: libsylph/procmime.c:761
+#, fuzzy
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "Η μετατροπή του κώδικα απέτυχε.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "δεν μπορώ να ανοίξω το αρχείο mark\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "δεν μπορώ να λάβω το μήνυμα %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Δεν μπορώ να λάβω το τμήμα κειμένου\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Η εντολή εκτύπωσης είναι άκυρη: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "προέκυψε σφάλμα κατά την λήψη δεδομένων.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
+
+#: libsylph/smtp.c:156
+#, fuzzy
+msgid "SMTP AUTH not available\n"
+msgstr "Το TLSv1 δεν είναι διαθέσιμο\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "Το SSLv23 δεν είναι διαθέσιμο\n"
@@ -165,77 +609,6 @@ msgstr ""
 "Foundation) στη διεύθυνση Free Software Foundation, Inc., 59 Temple Place - "
 "Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Διαβάζω τις ρυθμίσεις για κάθε λογαριασμό...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Μερικά παράθυρα σύνθεσης μηνύματος είναι ανοιχτά.\n"
-"Παρακαλώ κλείστε όλα τα παράθυρα σύνθεσης μηνύματος πριν επεξεργαστείτε τους "
-"λογαριασμούς."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Ανοίγω το παράθυρο επεξεργασίας λογαριασμού...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Δημιουργώ το παράθυρο επεξεργασίας λογαριασμού...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Επεξεργασία λογαριασμών"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Όνομα"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Πρωτόκολλο"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Εξυπηρέτης"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Επεξεργασία"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Θέσε ως σύνηθη λογαριασμό "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Χωρίς τίτλο"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Διαγραφή λογαριασμού"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -330,6 +703,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Όνομα"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -344,8 +725,8 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/Αρχείο"
 
@@ -368,9 +749,9 @@ msgid "/_File/New _Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/Αρχείο/---"
 
@@ -386,7 +767,7 @@ msgstr "/Αρχείο/Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
@@ -418,8 +799,8 @@ msgstr "/Διεύθυνση/Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 #, fuzzy
 msgid "/_Tools"
 msgstr "/Εργαλεία"
@@ -429,13 +810,13 @@ msgstr "/Εργαλεία"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
 
@@ -452,17 +833,17 @@ msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
 
@@ -474,7 +855,7 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -484,14 +865,14 @@ msgstr "Όνομα:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Διαγραφή"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -502,11 +883,11 @@ msgid "Lookup"
 msgstr "Αναζήτηση"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
@@ -533,7 +914,7 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
@@ -639,7 +1020,7 @@ msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Διεπαφή"
 
@@ -659,8 +1040,7 @@ msgstr "Διεύθυνση e-mail"
 msgid "Group"
 msgstr "ΝέαΟμάδα"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Κατάλογος"
 
@@ -686,15 +1066,15 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -749,8 +1129,8 @@ msgstr "/Προσθήκη..."
 msgid "/_Remove"
 msgstr "/Διαγραφή"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Ιδιότητες..."
@@ -795,8 +1175,8 @@ msgstr "/Επεξεργασία/Αναίρεση"
 msgid "/_Edit/_Redo"
 msgstr "/Επεξεργασία/Επανάληψη"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Επεξεργασία/---"
 
@@ -804,7 +1184,7 @@ msgstr "/Επεξεργασία/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Επεξεργασία/Κοπή"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
@@ -817,7 +1197,7 @@ msgstr "/Επεξεργασία/Επικόλληση"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
@@ -834,7 +1214,7 @@ msgstr "/Επεξεργασία/Αναδίπλωση μακριών γραμμώ
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Απεικόνιση"
@@ -860,9 +1240,9 @@ msgid "/_View/_Reply to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/Απεικόνιση/---"
 
@@ -881,7 +1261,7 @@ msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 msgid "/_View/_Attachment"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
@@ -893,127 +1273,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Τουρκικό (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
@@ -1023,15 +1403,15 @@ msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/Εργαλεία"
@@ -1056,10 +1436,6 @@ msgstr "/Μήνυμα/Κρυπτογράφηση"
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Δεν μπορώ να λάβω το τμήμα κειμένου\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr ""
@@ -1136,7 +1512,7 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
@@ -1226,8 +1602,7 @@ msgstr "τύπος MIME"
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Αποστολή"
 
@@ -1269,8 +1644,7 @@ msgstr "Προσάρτηση"
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Yπογραφή"
 
@@ -1278,7 +1652,7 @@ msgstr "Yπογραφή"
 msgid "Insert signature"
 msgstr "Εισαγωγή υπογραφής"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Συνθέτης"
 
@@ -1481,7 +1855,7 @@ msgstr "Τροποποίηση"
 msgid "Clear"
 msgstr "Εκκαθάριση"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Τιμή"
 
@@ -1514,7 +1888,6 @@ msgid " Check File "
 msgstr " Έλεγχος Αρχείου "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Αρχείο"
 
@@ -1572,12 +1945,12 @@ msgstr "Επεξεργασία καταλόγου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -1594,7 +1967,7 @@ msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1659,7 +2032,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr "Μέγιστος αριθμός εγγραφών"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Βασικά"
 
@@ -1720,7 +2093,6 @@ msgid "Exporting file:"
 msgstr "Εξαγωγή αρχείου:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "Επιλογή... "
 
@@ -1744,173 +2116,173 @@ msgstr "Εγγραφή πάνω από το υπάρχον αρχείο;"
 msgid "Select folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 #, fuzzy
 msgid "Sent"
 msgstr "Αποστολή"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 #, fuzzy
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Δημιουργία νέου καταλόγου..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Μετονομασία καταλόγου..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Μετονομασία καταλόγου..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Διαγραφή καταλόγου"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Συνδρομή σε newsgroup..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Διαγραφή newsgroup"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Δημιουργώ την απεικόνιση καταλόγων...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Νέα"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "αρ."
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1920,21 +2292,21 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1945,21 +2317,21 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1968,35 +2340,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -2062,7 +2434,7 @@ msgstr "%d newsgroups λήφθηκαν (%s διαβασμένα)"
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Θέμα:"
 
@@ -2086,166 +2458,6 @@ msgstr "Δημιουργώ απεικόνιση εικόνας...\n"
 msgid "Can't load the image."
 msgstr "Δεν μπορώ να φορτώσω την εικόνα."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Η IMAP4 σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "δημιουργία IMAP4 σύνδεσης στο %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr ""
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "δεν μπορώ να τα απαλείψω\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Το αρχείο σημάνσεων δεν βρέθηκε.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "συνέβη σφάλμα καθώς λάμβανα LIST.\n"
-
-#: src/imap.c:1944
-#, fuzzy, c-format
-msgid "Can't create '%s'\n"
-msgstr "δεν μπορώ να δημιουργήσω %s\n"
-
-#: src/imap.c:1949
-#, fuzzy, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "δεν μπορώ να δημιουργήσω %s\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "δεν μπορώ να δημιουργήσω το mailbox: η LIST απέτυχε\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
-
-#: src/imap.c:2126
-#, fuzzy, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "δεν μπορώ να διαγράψω το mailbox\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "δεν μπορώ να λάβω τον φάκελο\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "συνέβη σφάλμα καθώς λάμβανα τον φάκελο.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "δεν μπορώ να διαβάσω τον φάκελο: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
-
-#: src/imap.c:2404
-#, fuzzy, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr ""
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Πιστοποίηση"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Η είσοδος στο IMAP4 απέτυχε.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "δεν μπορώ να προσθέσω το %s στο %s\n"
-
-#: src/imap.c:3535
-#, fuzzy
-msgid "(sending file...)"
-msgstr "Στέλνω DATA..."
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "δεν μπορώ να προσθέσω το μήνυμα %s\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "δεν μπορώ να αντιγράψω το %d στο %s\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "σφάλμα κατά την εντολή imap: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr ""
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr ""
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Εισαγωγή"
@@ -2354,7 +2566,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2371,205 +2583,205 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:162
+#: src/inc.c:161
 msgid "Sylpheed"
 msgstr ""
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Περιμένω"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Λαμβάνω"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:555
+#: src/inc.c:554
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "H πιστοποίηση απέτυχε"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:630
+#: src/inc.c:629
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:639
+#: src/inc.c:638
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "συνέβη σφάλμα καθώς λάμβανα την αλληλογραφία."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λαμβάνω νέα μηνύματα του λογαριασμού %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Συνδέομαι στον POP3 server: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λαμβάνω το μέγεθος των μηνυμάτων (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Διαγράφω το μήνυμα"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνω το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 #, fuzzy
 msgid "Can't write file."
 msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 #, fuzzy
 msgid "Socket error."
 msgstr "σφάλμα πρωτοκόλλου\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Λήψη νέου mail"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λαμβάνω νέα μηνύματα από το %s στο %s...\n"
@@ -2587,78 +2799,69 @@ msgstr "Δώστε τον κωδικό"
 msgid "Protocol log"
 msgstr "Καταγραφή πρωτοκόλλου"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Το αρχείο `%s' υπάρχει ήδη.\n"
-"Δεν μπορώ να δημιουργήσω τον κατάλογο."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "το g_thread δεν υποστηρίζεται από την glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [διεύθυνση]  άνοιγμα παραθύρου σύνθεσης"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          λήψη νέων μηνυμάτων όλων των λογαριασμών"
 
-#: src/main.c:328
+#: src/main.c:338
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 εμφάνιση αυτού του κειμένου και έξοδος"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              εμφάνιση της έκδοσης και έξοδος"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Κωδικοσελίδα εξερχομένων"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2672,19 +2875,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Υπάρχει παράθυρο σύνθεσης μηνύματος. Να κλείσω;"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Μηνύματα στην ουρά"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
 
-#: src/main.c:561
+#: src/main.c:574
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2694,732 +2897,732 @@ msgstr ""
 "Απενεργοποιείται η υποστήριξη OpenPGP."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "ένα άλλο Sylpheed τρέχει ήδη.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Γράφω τις ρυθμίσεις των φίλτρων...\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Αρχείο/Κατάλογος/Δημιουργία νέου καταλόγου..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Αρχείο/Κατάλογος/Διαγραφή καταλόγου"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/Αρχείο/Εξαγωγή σε αρχείο mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/Αρχείο/Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/Αρχείο/Αποθήκευση ως..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/Αρχείο/Εκτύπωση..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Αρχείο/Εισαγωγή αρχείου"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/Αρχείο/Έξοδος"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/Επεξεργασία/Αναδίπλωση τρέχουσας παραγράφου"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Απεικόνιση/Δομή καταλόγων"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες και κείμενο"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Κείμενο"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Καμία"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Απεικόνιση/Ράβδος κατάστασης"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/Απεικόνιση/Ξεχωριστό παράθυρο δομής καταλόγων"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Απεικόνιση/Ξεχωριστή απεικόνιση μηνυμάτων"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αριθμό"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά ημερομηνία"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αποστολέα"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά θέμα"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά χρώμα ετικέτας"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά σήμανση"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά προσάρτηση"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Περίληψη/Ταξινόμηση/_Attract by subject"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Περίληψη/Ορισμός εμφανιζόμενων στοιχείων..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Άνοιγμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/Μήνυμα"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/Μήνυμα/Αποστολή μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/Μήνυμα/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/Μήνυμα/Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/Μήνυμα/Απάντηση"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/Μήνυμα/Απάντηση σε"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Μήνυμα/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Μήνυμα/Προώθηση"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/Μήνυμα/Προώθηση σαν προσάρτηση"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/Μήνυμα/Μετακίνηση..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/Μήνυμα/Αντιγραφή..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/Μήνυμα/Διαγραφή"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/Μήνυμα/Σήμανση"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Mήνυμα/Σήμανση/Αναίρεση σήμανσης"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/Mήνυμα/Σήμανση/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως αδιάβαστο"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Περίληψη/Διαγραφή διπλών μηνυμάτων"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/Εκτέλεση"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/Εργαλεία/Παράθυρο καταγραφής"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/Ρυθμίσεις"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Ρυθμίσεις/Κοινές επιλογές..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/Ρυθμίσεις/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Ρυθμίσεις/Επιλογές ανά λογαριασμό..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/Ρυθμίσεις/Δημιουργία νέου λογαριασμού..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/Ρυθμίσεις/Αλλαγή τρέχοντος λογαριασμού"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/Βοήθεια/_Manual"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Βοήθεια/_Manual/Ιαπωνέζικο"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/Βοήθεια/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3429,16 +3632,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3447,160 +3650,159 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
@@ -3719,34 +3921,34 @@ msgstr "Έφτασα το τέλος της λίστας. Να συνεχίσω
 msgid "Search finished"
 msgstr "Η αναζήτηση τελείωσε"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Δημιουργώ απεικόνιση μηνύματος...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Κείμενο"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 #, fuzzy
 msgid "Attachments"
 msgstr "Προσάρτηση"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3755,7 +3957,7 @@ msgstr ""
 "Εισάγετε την γραμμή εντολής εκτύπωσης:\n"
 "(Το `%s' θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3764,41 +3966,6 @@ msgstr ""
 "Η γραμμή εντολής εκτύπωσης είναι άκυρη:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Δεν μπορώ να ανοίξω σημειωμένο αρχείο.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "ο πηγαίος κατάλογος είναι ίδιος με τον κατάλογο προορισμού.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Τελευταίος αριθμός στον κατάλογο %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/Άνοιγμα"
@@ -3885,116 +4052,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Η γραμμή εντολής για απεικόνιση MIME είναι μη έγκυρη: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "δημιουργώ NNTP σύνδεση στο %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "Η NNTP σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "το άρθρο %d έχει προσπελαστεί ήδη.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "λαμβάνω το άρθρο %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "δεν μπορώ να διαβάσω το άρθρο %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "δεν μπορώ να λάβω την λίστα newsgroup\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "δεν μπορώ να στείλω το άρθρο.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "δεν μπορώ να λάβω το άρθρο %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "δεν μπορώ να επιλέξω την ομάδα %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "μη έγκυρη ακολουθία άρθρων: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "δεν υπάρχουν νέα άρθρα.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "λαμβάνω xover %d - %d στο %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "δεν μπορώ να λάβω xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "συνέβη σφάλμα καθώς λάμβανα xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "μη έγκυρη γραμμή xover: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "δεν μπορώ να λάβω xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "συνέβη σφάλμα καθώς λάμβανα xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "σφάλμα πρωτοκόλλου: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "σφάλμα πρωτοκόλλου\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Κωδική φράση"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[χωρίς user id]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -4007,7 +4073,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -4015,468 +4081,6 @@ msgstr ""
 "Λάθος κωδική φράση! Ξαναπροσπαθήστε...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Προαπαιτούμενη timestamp APOP δεν βρέθηκε στο χαιρετισμό\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Συντακτικό σφάλμα timestamp στο χαιρετισμό\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Σφάλμα πρωτοκόλλου POP3\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "μη έγκυρη γραμμή xover: %s\n"
-
-#: src/pop.c:616
-#, fuzzy, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "διαγράφω το μήνυμα %d...\n"
-
-#: src/pop.c:624
-#, fuzzy, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
-
-#: src/pop.c:655
-#, fuzzy
-msgid "mailbox is locked\n"
-msgstr "Ρυθμίσεις Mailbox"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-#, fuzzy
-msgid "can't start TLS session\n"
-msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Εντολή"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Ανοίγω το παράθυρο επιλογών των λογαριασμών...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Λογαριασμός%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Επιλογές για το νέο λογαριασμό"
-
-#: src/prefs_account.c:683
-#, fuzzy
-msgid "Account preferences"
-msgstr "Κοινές Επιλογές"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Δημιουργώ το παράθυρο επιλογών του λογαριασμού...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Λήψη"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Μυστικότητα"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Προχωρημένα"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Όνομα του λογαριασμού"
-
-#: src/prefs_account.c:798
-#, fuzzy
-msgid "Set as default"
-msgstr " Θέσε ως σύνηθη λογαριασμό "
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Προσωπικές πληροφορίες"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Πλήρες όνομα"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Διεύθυνση mail"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Οργανισμός"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Πληροφορίες εξυπηρέτη"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Νέα (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Τίποτα (τοπικό)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Εξυπηρέτης νέων"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Εξυπηρέτης για λήψη"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Εξυπηρέτης SMTP (αποστολή)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Όνομα χρήστη"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Κωδικός"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
-
-#: src/prefs_account.c:1045
-#, fuzzy
-msgid "Remove after"
-msgstr "Αφαίρεση καταλόγου"
-
-#: src/prefs_account.c:1054
-#, fuzzy
-msgid "days"
-msgstr "Πάντα"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr ""
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Λήψη όλων των μηνυμάτων από τον εξυπηρέτη"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr ""
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
-
-#: src/prefs_account.c:1106
-#, fuzzy
-msgid "Default inbox"
-msgstr "Προκαθορισμένο κλειδί υπογραφής"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr ""
-"Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-#, fuzzy
-msgid "Authentication method"
-msgstr "Πιστοποίηση"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Αυτόματη"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Νέα"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Μέγιστος αριθμός άρθρων που θα ληφθούν\n"
-"(χωρίς όριο αν θέσετε 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Ο παραλήπτης δεν έχει οριστεί."
-
-#: src/prefs_account.c:1188
-#, fuzzy
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Λήψη όλων' ελέγχει για νέα μηνύματα σε αυτό το λογαριασμό"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Επικεφαλίδα"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Προσθήκη πεδίου ημερομηνίας στην κεφαλίδα"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Δημιουργία Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr "Επεξεργασία..."
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Πιστοποίηση"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Πιστοποίηση SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Εντολή"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-#, fuzzy
-msgid "Automatically set the following addresses"
-msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Κοινοποίηση"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Απάντηση σε"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Υπογραφή μηνυμάτων εξ ορισμού"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Κρυπτογράφηση μηνυμάτων εξ ορισμού"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr ""
-
-#: src/prefs_account.c:1526
-#, fuzzy
-msgid "Use clear text signature"
-msgstr "Εισαγωγή υπογραφής"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Κλειδί υπογραφής"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Χήση προκαθορισμένου κλειδιού GnuPG"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Επιλογή κλειδιού με βάση την email διεύθυνση"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Ορίστε με το χέρι το κλειδί"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Χρήστης ή key ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Να μην χρησιμοποιείται SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Χρήση SSL για σύνδεση POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Χρήση SSL για σύνδεση IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr ""
-
-#: src/prefs_account.c:1708
-#, fuzzy
-msgid "Use SSL for NNTP connection"
-msgstr "Χρήση SSL για σύνδεση SMTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Αποστολή (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Χρήση SSL για σύνδεση SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Προσδιορισμός θύρας SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Προσδιορισμός θύρας POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Προσδιορισμός θύρας IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Προσδιορισμός θύρας NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Ορισμός του ονόματος του domain"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
-
-#: src/prefs_account.c:1916
-#, fuzzy
-msgid "Put sent messages in"
-msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
-
-#: src/prefs_account.c:1918
-#, fuzzy
-msgid "Put draft messages in"
-msgstr "Τύλιξη μηνυμάτων στους"
-
-#: src/prefs_account.c:1920
-#, fuzzy
-msgid "Put deleted messages in"
-msgstr "Διαγραφή μηνύματος"
-
-#: src/prefs_account.c:1981
-#, fuzzy
-msgid "Account name is not entered."
-msgstr "Η διεύθυνση mail δεν έχει οριστεί."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Η διεύθυνση mail δεν έχει οριστεί."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Ο εξυπηρέτης SMTP δεν έχει οριστεί."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Το όνομα χρήστη δεν έχει οριστεί."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Ο εξυπηρέτης POP3 δεν έχει οριστεί."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Ο εξυπηρέτης IMAP4 δεν έχει οριστεί."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Ο εξυπηρέτης NNTP δεν έχει οριστεί."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4528,17 +4132,17 @@ msgstr ""
 msgid "Registered actions"
 msgstr "Ορισμένοι κανόνες"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Πάνω"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Κάτω"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Νέο)"
 
@@ -4582,838 +4186,31 @@ msgstr "Διαγραφή λογαριασμού"
 msgid "Do you really want to delete this action?"
 msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Κατάλογος"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Δημιουργία παραθύρου κοινών επιλογών...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Κοινές επιλογές"
-
-#: src/prefs_common.c:954
-#, fuzzy
-msgid "Quote"
-msgstr "Ουρά"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Εμφάνιση"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Μήνυμα"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Άλλα"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Χρήση εξωτερικού προγράμματος για λήψη μηνυμάτων"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Εντολή"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Λήψη νέου mail"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Φιλτράρισμα κατά τη λήψη"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Αυτόματος έλεγχος για νέα mail"
-
-#: src/prefs_common.c:1078
-#, fuzzy
-msgid "every"
-msgstr "Ποτέ"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "λεπτά"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Έλεγχος για νέο mail στην αρχή"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Ενημέρωση όλων των τοπικών καταλόγων μετά την λήψη"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Χρήση εξωτερικού προγράμματος για αποστολή"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Κωδικοσελίδα εξερχομένων"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Αυτόματο (Προτεινόμενο)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-#, fuzzy
-msgid "Western European (ISO-8859-15)"
-msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Κεντρικήs Ευρώπης (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Βαλτικής (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Βαλτικής (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Ελληνική (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Ελληνική (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Κυριλλική (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Τουρκική (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Κυριλλική (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Κυριλλική (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Κυριλλική (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Κυριλλική (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Ιαπωνέζικη (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Ιαπωνέζικη (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Ιαπωνέζικη (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Απλοποιημένη Κινεζική (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Απλοποιημένη Κινεζική (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Παραδοσιακή Κινεζική (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Κινεζική (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Κορεατική (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr ""
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr ""
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-
-#: src/prefs_common.c:1287
-#, fuzzy
-msgid "Transfer encoding"
-msgstr "Τύλιξη πριν την αποστολή"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Διαχωρισμός υπογραφής"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Αυτόματη εισαγωγή"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Αυτόματη χρήση εξωτερικού προγράμματος επεξεργασίας"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr ""
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Τύλιξη μηνυμάτων στους"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "χαρακτήρες"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Τύλιξη παράθεσης"
-
-#: src/prefs_common.c:1447
-#, fuzzy
-msgid "Wrap on input"
-msgstr "Αναδίπλωση γραμμών"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Τύλιξη πριν την αποστολή"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Αυτόματη επιλογή λογαριασμού για τις απαντήσεις"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Παράθεση του μηνύματος όταν απαντάτε"
-
-#: src/prefs_common.c:1463
-#, fuzzy
-msgid "Reply button invokes mailing list reply"
-msgstr "/Απάντηση σε όλους"
-
-#. reply
-#: src/prefs_common.c:1509
-#, fuzzy
-msgid "Reply format"
-msgstr "Μορφοποίηση ημερομηνίας"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Σήμα παράθεσης"
-
-#. forward
-#: src/prefs_common.c:1551
-#, fuzzy
-msgid "Forward format"
-msgstr "Προώθηση"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Περιγραφή συμβόλων"
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Γραμματοσειρά"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr ""
-"Μετέφρασε τα ονόματα των πεδίων της επικεφαλίδας (όπως το `From:' σε `Από')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του καταλόγου"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr ""
-
-#: src/prefs_common.c:1690
-#, fuzzy
-msgid "letters"
-msgstr "Διαγραφή"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Απεικόνιση Περίληψης"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr ""
-"Εμφάνιση του παραλήπτη στη στήλη `Αποστολέα' αν ο αποστολέας είστε εσείς"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr ""
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Μορφοποίηση ημερομηνίας"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Ορισμός εμφανιζόμενων στοιχείων περίληψης... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Ενεργοποίηση χρωματισμού των μηνυμάτων"
-
-#: src/prefs_common.c:1814
-#, fuzzy
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "Display 2-byte alphabet and numeric with 1-byte character"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Εμφάνιση τμήματος με την κεφαλίδα πάνω από την προβολή μηνύματος"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Διάστημα γραμμών"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(s)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Κύλιση"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Μισή σελίδα"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Ομαλή κύλιση"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Κατά βήματα"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr ""
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Ορισμός εμφάνισης κεφαλίδας"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Εκτέλεση"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Εκτέλεση"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Κατάλογος"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Αυτόματος έλεγχος υπογραφών"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Εμφάνιση του αποτελέσματος του ελέγχου σε ξεχωριστό παράθυρο"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr ""
-
-#: src/prefs_common.c:2110
-#, fuzzy
-msgid "Expired after"
-msgstr ""
-"Αποστολή\n"
-"αργότερα"
-
-#: src/prefs_common.c:2123
-#, fuzzy
-msgid "minute(s) "
-msgstr "λεπτά"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Grab input while entering a passphrase"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Εμφάνιση ειδοποίησης κατά την εκκίνηση αν το GnuPG δεν λειτουργεί"
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr ""
-"Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
-
-#: src/prefs_common.c:2212
-#, fuzzy
-msgid "Only mark message as read when opened in new window"
-msgstr "/Μήνυμα/Άνοιγμα σε νέο παράθυρο"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Μετακίνηση στον κατάλογο εισερχομένων μετά τη λήψη νέων μηνυμάτων"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Τα μηνύματα απλά θα σημανθούν μέχρι την εκτέλεση\n"
-"αν αυτό είναι απεπιλεγμένο)"
-
-#: src/prefs_common.c:2239
-#, fuzzy
-msgid "Receive dialog"
-msgstr "Εμφάνιση διαλόγου λήψης"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Εμφάνιση διαλόγου λήψης"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Πάντα"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Ποτέ"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr ""
-
-#: src/prefs_common.c:2270
-#, fuzzy
-msgid "Close receive dialog when finished"
-msgstr "Εμφάνιση διαλόγου λήψης"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr ""
-
-#: src/prefs_common.c:2333
-#, fuzzy, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr ""
-"Εξωτερικό πρόγραμμα σύνθεσης (το %s θα αντικατασταθεί με το όνομα αρχείου)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr ""
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Προσθήκη διεύθυνσης στον προορισμό σε διπλό κλικ"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Κατά την έξοδο"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Επιβεβαίωση εξόδου"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Άδειασμα των διαγραμμένων στην έξοδο"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Επιβεβαίωση πριν το άδειασμα"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Προειδοποίηση αν υπάρχουν μηνύματα στην ουρά"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr ""
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "η συντομογραφία ημέρας της εβδομάδας"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "το πλήρες όνομα της μέρας της εβδομάδας"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "η συντομογραφία του μήνα"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "το πλήρες όνομα του μήνα"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "η προτιμώμενη ημερομηνία και ώρα για το τρέχον locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "ο αριθμός αιώνα (έτη / 100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 24ωρο ρολόι"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 12ωρο ρολόι"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "η μέρα του έτους ως δεκαδικός αριθμός"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "ο μήνας ως δεκαδικός αριθμός"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "το λεπτό ως δεκαδικός αριθμός"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "είτε ΠΜ ή ΜΜ"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "τα τελευταία δύο ψηφία του έτους"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "το έτος ως δεκαδικός αριθμός"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "Η ζώνη ώρας ή όνομα, ή συνμτομογραφία"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Προσδιοριστής"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Παράδειγμα"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Όρισμος χρωμάτων μηνύματος"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Χρώματα"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Παρατιθέμενο κείμενο - Πρώτο επίπεδο"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Παρατιθέμενο κείμενο - Δεύτερο επίπεδο"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Παρατιθέμενο κείμενο - Τρίτο επίπεδο"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Σύνδεσμος URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Ανακύκλωση χρωμάτων παράθεσης"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Επιλογή χρώματος πρώτου επιπέδου παράθεσης"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Επιλογή χρώματος δεύτερου επιπέδου παράθεσης"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Επιλογή χρώματος τρίτου επιπέδου παράθεσης"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Επιλογή χρώματος για URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Περιγραφή των συμβόλων"
-
-#: src/prefs_common.c:3153
-#, fuzzy
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Ημερομηνία\n"
-"Από\n"
-"Πλήρες όνομα του αποστολέα\n"
-"Μικρό όνομα του αποστολέα\n"
-"Αρχικά του αποστολέα\n"
-"Θέμα\n"
-"Προς\n"
-"Κοινοποίηση\n"
-"Message-ID\n"
-"%"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr ""
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-
-#: src/prefs_common.c:3224
-#, fuzzy
-msgid "Key bindings"
-msgstr "Στέλνω"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-#, fuzzy
-msgid "Default"
-msgstr "Προκαθορισμένο κλειδί υπογραφής"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr ""
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Ρυθμίσεις ειδικής κεφαλίδας"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Επικεφαλίδα"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Διαγραφή"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Ειδική κεφαλίδα"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Διαγραφή κεφαλίδας"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
@@ -5461,12 +4258,21 @@ msgstr "Ρυθμίσεις φίλτρων"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτός ο κανόνας;"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Χωρίς τίτλο"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Διαγραφή κανόνα"
 
@@ -5555,6 +4361,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5697,6 +4507,11 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr ""
 
+#: src/prefs_folder_item.c:304
+#, fuzzy
+msgid "Automatically set the following addresses"
+msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr ""
@@ -5775,70 +4590,51 @@ msgstr "Εμφανισθείσες κεφαλίδες"
 msgid " Revert to default "
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 #, fuzzy
 msgid "Template name"
 msgstr "Όνομα κεφαλίδας"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Καταχώρηση"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Αντικατάσταση"
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr ""
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 #, fuzzy
 msgid "Registered templates"
 msgstr "Ορισμένοι κανόνες"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr ""
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 #, fuzzy
 msgid "Template format error."
 msgstr "Όνομα κεφαλίδας"
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 #, fuzzy
 msgid "Delete template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 #, fuzzy
 msgid "Do you really want to delete this template?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/procmime.c:773
-#, fuzzy
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "Η μετατροπή του κώδικα απέτυχε.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "δεν μπορώ να ανοίξω το αρχείο mark\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "δεν μπορώ να λάβω το μήνυμα %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Η εντολή εκτύπωσης είναι άκυρη: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Δημιουργώ διάλογο προόδου...\n"
@@ -5847,29 +4643,21 @@ msgstr "Δημιουργώ διάλογο προόδου...\n"
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "προέκυψε σφάλμα κατά την λήψη δεδομένων.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Δεν μπορώ να βρω user ID για αυτό το κλειδί"
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, fuzzy, c-format
 msgid "Signature made at %s\n"
 msgstr "Υπογραφή δημιουργήθηκε %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Σφάλμα κατά την εξακρίβωση της υπογραφής"
 
@@ -5895,6 +4683,10 @@ msgstr "Key ID"
 msgid "Val"
 msgstr "Τιμή"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Άλλα"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Προσθήκη κλειδιού"
@@ -5916,88 +4708,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Η κεφαλίδα του εν αναμονή μηνύματος δεν είναι πλέον έγκυρη.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Δεν μπόρεσα να εκτελέσω την εξωτερική εντολή: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Συνδέομαι"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Σύνδεση στην εξυπηρέτη SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 #, fuzzy
 msgid "Authenticating"
 msgstr "Πιστοποίηση"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Στέλνω MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Στέλνω"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Στέλνω RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Στέλνω DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Εγκαταλείπω..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6098,34 +4890,20 @@ msgstr "Λάθος υπογραφή"
 msgid "No public key to verify the signature"
 msgstr "Δεν υπάρχει δημόσιο κλειδί για να εξακριβώσω αυτή την υπογραφή"
 
-#: src/smtp.c:156
-#, fuzzy
-msgid "SMTP AUTH not available\n"
-msgstr "Το TLSv1 δεν είναι διαθέσιμο\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Δημιουργία παραθύρου πηγής...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Πηγή του μηνύματος"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Εμφάνιση της πηγής του %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Πηγή"
@@ -6534,6 +5312,814 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Μερικά παράθυρα σύνθεσης μηνύματος είναι ανοιχτά.\n"
+#~ "Παρακαλώ κλείστε όλα τα παράθυρα σύνθεσης μηνύματος πριν επεξεργαστείτε "
+#~ "τους λογαριασμούς."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Ανοίγω το παράθυρο επεξεργασίας λογαριασμού...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Δημιουργώ το παράθυρο επεξεργασίας λογαριασμού...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Επεξεργασία λογαριασμών"
+
+#~ msgid "Protocol"
+#~ msgstr "Πρωτόκολλο"
+
+#~ msgid "Server"
+#~ msgstr "Εξυπηρέτης"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Θέσε ως σύνηθη λογαριασμό "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
+
+#~ msgid "Delete account"
+#~ msgstr "Διαγραφή λογαριασμού"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Ανοίγω το παράθυρο επιλογών των λογαριασμών...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Λογαριασμός%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Επιλογές για το νέο λογαριασμό"
+
+#, fuzzy
+#~ msgid "Account preferences"
+#~ msgstr "Κοινές Επιλογές"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Δημιουργώ το παράθυρο επιλογών του λογαριασμού...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Λήψη"
+
+#~ msgid "Privacy"
+#~ msgstr "Μυστικότητα"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Προχωρημένα"
+
+#~ msgid "Name of this account"
+#~ msgstr "Όνομα του λογαριασμού"
+
+#, fuzzy
+#~ msgid "Set as default"
+#~ msgstr " Θέσε ως σύνηθη λογαριασμό "
+
+#~ msgid "Personal information"
+#~ msgstr "Προσωπικές πληροφορίες"
+
+#~ msgid "Full name"
+#~ msgstr "Πλήρες όνομα"
+
+#~ msgid "Mail address"
+#~ msgstr "Διεύθυνση mail"
+
+#~ msgid "Organization"
+#~ msgstr "Οργανισμός"
+
+#~ msgid "Server information"
+#~ msgstr "Πληροφορίες εξυπηρέτη"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Νέα (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Τίποτα (τοπικό)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
+
+#~ msgid "News server"
+#~ msgstr "Εξυπηρέτης νέων"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Εξυπηρέτης για λήψη"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Εξυπηρέτης SMTP (αποστολή)"
+
+#~ msgid "User ID"
+#~ msgstr "Όνομα χρήστη"
+
+#~ msgid "Password"
+#~ msgstr "Κωδικός"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Αυτός ο εξυπηρέτης απαιτεί πιστοποίηση"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
+
+#, fuzzy
+#~ msgid "Remove after"
+#~ msgstr "Αφαίρεση καταλόγου"
+
+#, fuzzy
+#~ msgid "days"
+#~ msgstr "Πάντα"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Λήψη όλων των μηνυμάτων από τον εξυπηρέτη"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
+
+#, fuzzy
+#~ msgid "Default inbox"
+#~ msgstr "Προκαθορισμένο κλειδί υπογραφής"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr ""
+#~ "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
+
+#, fuzzy
+#~ msgid "Authentication method"
+#~ msgstr "Πιστοποίηση"
+
+#~ msgid "Automatic"
+#~ msgstr "Αυτόματη"
+
+#~ msgid "News"
+#~ msgstr "Νέα"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Μέγιστος αριθμός άρθρων που θα ληφθούν\n"
+#~ "(χωρίς όριο αν θέσετε 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Ο παραλήπτης δεν έχει οριστεί."
+
+#, fuzzy
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Λήψη όλων' ελέγχει για νέα μηνύματα σε αυτό το λογαριασμό"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Προσθήκη πεδίου ημερομηνίας στην κεφαλίδα"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Δημιουργία Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
+
+#~ msgid " Edit... "
+#~ msgstr "Επεξεργασία..."
+
+#~ msgid "Authentication"
+#~ msgstr "Πιστοποίηση"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Πιστοποίηση SMTP (SMTP AUTH)"
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Εντολή"
+
+#~ msgid "Cc"
+#~ msgstr "Κοινοποίηση"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Απάντηση σε"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Υπογραφή μηνυμάτων εξ ορισμού"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Κρυπτογράφηση μηνυμάτων εξ ορισμού"
+
+#, fuzzy
+#~ msgid "Use clear text signature"
+#~ msgstr "Εισαγωγή υπογραφής"
+
+#~ msgid "Sign key"
+#~ msgstr "Κλειδί υπογραφής"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Χήση προκαθορισμένου κλειδιού GnuPG"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Επιλογή κλειδιού με βάση την email διεύθυνση"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Ορίστε με το χέρι το κλειδί"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Χρήστης ή key ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Να μην χρησιμοποιείται SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Χρήση SSL για σύνδεση POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Χρήση SSL για σύνδεση IMAP4"
+
+#, fuzzy
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Χρήση SSL για σύνδεση SMTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Αποστολή (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Χρήση SSL για σύνδεση SMTP"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Προσδιορισμός θύρας SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Προσδιορισμός θύρας POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Προσδιορισμός θύρας IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Προσδιορισμός θύρας NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Ορισμός του ονόματος του domain"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
+
+#, fuzzy
+#~ msgid "Put sent messages in"
+#~ msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
+
+#, fuzzy
+#~ msgid "Put draft messages in"
+#~ msgstr "Τύλιξη μηνυμάτων στους"
+
+#, fuzzy
+#~ msgid "Put deleted messages in"
+#~ msgstr "Διαγραφή μηνύματος"
+
+#, fuzzy
+#~ msgid "Account name is not entered."
+#~ msgstr "Η διεύθυνση mail δεν έχει οριστεί."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Η διεύθυνση mail δεν έχει οριστεί."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Ο εξυπηρέτης SMTP δεν έχει οριστεί."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Το όνομα χρήστη δεν έχει οριστεί."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Ο εξυπηρέτης POP3 δεν έχει οριστεί."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Ο εξυπηρέτης IMAP4 δεν έχει οριστεί."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Ο εξυπηρέτης NNTP δεν έχει οριστεί."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Δημιουργία παραθύρου κοινών επιλογών...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Κοινές επιλογές"
+
+#, fuzzy
+#~ msgid "Quote"
+#~ msgstr "Ουρά"
+
+#~ msgid "Display"
+#~ msgstr "Εμφάνιση"
+
+#~ msgid "Message"
+#~ msgstr "Μήνυμα"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Χρήση εξωτερικού προγράμματος για λήψη μηνυμάτων"
+
+#~ msgid "Command"
+#~ msgstr "Εντολή"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Λήψη νέου mail"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Φιλτράρισμα κατά τη λήψη"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Αυτόματος έλεγχος για νέα mail"
+
+#, fuzzy
+#~ msgid "every"
+#~ msgstr "Ποτέ"
+
+#~ msgid "minute(s)"
+#~ msgstr "λεπτά"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Έλεγχος για νέο mail στην αρχή"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Ενημέρωση όλων των τοπικών καταλόγων μετά την λήψη"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Χρήση εξωτερικού προγράμματος για αποστολή"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Κωδικοσελίδα εξερχομένων"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Αυτόματο (Προτεινόμενο)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
+
+#, fuzzy
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Κεντρικήs Ευρώπης (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Βαλτικής (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Βαλτικής (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Ελληνική (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Ελληνική (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Κυριλλική (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Τουρκική (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Κυριλλική (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Κυριλλική (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Κυριλλική (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Κυριλλική (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Ιαπωνέζικη (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Ιαπωνέζικη (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Ιαπωνέζικη (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Απλοποιημένη Κινεζική (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Απλοποιημένη Κινεζική (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Παραδοσιακή Κινεζική (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Κινεζική (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Κορεατική (EUC-KR)"
+
+#, fuzzy
+#~ msgid "Transfer encoding"
+#~ msgstr "Τύλιξη πριν την αποστολή"
+
+#~ msgid "Signature separator"
+#~ msgstr "Διαχωρισμός υπογραφής"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Αυτόματη εισαγωγή"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Αυτόματη χρήση εξωτερικού προγράμματος επεξεργασίας"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Τύλιξη μηνυμάτων στους"
+
+#~ msgid "characters"
+#~ msgstr "χαρακτήρες"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Τύλιξη παράθεσης"
+
+#, fuzzy
+#~ msgid "Wrap on input"
+#~ msgstr "Αναδίπλωση γραμμών"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Τύλιξη πριν την αποστολή"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Αυτόματη επιλογή λογαριασμού για τις απαντήσεις"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Παράθεση του μηνύματος όταν απαντάτε"
+
+#, fuzzy
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "/Απάντηση σε όλους"
+
+#, fuzzy
+#~ msgid "Reply format"
+#~ msgstr "Μορφοποίηση ημερομηνίας"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Σήμα παράθεσης"
+
+#, fuzzy
+#~ msgid "Forward format"
+#~ msgstr "Προώθηση"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Περιγραφή συμβόλων"
+
+#~ msgid "Font"
+#~ msgstr "Γραμματοσειρά"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr ""
+#~ "Μετέφρασε τα ονόματα των πεδίων της επικεφαλίδας (όπως το `From:' σε "
+#~ "`Από')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του καταλόγου"
+
+#, fuzzy
+#~ msgid "letters"
+#~ msgstr "Διαγραφή"
+
+#~ msgid "Summary View"
+#~ msgstr "Απεικόνιση Περίληψης"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr ""
+#~ "Εμφάνιση του παραλήπτη στη στήλη `Αποστολέα' αν ο αποστολέας είστε εσείς"
+
+#~ msgid "Date format"
+#~ msgstr "Μορφοποίηση ημερομηνίας"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Ορισμός εμφανιζόμενων στοιχείων περίληψης... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Ενεργοποίηση χρωματισμού των μηνυμάτων"
+
+#, fuzzy
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "Display 2-byte alphabet and numeric with 1-byte character"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Εμφάνιση τμήματος με την κεφαλίδα πάνω από την προβολή μηνύματος"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
+
+#~ msgid "Line space"
+#~ msgstr "Διάστημα γραμμών"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(s)"
+
+#~ msgid "Scroll"
+#~ msgstr "Κύλιση"
+
+#~ msgid "Half page"
+#~ msgstr "Μισή σελίδα"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Ομαλή κύλιση"
+
+#~ msgid "Step"
+#~ msgstr "Κατά βήματα"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Ορισμός εμφάνισης κεφαλίδας"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Εκτέλεση"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Εκτέλεση"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Κατάλογος"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Αυτόματος έλεγχος υπογραφών"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Εμφάνιση του αποτελέσματος του ελέγχου σε ξεχωριστό παράθυρο"
+
+#, fuzzy
+#~ msgid "Expired after"
+#~ msgstr ""
+#~ "Αποστολή\n"
+#~ "αργότερα"
+
+#, fuzzy
+#~ msgid "minute(s) "
+#~ msgstr "λεπτά"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Grab input while entering a passphrase"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Εμφάνιση ειδοποίησης κατά την εκκίνηση αν το GnuPG δεν λειτουργεί"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr ""
+#~ "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
+
+#, fuzzy
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "/Μήνυμα/Άνοιγμα σε νέο παράθυρο"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Μετακίνηση στον κατάλογο εισερχομένων μετά τη λήψη νέων μηνυμάτων"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Τα μηνύματα απλά θα σημανθούν μέχρι την εκτέλεση\n"
+#~ "αν αυτό είναι απεπιλεγμένο)"
+
+#, fuzzy
+#~ msgid "Receive dialog"
+#~ msgstr "Εμφάνιση διαλόγου λήψης"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Εμφάνιση διαλόγου λήψης"
+
+#~ msgid "Always"
+#~ msgstr "Πάντα"
+
+#~ msgid "Never"
+#~ msgstr "Ποτέ"
+
+#, fuzzy
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Εμφάνιση διαλόγου λήψης"
+
+#, fuzzy
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr ""
+#~ "Εξωτερικό πρόγραμμα σύνθεσης (το %s θα αντικατασταθεί με το όνομα αρχείου)"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Προσθήκη διεύθυνσης στον προορισμό σε διπλό κλικ"
+
+#~ msgid "On exit"
+#~ msgstr "Κατά την έξοδο"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Επιβεβαίωση εξόδου"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Άδειασμα των διαγραμμένων στην έξοδο"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Επιβεβαίωση πριν το άδειασμα"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Προειδοποίηση αν υπάρχουν μηνύματα στην ουρά"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "η συντομογραφία ημέρας της εβδομάδας"
+
+#~ msgid "the full weekday name"
+#~ msgstr "το πλήρες όνομα της μέρας της εβδομάδας"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "η συντομογραφία του μήνα"
+
+#~ msgid "the full month name"
+#~ msgstr "το πλήρες όνομα του μήνα"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "η προτιμώμενη ημερομηνία και ώρα για το τρέχον locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "ο αριθμός αιώνα (έτη / 100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 24ωρο ρολόι"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 12ωρο ρολόι"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "η μέρα του έτους ως δεκαδικός αριθμός"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "ο μήνας ως δεκαδικός αριθμός"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "το λεπτό ως δεκαδικός αριθμός"
+
+#~ msgid "either AM or PM"
+#~ msgstr "είτε ΠΜ ή ΜΜ"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "τα τελευταία δύο ψηφία του έτους"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "το έτος ως δεκαδικός αριθμός"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "Η ζώνη ώρας ή όνομα, ή συνμτομογραφία"
+
+#~ msgid "Specifier"
+#~ msgstr "Προσδιοριστής"
+
+#~ msgid "Description"
+#~ msgstr "Περιγραφή"
+
+#~ msgid "Example"
+#~ msgstr "Παράδειγμα"
+
+#~ msgid "Set message colors"
+#~ msgstr "Όρισμος χρωμάτων μηνύματος"
+
+#~ msgid "Colors"
+#~ msgstr "Χρώματα"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Παρατιθέμενο κείμενο - Πρώτο επίπεδο"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Παρατιθέμενο κείμενο - Δεύτερο επίπεδο"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Παρατιθέμενο κείμενο - Τρίτο επίπεδο"
+
+#~ msgid "URI link"
+#~ msgstr "Σύνδεσμος URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Ανακύκλωση χρωμάτων παράθεσης"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Επιλογή χρώματος πρώτου επιπέδου παράθεσης"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Επιλογή χρώματος δεύτερου επιπέδου παράθεσης"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Επιλογή χρώματος τρίτου επιπέδου παράθεσης"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Επιλογή χρώματος για URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Περιγραφή των συμβόλων"
+
+#, fuzzy
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Ημερομηνία\n"
+#~ "Από\n"
+#~ "Πλήρες όνομα του αποστολέα\n"
+#~ "Μικρό όνομα του αποστολέα\n"
+#~ "Αρχικά του αποστολέα\n"
+#~ "Θέμα\n"
+#~ "Προς\n"
+#~ "Κοινοποίηση\n"
+#~ "Message-ID\n"
+#~ "%"
+
+#, fuzzy
+#~ msgid "Key bindings"
+#~ msgstr "Στέλνω"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Προκαθορισμένο κλειδί υπογραφής"
+
 #~ msgid "Font selection"
 #~ msgstr "Επιλογή γραμματοσειράς"
 
@@ -6844,9 +6430,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Ρυθμίσεις widgets..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Μετακινώ το μήνυμα  %s%c%d στο %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tΣημειώνω τα μηνύματα..."
 
diff --git a/po/es.po b/po/es.po
index 9e87b069..b56c5a5a 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,402 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Leyendo configuración de cada cuenta...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo la configuración a fichero\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "La conexión IMAP4 con %s se ha roto. Reconectando...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "El servidor IMAP4 deshabilita LOGIN.\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "creando conexión IMAP4 con %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "No puedo iniciar la sesión TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Enviando mensaje (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Copiando mensaje %s%c%d a %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Copiando mensaje %s%c%d a %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Obteniendo mensajes desde %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "no puedo establecer los flags borrados: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "no puedo vaciar\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Obteniendo mensajes desde %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "no puedo establecer los flags borrados: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "no se puede cerrar la carpeta\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "la carpeta raíz %s no existe\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "hubo un error obteniendo LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "No puedo crear '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "No puedo crear '%s' bajo Entrada\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "no puedo crear el buzón: LIST falló\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "no puedo crear el buzón\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "no puedo renombrar el buzón: %s a %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "no puedo borrar el buzón\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "no se puede obtener la estructura del mensaje\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Enviando mensaje (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "Error obteniendo la estructura del mensaje.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "No se puede interpretar la estructura del mensaje: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "No puedo establecer la sesión IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "no se puede obtener el espacio de nombres\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "no se puede seleccionar la carpeta: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "La autentificación IMAP falló.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Autentificación IMAP4 fallida.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "no puedo añadir %s a %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(enviando fichero...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "no se puede añadir el mensaje a %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "no puedo copiar %s a %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "error en el mandato imap: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "error en el mandato imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "error en el mandato imap: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv no puede convertir UTF-7 a %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv no puede convertir %s a UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "no se puede copiar mensaje %s a %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "No se puede abrir el fichero de marcas.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "carpetas de origen y destino idénticas.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Copiando mensaje %s%c%d a %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Último número en directorio %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"El fichero «%s» ya existe.\n"
+"No puedo crear la carpeta."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"El nombre de directorio\n"
+"«%s» no es una cadena UTF-8 válida.\n"
+"Quizás se este usando la codificación local para el nombre.\n"
+"Si esto es así debería establecer la siguiente variable de entorno\n"
+"(Vea el README para los detalles):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "creando conexión NNTP con %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "La conexión NNTP con %s:%d ha sido rota. Reconectando...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "el artículo %d ya esta en caché.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "obteniendo artículo %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "no puedo leer el artículo %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "no puedo obtener la lista de grupos\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "no se puede enviar el artículo.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "no puedo obtener el artículo %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "no puedo seleccionar grupo: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "rango de artículos no válido: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "no hay artículos nuevos.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "obteniendo xover %d - %d en %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "no se puede obtener xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "hubo un error obteniendo xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "linea xover no válida: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "no se puede obtener xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "hubo un error obteniendo xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "No se puede conectar con el servidor NNTP: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "error del protocolo: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "error del protocolo\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Hubo un error mientras se enviaba\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Hubo un error enviando el mandato\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "No se encontro en el saludo la marca temporal APOP requerida\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "La marca temporal del saludo tiene un error de sintaxis\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Error del protocolo POP3\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "respuesta UIDL no válida: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Borrando mensaje expirado %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Ignorando mensaje %d (%d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "el buzón está bloqueado\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "tiempo de espera agotado para la sesión\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "no puedo abrir la sesión TLs\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "hubo algún error en la autentificación\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "mandato no soportado\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "hubo algún error en la sesión POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +419,52 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "Filtro de correo basura"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "no se puede abrir el fichero de marcas\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "no se puede obtener el mensaje %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "No se puede obtener la parte de texto\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "La orden para imprimir es inválida: «%s»\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "hubo un error mientras se obtenian datos.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "No se puede escribir al fichero.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH no está disponible\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "respuesta SMTP errónea\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "hubo algún error en la sesión SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 no está disponible\n"
@@ -163,76 +598,6 @@ msgstr ""
 "junto con este programa; en caso contrario, escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Leyendo configuración de cada cuenta...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Hay ventanas de composición abiertas.\n"
-"Cierre todas las ventanas de composición antes de editar las cuentas."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Abriendo ventana de edición de cuenta...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Creando ventana de edición de cuenta...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Editar cuentas"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"El orden de comprobación de mensajes será éste. Marque las casillas\n"
-"en la columna `G' para habilitar la descarga mediante `Traer todo'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nombre"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Servidor"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Editar"
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr "_Establecer como cuenta primaria "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "¿Esta seguro de que quiere borrar la cuenta «%s»?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(Sin título)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Borrar cuenta"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -332,6 +697,14 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nombre"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -346,8 +719,8 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fichero"
 
@@ -368,9 +741,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
@@ -386,7 +759,7 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
@@ -418,8 +791,8 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
@@ -427,13 +800,13 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
@@ -450,17 +823,17 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -472,7 +845,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -482,14 +855,14 @@ msgstr "Nombre:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Borrar"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -500,11 +873,11 @@ msgid "Lookup"
 msgstr "Buscar"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -530,7 +903,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -642,7 +1015,7 @@ msgstr "Error en la conversión de la agenda"
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -662,8 +1035,7 @@ msgstr "Dirección e-mail"
 msgid "Group"
 msgstr "Grupo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -687,15 +1059,15 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Error"
 
@@ -750,8 +1122,8 @@ msgstr "/_Añadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -791,8 +1163,8 @@ msgstr "/_Editar/_Deshacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
@@ -800,7 +1172,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
@@ -812,7 +1184,7 @@ msgstr "/_Editar/_Pegar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -828,7 +1200,7 @@ msgstr "/_Editar/_Cortar todas las líneas largas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ver"
@@ -850,9 +1222,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -868,7 +1240,7 @@ msgstr "/_Ver/_Regleta"
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
@@ -879,103 +1251,103 @@ msgstr "/_Ver/Codificación de caract_eres/_Automática"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/Codificación de caract_eres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
@@ -983,14 +1355,14 @@ msgstr "/_Herramientas/_Agenda de direcciones"
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
@@ -1011,10 +1383,6 @@ msgstr "/_Mensaje/_Encriptar con PGP"
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "No se puede obtener la parte de texto\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
@@ -1090,7 +1458,7 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
@@ -1185,8 +1553,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Enviar"
 
@@ -1226,8 +1593,7 @@ msgstr "Adjuntar"
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Firma"
 
@@ -1235,7 +1601,7 @@ msgstr "Firma"
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1427,7 +1793,7 @@ msgstr "Modificar"
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valor"
 
@@ -1460,7 +1826,6 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Fichero"
 
@@ -1516,12 +1881,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -1538,7 +1903,7 @@ 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.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1602,7 +1967,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Básico"
 
@@ -1660,7 +2025,6 @@ msgid "Exporting file:"
 msgstr "Fichero de exportación:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -1684,160 +2048,160 @@ msgstr "¿Sobreescribir el fichero existente?"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/_Mover carpeta..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbol de carpetas"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Estableciendo información de carpeta...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstrucción del árbol de carpetas falló."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1847,21 +2211,21 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1874,21 +2238,21 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1897,34 +2261,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -1985,7 +2349,7 @@ msgstr "%d grupos de noticias recibidos (%s leídos)"
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -2009,159 +2373,6 @@ msgstr "Creando vista de imagen...\n"
 msgid "Can't load the image."
 msgstr "No se puede cargar la imagen."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "La conexión IMAP4 con %s se ha roto. Reconectando...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "El servidor IMAP4 deshabilita LOGIN.\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "creando conexión IMAP4 con %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "No puedo iniciar la sesión TLS.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "no puedo establecer los flags borrados: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "no puedo vaciar\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "no puedo establecer los flags borrados: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "no se puede cerrar la carpeta\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "la carpeta raíz %s no existe\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "hubo un error obteniendo LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "No puedo crear '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "No puedo crear '%s' bajo Entrada\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "no puedo crear el buzón: LIST falló\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "no puedo crear el buzón\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "no puedo renombrar el buzón: %s a %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "no puedo borrar el buzón\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "no se puede obtener la estructura del mensaje\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "Error obteniendo la estructura del mensaje.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "No se puede interpretar la estructura del mensaje: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "No puedo establecer la sesión IMAP4: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "no se puede obtener el espacio de nombres\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "no se puede seleccionar la carpeta: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "La autentificación IMAP falló.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Autentificación IMAP4 fallida.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "no puedo añadir %s a %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(enviando fichero...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "no se puede añadir el mensaje a %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "no puedo copiar %s a %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "error en el mandato imap: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "error en el mandato imap: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "error en el mandato imap: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv no puede convertir UTF-7 a %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv no puede convertir %s a UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importar"
@@ -2259,7 +2470,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2275,143 +2486,143 @@ msgstr "Atributos"
 msgid "Finish"
 msgstr "Finalizar"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servirdor POP3: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2420,28 +2631,28 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2450,11 +2661,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2463,15 +2674,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -2489,29 +2700,20 @@ msgstr "Contraseña"
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"El fichero «%s» ya existe.\n"
-"No puedo crear la carpeta."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de composición"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2521,23 +2723,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2545,23 +2747,23 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "Codificación de los nombres de fichero"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2585,19 +2787,19 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2606,15 +2808,15 @@ msgstr ""
 "Soporte para OpenPGP deshabilitado."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed ejecutándose.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2622,616 +2824,616 @@ msgstr ""
 "Se encontró una versión anterior de la confguración.\n"
 "¿Desea migrarla?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichero/_Carpeta_/_Mover carpeta..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Fichero/_Buzón"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichero/_Buzón/_Añadir buzón..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichero/_Buzón/_Eliminar buzón"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichero/_Buzón/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichero/_Buzón/_Comprobar si hay mensajes nuevos"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fichero/_Buzón/_Comprobar mensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichero/_Buzón/R_econstruir árbol de carpetas"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichero/I_mportar fichero mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichero/_Exportar a un fichero mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichero/_Vaciar todas las papeleras"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en los mensajes..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/Vista de _mensajes"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/Por _número"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/Por _tamaño"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/Por _remitente"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/Por _destinatario"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/Por a_sunto"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/Por _color de la etiqueta"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/Por _marca"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordenar/Por _no leído"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/Por adj_unto"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo s_iguiente"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/Codificación de caract_eres/_Autodetectar"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas las cabeceras"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepción"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaje/Es un correo _basura"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Herramientas/Añadir remitente a la age_nda..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Herramientas/_Filtrar mensajes basura en la carpeta"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Herramientas/_Filtrar mensajes basura en los seleccionados"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nueva cuenta..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar cuenta actual"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando el tipo de separación de ventana de %d a %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3241,16 +3443,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3260,149 +3462,148 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "Basura"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "Es correo basura"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
@@ -3520,32 +3721,32 @@ msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaje...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3554,7 +3755,7 @@ msgstr ""
 "Teclee la orden para imprimir:\n"
 "(«%s» será sustituido por el fichero)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3563,48 +3764,6 @@ msgstr ""
 "La orden de impresión es inválida:\n"
 "«%s»"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "no se puede copiar mensaje %s a %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "No se puede abrir el fichero de marcas.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "carpetas de origen y destino idénticas.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Copiando mensaje %s%c%d a %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Último número en directorio %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"El nombre de directorio\n"
-"«%s» no es una cadena UTF-8 válida.\n"
-"Quizás se este usando la codificación local para el nombre.\n"
-"Si esto es así debería establecer la siguiente variable de entorno\n"
-"(Vea el README para los detalles):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Abrir"
@@ -3688,115 +3847,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La orden del visualizador MIME es inválida: «%s»"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "creando conexión NNTP con %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "La conexión NNTP con %s:%d ha sido rota. Reconectando...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "el artículo %d ya esta en caché.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "obteniendo artículo %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "no puedo leer el artículo %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "no puedo obtener la lista de grupos\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "no se puede enviar el artículo.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "no puedo obtener el artículo %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "no puedo seleccionar grupo: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "rango de artículos no válido: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "no hay artículos nuevos.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "obteniendo xover %d - %d en %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "no se puede obtener xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "hubo un error obteniendo xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "linea xover no válida: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "no se puede obtener xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "hubo un error obteniendo xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "No se puede conectar con el servidor NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "error del protocolo: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "error del protocolo\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Hubo un error mientras se enviaba\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Hubo un error enviando el mandato\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Frase contraseña"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[sin id usuario]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3809,7 +3868,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3817,447 +3876,6 @@ msgstr ""
 "¡Contraseña errónea! Intentelo de nuevo...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "No se encontro en el saludo la marca temporal APOP requerida\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "La marca temporal del saludo tiene un error de sintaxis\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Error del protocolo POP3\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "respuesta UIDL no válida: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Borrando mensaje expirado %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Ignorando mensaje %d (%d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "el buzón está bloqueado\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "tiempo de espera agotado para la sesión\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "no puedo abrir la sesión TLs\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "hubo algún error en la autentificación\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "mandato no soportado\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "hubo algún error en la sesión POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Abriendo ventana de preferencias de cuenta...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Cuenta%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Preferencias para una nueva cuenta"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Preferencias de la cuenta"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Creando ventana de preferencias de cuenta...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Recibir"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privacidad"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avanzadas"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Nombre de esta cuenta"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Cuenta por defecto"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Información personal"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Nombre completo"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Dirección de correo"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organización"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Información del servidor"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Noticias (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Ninguna (local)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Este servidor requiere autentificación"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Servidor de news"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Servidor de recepción"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Servidor SMTP (enviar)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Usuario"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Contraseña"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Usar autentificación segura (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Eliminar los mensajes del servidor al recibir"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Eliminar después de"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "días"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 días: eliminar inmediatamente)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Descargar todos los mensajes del servidor"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Tamaño límite para recibir"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "Kb"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrar mensajes al recibir"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Buzón por defecto"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "Los mensajes sin filtrar se guardarán en esta carpeta."
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Método de autentificación"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automática"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Noticias"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "Número máximo de artículos a descargar"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "Sin límite si se especifica 0."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Traer todo' comprueba si hay mensajes nuevos en esta cuenta"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Cabecera"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Añadir campo Fecha"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generar ID-Mensaje"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Añadir cabecera de usuario"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Editar... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autentificación"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Autentificación SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Si deja estos campos vacíos, se utilizará el mismo ID de usuario y "
-"contraseña usados para la recepción."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autentificación con POP3 antes de enviar"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Salida de la orden"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Establecer las siguientes direcciones automáticamente"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Firmar el mensaje por defecto"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Encriptar el mensaje por defecto"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "Encriptar al responder a un mensaje cifrado"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Usar formato ASCII blindado para encriptación"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Usar firma de texto claro"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Firmar clave"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Usar clave GnuPG por defecto"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Seleccionar clave por dirección de correo"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Especificar clave manualmente"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Usuario o ID clave:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "No usar SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Usar SSL para la conexión POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Usar el mandato STARTTLS para abrir la sesión SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Usar SSL para la conexión IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Usar SSL para la conexión NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Enviar (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Usar SSL para la conexión SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Utilizar SSL no bloqueante"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "Deshabilítelo si tiene problemas con la conexión SSL."
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Puerto SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Puerto POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Puerto IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Puerto NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Nombre del dominio"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Directorio del servidor IMAP4"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Poner mensajes enviados en"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Poner borradores de mensajes en"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Poner mensajes borrados en"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "No se especificó el nombre de cuenta."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "No se especificó la dirección de correo."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "No se especificó el servidor SMTP."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "No se especificó el usuario."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "No se especificó el servidor POP3."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "No se especificó el servidor IMAP4."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "No se especificó el servidor NNTP."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"No se recomienda usar el estilo antiguo de blindaje de\n"
-"ASCII plano para mensajes encriptados. No cumple con el\n"
-"RFC 3156 - Seguridad MIME con OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Configuración de acciones"
@@ -4322,17 +3940,17 @@ msgstr " Ayuda sintaxis "
 msgid "Registered actions"
 msgstr "Acciones registradas"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Arriba"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Abajo"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nueva)"
 
@@ -4375,818 +3993,31 @@ msgstr "Borrar acción"
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "Filtro de correo basura"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Creando ventana de preferencias comunes...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Preferencias comunes"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citar"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Ver"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Mensaje"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Correo basura"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Otras"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Usar un programa externo para incorporar"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Orden"
-
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "Incorporar del almacén local"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrar al incorporar"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Ruta al almacén"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Comprobar correo nuevo"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "cada"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Comprueba correo nuevo al inicio"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Actualizar todos las carpetas locales después de incorporar"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr "Ejecutar orden cuando lleguen nuevos mensajes"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "`%d' será reemplazado con el número de nuevos mensajes."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Usar programa externo para enviar"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Guardar mensajes enviados en Salida"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "Aplicar las reglas de filtrado a los mensajes enviados"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Codificación para enviar"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automático (Recomendado)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "ASCII de 7 bits (US-ASC_II)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Europeo Occidental (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Europeo Occidental (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Centroeuropeo (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Báltico (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Báltico (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Griego (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Hebreo (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebreo (Windows-1255)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turco (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirílico (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirílico (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cirílico (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirílico (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonés (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonés (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonés (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Chino simplificado (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Chino simplificado (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Chino tradicional (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Chino tradicional (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chino (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tailandés (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tailandés (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Si se selecciona `Automático' se utilizará la codificación óptima para la "
-"localización actual."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Codificación de transferencia"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Especificar la codificación de transferencia (Content-Transfer-Encoding) "
-"cuando el cuerpo del mensaje contiene caracteres no-ASCII."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Separador de firma"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Insertar automáticamente"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Lanzar el editor externo automáticamente"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Niveles de deshacer"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Recortar mensajes a los"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "caracteres"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Recortar citación"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Recortar al escribir"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Recortar antes de enviar"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Seleccionar automáticamente la cuenta para responder"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citar el mensaje al responder"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "El botón Responder invoca responder a la lista de correo"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Formato de réplica"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Marca de citación"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Formato de reenvio"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Descripción de símbolos "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Fuente"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Traducir cabeceras (como `Desde:', `Asunto:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Ver el número de no leídos junto al nombre de la carpeta"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Abreviar nombres de grupos con más de"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "letras"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Vista resumen"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Ver destinatario en la columna `Desde' si el remitente es usted mismo"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Expandir hilos"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Formato de fecha"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Elementos visibles en cabecera... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Permitir colores en el mensaje"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Mostrar alfabéticos y numéricos multi-byte como\n"
-"caracteres ASCII (sólo para Japonés)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Mostrar panel de cabeceras sobre el mensaje"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Cabeceras breves en la vista del mensaje"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "Mostrar los mensajes HTML como texto"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Mostrar el cursor en la vista del mensaje"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Interlineado"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(s)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Desplazamiento"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Media página"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Desplazamiento suave"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Paso"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "Imágenes"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Redimensionar las imágenes adjuntas para adecuarlas a la ventana"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Mostrar las imágenes en el texto"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "Activar el control del correo basura"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "Orden para aprender:"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "No basura"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "Orden de clasificación"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "Carpeta basura"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr "Los mensajes que se marquen como basura se moverán a esta carpeta."
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrar mensajes clasificados como basura al recibir"
-
-#: src/prefs_common.c:2051
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"Los mensajes filtrados se moverán a la carpeta basura y borrados del "
-"servidor."
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Comprobar las firmas automáticamente"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Mostrar diálogo de comprobación de firma"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Mantener contraseña en memoria temporalmente"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Expirar después de"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minuto(s) "
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "Poniendo '0' mantendrá la contraseña durante toda la sesión."
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Capturar la entrada mientras se introducen contraseñas"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Abrir entrada despues de recibir correo nuevo"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr "Los mensajes se marcarán hasta la ejecución si está desactivado."
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Diálogo de recepción"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Mostrar diálogo de recepción"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Siempre"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Sólo al recibir manualmente"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nunca"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "No mostrar diálogo de error si hay errores de recepción"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Mostrar diálogo de recepción al finalizar"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "Ordena los botones según la Guía de Interfaz de Usuario de GNOME"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Establecer atajos de teclado... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Órdenes externas (%s se sustituirá con el nombre de fichero / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Navegador web"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Añadir dirección al destino con doble click"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Al salir"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Confirmar al salir"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Vaciar papelera al salir"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Preguntar antes de vaciar"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Avisar si existen mensajes en cola"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Activar la comprobación estricta de la integridad de la caché resumen"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-"Active esto si hay posibilidad de que los contenidos de las carpetas sean "
-"modificados por otras aplicaciones.\n"
-"Esta opción degradará el rendimiento al mostrar el resumen."
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Tiempo de espera agotado E/S socket:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "segundo(s)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "el dia de la semana abreviado"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "el dia de la semana completo"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "el nombre del mes abreviado"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "el nombre del mes completo"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "la fecha y hora preferida para la localización actual"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "el número de siglo (año/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "el dia del mes como número decimal"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "la hora como número usando el reloj de 24 horas"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "la hora como número usando el reloj de 12 horas"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "el dia del año como número decimal"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "el mes como número decimal"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "el minuto como número decimal"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM o PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "el segundo como número decimal"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "el dia de la semana como número decimal"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "la fecha preferida para la localización actual"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "los dos últimos dígitos del año"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "el año como número decimal"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "zona horaria o nombre o abreviatura"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Especificador"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Descripción"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Ejemplo"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Colores del mensaje"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Colores"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Texto citado - Primer nivel"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Texto citado - Segundo nivel"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Texto citado - Tercer nivel"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Enlace URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Reutilizar colores de citación"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Elejir color para el nivel de citado 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Elejir color para el nivel de citado 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Elejir color para el nivel de citado 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Elejir color para URIs"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Descripción de símbolos"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Fecha\n"
-"Desde\n"
-"Nombre completo del remitente\n"
-"Nombre del remitente\n"
-"Inicial del remitente\n"
-"Asunto\n"
-"Para\n"
-"Cc\n"
-"Grupos de noticias\n"
-"ID-Mensaje"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Si x está, muestra expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Cuerpo del mensaje\n"
-"Cuerpo del mensaje citado\n"
-"Cuerpo del mensaje sin firma\n"
-"Cuerpo del mensaje citado sin firma\n"
-"El carácter %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Carácter barra invertida\n"
-"Carácter de interrogación\n"
-"Carácter llave abierta\n"
-"Carácter llave cerrada"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Atajos de teclado"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Selecciona el conjunto de atajos de teclado.\n"
-"Se pueden modificar también los atajos de los menús pulsando\n"
-"cualquier tecla(s) al situar el ratón sobre el elemento del menú."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Por defecto"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Antiguos de Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Configuración de cabeceras de usuario"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Cabecera"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Borrar "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Cabeceras de usuario"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Borrar cabecera"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "¿Quiere borrar realmente esta cabecera?"
 
@@ -5234,12 +4065,20 @@ msgstr "Preferencias de filtrado"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Editar"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "¿Está seguro de que quiere borrar la regla «%s»?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(Sin título)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Borrar regla"
 
@@ -5323,6 +4162,10 @@ msgstr "es más largo que"
 msgid "is shorter than"
 msgstr "es más corto que"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "Kb"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Mover a"
@@ -5444,6 +4287,10 @@ msgstr "Borrar [...] o (...) al inicio del asunto al responder"
 msgid "Apply to subfolders"
 msgstr "Aplicar en subcarpetas"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Establecer las siguientes direcciones automáticamente"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "utilizar también al responder"
@@ -5517,64 +4364,46 @@ msgstr "Elementos visibles"
 msgid " Revert to default "
 msgstr " Valores por defecto "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Nombre de plantilla"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registrar"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Sustituir "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Plantillas registradas"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Error de formato en la plantilla."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "no se puede abrir el fichero de marcas\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "no se puede obtener el mensaje %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "La orden para imprimir es inválida: «%s»\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Creando diálogo de progreso...\n"
@@ -5583,29 +4412,21 @@ msgstr "Creando diálogo de progreso...\n"
 msgid "Status"
 msgstr "Estado"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "hubo un error mientras se obtenian datos.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "No se puede escribir al fichero.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "No encuentro ID de usuario para esta clave."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\talias «%s»\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Firma hecha en %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Error al verificar la firma"
 
@@ -5631,6 +4452,10 @@ msgstr "ID tecla"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Otras"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Añadir clave"
@@ -5655,84 +4480,84 @@ msgstr ""
 "si llegará a la persona a la que lo quiere enviar.\n"
 "¿Es suficientemente fiable para usarla de todas maneras?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Cabecera corrupta en el mensaje en cola.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaje usando la orden: %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "No se puede ejecutar la orden: %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Hubo un error ejecutando la orden: %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con el servidor SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Autentificando"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Hubo un error enviando el mensaje."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5832,32 +4657,20 @@ msgstr "Firma INVÁLIDA"
 msgid "No public key to verify the signature"
 msgstr "No hay clave pública para verificar la firma"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH no está disponible\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "respuesta SMTP errónea\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "hubo algún error en la sesión SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Creando ventana de fuente...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Fuente del mensaje"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Mostrando la fuente de %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Fuente"
@@ -6246,6 +5059,930 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Hay ventanas de composición abiertas.\n"
+#~ "Cierre todas las ventanas de composición antes de editar las cuentas."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Abriendo ventana de edición de cuenta...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Creando ventana de edición de cuenta...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Editar cuentas"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "El orden de comprobación de mensajes será éste. Marque las casillas\n"
+#~ "en la columna `G' para habilitar la descarga mediante `Traer todo'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protocolo"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid " _Set as default account "
+#~ msgstr "_Establecer como cuenta primaria "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "¿Esta seguro de que quiere borrar la cuenta «%s»?"
+
+#~ msgid "Delete account"
+#~ msgstr "Borrar cuenta"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Abriendo ventana de preferencias de cuenta...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Cuenta%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Preferencias para una nueva cuenta"
+
+#~ msgid "Account preferences"
+#~ msgstr "Preferencias de la cuenta"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Creando ventana de preferencias de cuenta...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Recibir"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacidad"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzadas"
+
+#~ msgid "Name of this account"
+#~ msgstr "Nombre de esta cuenta"
+
+#~ msgid "Set as default"
+#~ msgstr "Cuenta por defecto"
+
+#~ msgid "Personal information"
+#~ msgstr "Información personal"
+
+#~ msgid "Full name"
+#~ msgstr "Nombre completo"
+
+#~ msgid "Mail address"
+#~ msgstr "Dirección de correo"
+
+#~ msgid "Organization"
+#~ msgstr "Organización"
+
+#~ msgid "Server information"
+#~ msgstr "Información del servidor"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Noticias (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Ninguna (local)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Este servidor requiere autentificación"
+
+#~ msgid "News server"
+#~ msgstr "Servidor de news"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Servidor de recepción"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Servidor SMTP (enviar)"
+
+#~ msgid "User ID"
+#~ msgstr "Usuario"
+
+#~ msgid "Password"
+#~ msgstr "Contraseña"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Usar autentificación segura (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Eliminar los mensajes del servidor al recibir"
+
+#~ msgid "Remove after"
+#~ msgstr "Eliminar después de"
+
+#~ msgid "days"
+#~ msgstr "días"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 días: eliminar inmediatamente)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Descargar todos los mensajes del servidor"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Tamaño límite para recibir"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrar mensajes al recibir"
+
+#~ msgid "Default inbox"
+#~ msgstr "Buzón por defecto"
+
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "Los mensajes sin filtrar se guardarán en esta carpeta."
+
+#~ msgid "Authentication method"
+#~ msgstr "Método de autentificación"
+
+#~ msgid "Automatic"
+#~ msgstr "Automática"
+
+#~ msgid "News"
+#~ msgstr "Noticias"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "Número máximo de artículos a descargar"
+
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Sin límite si se especifica 0."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Traer todo' comprueba si hay mensajes nuevos en esta cuenta"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Añadir campo Fecha"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generar ID-Mensaje"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Añadir cabecera de usuario"
+
+#~ msgid " Edit... "
+#~ msgstr " Editar... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autentificación"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Autentificación SMTP (SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Si deja estos campos vacíos, se utilizará el mismo ID de usuario y "
+#~ "contraseña usados para la recepción."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autentificación con POP3 antes de enviar"
+
+#~ msgid "Command output"
+#~ msgstr "Salida de la orden"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Responder a"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Firmar el mensaje por defecto"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Encriptar el mensaje por defecto"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "Encriptar al responder a un mensaje cifrado"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Usar formato ASCII blindado para encriptación"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Usar firma de texto claro"
+
+#~ msgid "Sign key"
+#~ msgstr "Firmar clave"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Usar clave GnuPG por defecto"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Seleccionar clave por dirección de correo"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Especificar clave manualmente"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Usuario o ID clave:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "No usar SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Usar SSL para la conexión POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Usar el mandato STARTTLS para abrir la sesión SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Usar SSL para la conexión IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Usar SSL para la conexión NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Enviar (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Usar SSL para la conexión SMTP"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Utilizar SSL no bloqueante"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "Deshabilítelo si tiene problemas con la conexión SSL."
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Puerto SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Puerto POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Puerto IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Puerto NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Nombre del dominio"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Directorio del servidor IMAP4"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Poner mensajes enviados en"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Poner borradores de mensajes en"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Poner mensajes borrados en"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "No se especificó el nombre de cuenta."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "No se especificó la dirección de correo."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "No se especificó el servidor SMTP."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "No se especificó el usuario."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "No se especificó el servidor POP3."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "No se especificó el servidor IMAP4."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "No se especificó el servidor NNTP."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "No se recomienda usar el estilo antiguo de blindaje de\n"
+#~ "ASCII plano para mensajes encriptados. No cumple con el\n"
+#~ "RFC 3156 - Seguridad MIME con OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Creando ventana de preferencias comunes...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Preferencias comunes"
+
+#~ msgid "Quote"
+#~ msgstr "Citar"
+
+#~ msgid "Display"
+#~ msgstr "Ver"
+
+#~ msgid "Message"
+#~ msgstr "Mensaje"
+
+#~ msgid "Junk mail"
+#~ msgstr "Correo basura"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Usar un programa externo para incorporar"
+
+#~ msgid "Command"
+#~ msgstr "Orden"
+
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Incorporar del almacén local"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrar al incorporar"
+
+#~ msgid "Spool path"
+#~ msgstr "Ruta al almacén"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Comprobar correo nuevo"
+
+#~ msgid "every"
+#~ msgstr "cada"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto(s)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Comprueba correo nuevo al inicio"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Actualizar todos las carpetas locales después de incorporar"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Ejecutar orden cuando lleguen nuevos mensajes"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "`%d' será reemplazado con el número de nuevos mensajes."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Usar programa externo para enviar"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Guardar mensajes enviados en Salida"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "Aplicar las reglas de filtrado a los mensajes enviados"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Codificación para enviar"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automático (Recomendado)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "ASCII de 7 bits (US-ASC_II)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Europeo Occidental (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Europeo Occidental (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Centroeuropeo (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Báltico (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Báltico (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Griego (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Hebreo (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Hebreo (Windows-1255)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turco (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cirílico (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cirílico (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cirílico (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cirílico (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonés (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonés (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonés (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Chino simplificado (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Chino simplificado (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Chino tradicional (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Chino tradicional (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chino (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Coreano (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tailandés (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tailandés (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Si se selecciona `Automático' se utilizará la codificación óptima para la "
+#~ "localización actual."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Codificación de transferencia"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Especificar la codificación de transferencia (Content-Transfer-Encoding) "
+#~ "cuando el cuerpo del mensaje contiene caracteres no-ASCII."
+
+#~ msgid "Signature separator"
+#~ msgstr "Separador de firma"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Insertar automáticamente"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Lanzar el editor externo automáticamente"
+
+#~ msgid "Undo level"
+#~ msgstr "Niveles de deshacer"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Recortar mensajes a los"
+
+#~ msgid "characters"
+#~ msgstr "caracteres"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Recortar citación"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Recortar al escribir"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Recortar antes de enviar"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Seleccionar automáticamente la cuenta para responder"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citar el mensaje al responder"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "El botón Responder invoca responder a la lista de correo"
+
+#~ msgid "Reply format"
+#~ msgstr "Formato de réplica"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Marca de citación"
+
+#~ msgid "Forward format"
+#~ msgstr "Formato de reenvio"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Descripción de símbolos "
+
+#~ msgid "Font"
+#~ msgstr "Fuente"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Traducir cabeceras (como `Desde:', `Asunto:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Ver el número de no leídos junto al nombre de la carpeta"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Abreviar nombres de grupos con más de"
+
+#~ msgid "letters"
+#~ msgstr "letras"
+
+#~ msgid "Summary View"
+#~ msgstr "Vista resumen"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr ""
+#~ "Ver destinatario en la columna `Desde' si el remitente es usted mismo"
+
+#~ msgid "Expand threads"
+#~ msgstr "Expandir hilos"
+
+#~ msgid "Date format"
+#~ msgstr "Formato de fecha"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Elementos visibles en cabecera... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Permitir colores en el mensaje"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Mostrar alfabéticos y numéricos multi-byte como\n"
+#~ "caracteres ASCII (sólo para Japonés)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Mostrar panel de cabeceras sobre el mensaje"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Cabeceras breves en la vista del mensaje"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "Mostrar los mensajes HTML como texto"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Mostrar el cursor en la vista del mensaje"
+
+#~ msgid "Line space"
+#~ msgstr "Interlineado"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(s)"
+
+#~ msgid "Scroll"
+#~ msgstr "Desplazamiento"
+
+#~ msgid "Half page"
+#~ msgstr "Media página"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Desplazamiento suave"
+
+#~ msgid "Step"
+#~ msgstr "Paso"
+
+#~ msgid "Images"
+#~ msgstr "Imágenes"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Redimensionar las imágenes adjuntas para adecuarlas a la ventana"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Mostrar las imágenes en el texto"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "Activar el control del correo basura"
+
+#~ msgid "Learning command:"
+#~ msgstr "Orden para aprender:"
+
+#~ msgid "Not Junk"
+#~ msgstr "No basura"
+
+#~ msgid "Classifying command"
+#~ msgstr "Orden de clasificación"
+
+#~ msgid "Junk folder"
+#~ msgstr "Carpeta basura"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr "Los mensajes que se marquen como basura se moverán a esta carpeta."
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrar mensajes clasificados como basura al recibir"
+
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "Los mensajes filtrados se moverán a la carpeta basura y borrados del "
+#~ "servidor."
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Comprobar las firmas automáticamente"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Mostrar diálogo de comprobación de firma"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Mantener contraseña en memoria temporalmente"
+
+#~ msgid "Expired after"
+#~ msgstr "Expirar después de"
+
+#~ msgid "minute(s) "
+#~ msgstr "minuto(s) "
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "Poniendo '0' mantendrá la contraseña durante toda la sesión."
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Capturar la entrada mientras se introducen contraseñas"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Abrir entrada despues de recibir correo nuevo"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr "Los mensajes se marcarán hasta la ejecución si está desactivado."
+
+#~ msgid "Receive dialog"
+#~ msgstr "Diálogo de recepción"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Mostrar diálogo de recepción"
+
+#~ msgid "Always"
+#~ msgstr "Siempre"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Sólo al recibir manualmente"
+
+#~ msgid "Never"
+#~ msgstr "Nunca"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "No mostrar diálogo de error si hay errores de recepción"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Mostrar diálogo de recepción al finalizar"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "Ordena los botones según la Guía de Interfaz de Usuario de GNOME"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Establecer atajos de teclado... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Órdenes externas (%s se sustituirá con el nombre de fichero / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Navegador web"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Añadir dirección al destino con doble click"
+
+#~ msgid "On exit"
+#~ msgstr "Al salir"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Confirmar al salir"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Vaciar papelera al salir"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Preguntar antes de vaciar"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Avisar si existen mensajes en cola"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr ""
+#~ "Activar la comprobación estricta de la integridad de la caché resumen"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Active esto si hay posibilidad de que los contenidos de las carpetas sean "
+#~ "modificados por otras aplicaciones.\n"
+#~ "Esta opción degradará el rendimiento al mostrar el resumen."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Tiempo de espera agotado E/S socket:"
+
+#~ msgid "second(s)"
+#~ msgstr "segundo(s)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "el dia de la semana abreviado"
+
+#~ msgid "the full weekday name"
+#~ msgstr "el dia de la semana completo"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "el nombre del mes abreviado"
+
+#~ msgid "the full month name"
+#~ msgstr "el nombre del mes completo"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "la fecha y hora preferida para la localización actual"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "el número de siglo (año/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "el dia del mes como número decimal"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "la hora como número usando el reloj de 24 horas"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "la hora como número usando el reloj de 12 horas"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "el dia del año como número decimal"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "el mes como número decimal"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "el minuto como número decimal"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM o PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "el segundo como número decimal"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "el dia de la semana como número decimal"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "la fecha preferida para la localización actual"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "los dos últimos dígitos del año"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "el año como número decimal"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "zona horaria o nombre o abreviatura"
+
+#~ msgid "Specifier"
+#~ msgstr "Especificador"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
+#~ msgid "Example"
+#~ msgstr "Ejemplo"
+
+#~ msgid "Set message colors"
+#~ msgstr "Colores del mensaje"
+
+#~ msgid "Colors"
+#~ msgstr "Colores"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Texto citado - Primer nivel"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Texto citado - Segundo nivel"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Texto citado - Tercer nivel"
+
+#~ msgid "URI link"
+#~ msgstr "Enlace URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Reutilizar colores de citación"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Elejir color para el nivel de citado 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Elejir color para el nivel de citado 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Elejir color para el nivel de citado 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Elejir color para URIs"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Descripción de símbolos"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Fecha\n"
+#~ "Desde\n"
+#~ "Nombre completo del remitente\n"
+#~ "Nombre del remitente\n"
+#~ "Inicial del remitente\n"
+#~ "Asunto\n"
+#~ "Para\n"
+#~ "Cc\n"
+#~ "Grupos de noticias\n"
+#~ "ID-Mensaje"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Si x está, muestra expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Cuerpo del mensaje\n"
+#~ "Cuerpo del mensaje citado\n"
+#~ "Cuerpo del mensaje sin firma\n"
+#~ "Cuerpo del mensaje citado sin firma\n"
+#~ "El carácter %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Carácter barra invertida\n"
+#~ "Carácter de interrogación\n"
+#~ "Carácter llave abierta\n"
+#~ "Carácter llave cerrada"
+
+#~ msgid "Key bindings"
+#~ msgstr "Atajos de teclado"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Selecciona el conjunto de atajos de teclado.\n"
+#~ "Se pueden modificar también los atajos de los menús pulsando\n"
+#~ "cualquier tecla(s) al situar el ratón sobre el elemento del menú."
+
+#~ msgid "Default"
+#~ msgstr "Por defecto"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Antiguos de Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Selección de tipografía"
 
diff --git a/po/et.po b/po/et.po
index c50f2774..ab1d6b62 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,404 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Loen kõigi kontode seaded...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Häälestuse salvestamine ebaõnnestus\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 ühendus %s:%d-ga katkes. Taasühendan...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP serveri kataloog"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "loon IMAP4 ühendust %s:%d-ga ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Ei suuda avada TLS sessiooni.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Saadan kirja (%d / %d baiti)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Võtan kirju %s-st ja panen %s-i...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "ei suutnud seada kustutatu lippu: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "ei suuda väljastada\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Võtan kirju %s-st ja panen %s-i...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "ei suuuda valida kausta: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "*Märgi faili ei leidunud.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "Nimistu saamisel tekkis viga.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Ei suuda luua '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Ei suuda luua '%s' Sisendkasti all\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "ei suuda luua kirjakasti\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "ei suuda kirjakasti %s-lt ümber nimetada %s-le\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "ei suuda kustutada kirjakasti\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "ei suuda võtta ümbrikut\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Saadan kirja (%d / %d baiti)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "ümbriku võtmisel tekis viga.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "ei suutnud avada ümbrikut: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "ei suutnud leida nime asukohta\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "ei suuuda valida kausta: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Autoriseerimise meetod"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "ei suuda %s-d lisada %s-i\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(saadan faili...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "ei suuda lisada kirja %s\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "ei suuda %d-d kopeerida %s-i\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "imapi käsu täitmisel tekkis viga: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "ei saa kirja kopeerida %s-st %s-i\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Ei suutnud avada märgi faili.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "lähtekaust on identne sihtkaustale.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Viimane number kataloogis %s on %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Fail %s on juba olemas.\n"
+"Ei saa kausta luua."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "loon NNTP ühendust %s:%d-ga ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP ühendus %s:%d-ga on katkestatud. Taasühendan...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "artikkel %d on juba hoidlas.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "võtan artikli %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "ei saanud artiklit %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "ei saanud uudistegrupi nimekirja\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "ei saanud saata artiklit.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "ei saanud artiklit %d kohale\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "ei saa valida gruppi %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "ebasobiv artiklite vahemik: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "uusi artikelid pole.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "*võtan xover-i %d - %d %s-is\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "*ei saa xover'it\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "*xover'i võtmisel tekkis viga\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "*vigane xover rida: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "*ei saa xhdr-i\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "xhdr-i võtmise käigus tekkis viga.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Ei saanud NNTP serveriga %s:%d ühendust\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protokolli viga: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protokolli viga\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Kirja saatmisel tekkis viga\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Tekkis viga kirja protsessimisel."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Nõutud APOP'i ajatemplit ei leidunud tervituses\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "*Tervituses on ajamärgi süntaksi viga\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 protokolli viga\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "*vigane xover rida: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Kustutan aegunud kirja %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Jätan kirja (%d / %d baiti) vahele\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "kirjakast on lukus\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "ei suutnud käivitada TLS sessiooni\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "autoriseerimisel tekkis viga\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Käsklus"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "autoriseerimisel tekkis viga\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +421,54 @@ msgstr "Leiti %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Häälestus on salvestatud.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Kaust"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "Ei suuda avada märgifaili\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "ei suuda võtta kirja %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Ei saa tekstiosa kätte\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Trükkimise käsurida on vale: %s\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "tekkis viga andmete võtmisel.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Ei saa kirjutada faili.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH pole saadav\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "autoriseerimisel tekkis viga\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 pole kättesaadav\n"
@@ -161,78 +600,6 @@ msgstr ""
 "programmiga; kui ei, siis kirjuta: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Loen kõigi kontode seaded...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Mõned kirjutusaknad on avatud.\n"
-"Palun sulge kõik kirjutusaknad enne kontode redigeerimist."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Avan kontode redigeerimisakna...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Loon kontode redigeerimisakna...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Kontode redigeerimine"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"*Uusi teateid võetakse selles järjekorras. Märgi kastikesed\n"
-"'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nimi"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Redigeeri"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Määra vaikimisi kontoks "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Kas te tõesti soovite kustutada kontot?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Tiitlita"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Kustuta konto"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -330,6 +697,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nimi"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -344,8 +719,8 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fail"
 
@@ -366,9 +741,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fail/Uus _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
@@ -384,7 +759,7 @@ msgstr "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
@@ -416,8 +791,8 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
@@ -425,13 +800,13 @@ msgstr "/_Tööriist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
@@ -448,17 +823,17 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
@@ -470,7 +845,7 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -480,14 +855,14 @@ msgstr "Nimi:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Kustuta"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -498,11 +873,11 @@ msgid "Lookup"
 msgstr "Otsi"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Koopia:"
 
@@ -528,7 +903,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -641,7 +1016,7 @@ msgstr "Aadressiraamatu uuendamise viga"
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Kasutajaliides"
 
@@ -661,8 +1036,7 @@ msgstr "EPosti Aadress"
 msgid "Group"
 msgstr "Grupp"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Kaust"
 
@@ -686,15 +1060,15 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Märkus"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Viga"
 
@@ -749,8 +1123,8 @@ msgstr "/Lis_a..."
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
@@ -795,8 +1169,8 @@ msgstr "/R_edigeeri/_Tühista"
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
@@ -804,7 +1178,7 @@ msgstr "/R-edaktor/---"
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
@@ -816,7 +1190,7 @@ msgstr "/R_edaktor/_Aseta"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
@@ -833,7 +1207,7 @@ msgstr "/R_edaktor/Ää_rista kõik pikad read"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vaade"
@@ -855,9 +1229,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
@@ -873,7 +1247,7 @@ msgstr "/_Vaade/Joonla_ud"
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
@@ -885,127 +1259,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
@@ -1013,14 +1387,14 @@ msgstr "/_Tööriist/_Aadressiraamat"
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
@@ -1044,10 +1418,6 @@ msgstr "/_Kiri/Krüpteeri"
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Ei saa tekstiosa kätte\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
@@ -1124,7 +1494,7 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
@@ -1216,8 +1586,7 @@ msgstr "MIME tüüp"
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Saada"
 
@@ -1257,8 +1626,7 @@ msgstr "Manusta"
 msgid "Attach file"
 msgstr "Manusta fail"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Allkiri"
 
@@ -1266,7 +1634,7 @@ msgstr "Allkiri"
 msgid "Insert signature"
 msgstr "Lisa allkiri"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Redaktor"
 
@@ -1464,7 +1832,7 @@ msgstr "Muuda"
 msgid "Clear"
 msgstr "Kustuta"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Väärtus"
 
@@ -1497,7 +1865,6 @@ msgid " Check File "
 msgstr " Kontrolli faili "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Fail"
 
@@ -1553,12 +1920,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -1575,7 +1942,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1639,7 +2006,7 @@ msgstr "Ajalimiit (sek)"
 msgid "Maximum Entries"
 msgstr "Sissekannete piirarv"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Baas"
 
@@ -1696,7 +2063,6 @@ msgid "Exporting file:"
 msgstr "Väljastatav fail:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Vali... "
 
@@ -1720,167 +2086,167 @@ msgstr "Kirjutame olemasoleva faili üle?"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Loo uus kaust..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Kustuta kaust"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Otsi kirju..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Telli uudi_stegrupp..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Eemalda uudisteg_rupp"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1890,21 +2256,21 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1915,21 +2281,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1938,34 +2304,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2026,7 +2392,7 @@ msgstr "saadi %d uudistegruppi (%s loetud)"
 msgid "Newsgroups:"
 msgstr "Uudistegrupid:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Pealkiri:"
 
@@ -2050,165 +2416,6 @@ msgstr "Loon pildi vaadet...\n"
 msgid "Can't load the image."
 msgstr "Ei suuda lugeda pilti."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 ühendus %s:%d-ga katkes. Taasühendan...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP serveri kataloog"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "loon IMAP4 ühendust %s:%d-ga ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Ei suuda avada TLS sessiooni.\n"
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "ei suutnud seada kustutatu lippu: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "ei suuda väljastada\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "ei suuuda valida kausta: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "*Märgi faili ei leidunud.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "Nimistu saamisel tekkis viga.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Ei suuda luua '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Ei suuda luua '%s' Sisendkasti all\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "ei suuda luua kirjakasti\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "ei suuda kirjakasti %s-lt ümber nimetada %s-le\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "ei suuda kustutada kirjakasti\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "ei suuda võtta ümbrikut\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "ümbriku võtmisel tekis viga.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "ei suutnud avada ümbrikut: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "ei suutnud leida nime asukohta\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "ei suuuda valida kausta: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Autoriseerimise meetod"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "ei suuda %s-d lisada %s-i\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(saadan faili...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "ei suuda lisada kirja %s\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "ei suuda %d-d kopeerida %s-i\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "imapi käsu täitmisel tekkis viga: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Impordi"
@@ -2306,7 +2513,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2322,202 +2529,202 @@ msgstr "Atribuudid"
 msgid "Finish"
 msgstr "Soome"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Vana Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Võtan uusi kirju"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Valmis (uusi kirju pole)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -2535,29 +2742,20 @@ msgstr "Sisesta parool"
 msgid "Protocol log"
 msgstr "Protokolli sündmustik"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Fail %s on juba olemas.\n"
-"Ei saa kausta luua."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread ei ole glib poolt toetatud.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [aadress]    ava kirjakirjutamise aken"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2567,48 +2765,48 @@ msgstr ""
 "                          ava uue kirja aken nii, et märgitud failid\n"
 "                          on manustatud kirjale"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              võta uued kirjad"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          võta uued kirjad kõigilt konto"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --saada              saada kõik järjekorras olevad kirjad"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näita seda teadet ja välju"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              näita versiooni informatsiooni ja välju"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2622,19 +2820,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Kirjakirjutamine on pooleli. Tõesti lõpetame?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "kirjad järjekorras"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2643,662 +2841,662 @@ msgstr ""
 "OpenPGP toetus keelustatud."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fail/_Kaust/_Loo uus kaust..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fail/_Kaust/_Kustuta kaust"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ee_malda kirjakst"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fail/_Vaata uusi kirju kõigis kaustades"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fail/_Impordi kirjakasti fail..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fail/_Ekspordi kirjakasti faili..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fail/_Tühjenda prügikast"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fail/_Trüki..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fail/L_isa fail"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Fail/_Välju"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/R_edaktor/Märgi _teema"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redaktor/_Leia käesolevast kirjast..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redaktor/_Otsi kirju..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Vaade/Näita või varja"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vaade/Näita või varja/Kausta_puud"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vaade/Näita või varja/Kirja_vaadet"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vaadde/Näita või varja/_Nupuribal"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/Pilti _ja teksti"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Teksti"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Mitte midagi"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vaade/_Sorteeri/_numbri järgi"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vaade/_Sorteeri/_pealkirja järgi"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vaade/_Sorteeri/v_ärvi järgi"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vaade/_Sorteeri/_märgi järgi"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vaade/_Sorteeri/m_itteloetute järgi"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vaade/_Sorteeri/kirja_lisade järgi"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vaade/_Sorteeri/Ära sorteeri"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Vaade/_Sorteeri/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/Vaade/_Sorteeri/Kasvavas järjekorras"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vaade/_Sorteeri/*'_Attract' subjekti järgi"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Vaade/Teema_vaade"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vaade/Paisuta kõik teemad"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vaade/Sulge kõik teemad"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Vaade/Mää_ra näidatavad parameetrid"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Vaade/_Ava"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vaade/_Ava/Eelmine kiri"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vaade/_Ava/Järgmine kiri"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Vaade/_Ava/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vaade/_Ava/_Eelmine mitteloetud kiri"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vaade/_Ava/_Järgmine mitteloetud kiri"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vaade/Mine/Eelmisele uuele kirjale"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vaade/Mine/Järgmisele uuele kirjale"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vaade/_Ava/Eelmine _märgitud kiri"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vaade/_Ava/Järgmine m_ärgitud kiri"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vaade/_Ava/Eelmine _sildiga kiri"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Vaade/Näita ko_gu päist"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Tööriist/Käivita"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Muudan akna eraldamise tüüpi %d-lt %d-le\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3307,16 +3505,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3325,153 +3523,152 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
@@ -3589,32 +3786,32 @@ msgstr "Jõudsin kirja lõppu; kas alustan algusest?"
 msgid "Search finished"
 msgstr "Otsimine lõpetatud"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Loon kirja vaate...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Manused"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3623,7 +3820,7 @@ msgstr ""
 "Sisesta trükkimise käsurida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3632,41 +3829,6 @@ msgstr ""
 "Trükkimise käsurida pole õige:\n"
 "%s"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "ei saa kirja kopeerida %s-st %s-i\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Ei suutnud avada märgi faili.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "lähtekaust on identne sihtkaustale.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Viimane number kataloogis %s on %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/Ava"
@@ -3753,116 +3915,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME vaataja käsurida pole õige: %s"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "loon NNTP ühendust %s:%d-ga ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP ühendus %s:%d-ga on katkestatud. Taasühendan...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "artikkel %d on juba hoidlas.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "võtan artikli %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "ei saanud artiklit %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "ei saanud uudistegrupi nimekirja\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "ei saanud saata artiklit.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "ei saanud artiklit %d kohale\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "ei saa valida gruppi %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "ebasobiv artiklite vahemik: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "uusi artikelid pole.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "*võtan xover-i %d - %d %s-is\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "*ei saa xover'it\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "*xover'i võtmisel tekkis viga\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "*vigane xover rida: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "*ei saa xhdr-i\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "xhdr-i võtmise käigus tekkis viga.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Ei saanud NNTP serveriga %s:%d ühendust\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protokolli viga: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protokolli viga\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Kirja saatmisel tekkis viga\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Tekkis viga kirja protsessimisel."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Paroolifraas"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[pole kasutaja id-t]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3875,7 +3936,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3883,457 +3944,6 @@ msgstr ""
 "Vale parool! Proovi uuesti...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Nõutud APOP'i ajatemplit ei leidunud tervituses\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "*Tervituses on ajamärgi süntaksi viga\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 protokolli viga\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "*vigane xover rida: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Kustutan aegunud kirja %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Jätan kirja (%d / %d baiti) vahele\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "kirjakast on lukus\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "ei suutnud käivitada TLS sessiooni\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "autoriseerimisel tekkis viga\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Käsklus"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "autoriseerimisel tekkis viga\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Avan konto parameetrite akent...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Konto%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Uue konto omadused"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Konto omadused"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Loon konto omaduste akent...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Saabuvad kirjad"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privaatsus"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Spetsiaalne"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Selle konto nimi"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr " Määra vaikimisi kontoks "
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Isiku informatsioon"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Täisnimi"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-Posti aadress"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Ofganisatsioon"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Serveri informatsioon"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Uudised (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Lokaalarvutist"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "See servar nõuab autoriseerimist"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Uudiste server"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Sissetulevate kirjade server"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Saatmise server (SMTP)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Kasutajanimi"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Parool"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "See servar nõuab autoriseerimist"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Kustuta kirjad pärast kohalejõudmist serverist"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Eemalda pärast"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "päeva"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 päeva: eemalda kohe)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Võta serverist kõik kirjad"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Tõmbamise suuruse limiit"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtreeri saabuvaid kirju"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Vaikimisi sisendkast"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Autoriseerimise meetod"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automaatne"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Uudised"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maksimaalne võetavate artiklite arv\n"
-"(määramata kui sisestate 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Saaja pole määratud."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "Kui vajutate nuppu 'Võta kõik', siis uusi kirju võetakse ka siia"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Päis"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Lisa kuupäev päisesse"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Loo Kirja-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Lisa kasutaja defineeritud päis"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Redigeeri... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autoriseerimine"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP Autoriseerimine (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Kui te jätate need sissekanded tühjaks, siis \n"
-"kasutatakse vastuvõtva kasutaja ID-d ja parooli."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autoriseeri POP3 enne saatmist"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Käsklus"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Säti järgmised aadressid automaatselt"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Vastus saata"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Vaikimisi tuleb kiri allkirjastada"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Vaikimisi tuleb kiri krüpteerida"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Kasuta ASCII-ga varustatud krüpteerimise formaati"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Kasuta seleget teksti allkirja"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Allkirja võti"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Kasuta algset GnuPG võtit"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Vali võti elektronposti aadressi juurest"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Määra võti käsitsi"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Kasutaja või võtme ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Ära kasuta SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Kasuta SSL-i POP3-e ühenduse jaoks"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Kasuta STARTTLS käsklust et alustada SSL sessiooni"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Kasuta SSL-i IMAP4-ja ühenduse jaoks"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Kasuta SSL-i NNTP ühenduse loomisel"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Saada (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Kasuta SSL-i SMTP ühenduse jaoks"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Määra SMTP port"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Määra POP3 port"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Määra IMAP4 port"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Määra NNTP port"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Määra domeeni nimi"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP serveri kataloog"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Pane saadetud kirjad"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Pane mustandi kirjad"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Pane kustutatud kirjad"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Konto nime ei ole sisestatud."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Postiaadressi ei ole sisestatud."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP serverit ei ole sisestatud."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Kasutajanime ei ole sisestatud."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3 serverit ei ole sisestatud."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4 serverit ei ole sisestatud"
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP serverit ei ole sisestatud."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Ei ole soovitav kasutada vanastiilset ASCII-ga varustatud\n"
-"krüpteerimise reziimi. See ei sobi RFC 3516 - MIME \n"
-"turvalisusega kasutades OpenPGP-d."
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4396,17 +4006,17 @@ msgstr " Süntaksi abi "
 msgid "Registered actions"
 msgstr "Registreeritud tegevused"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Üles"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Alla"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Uus)"
 
@@ -4449,835 +4059,31 @@ msgstr "Kustuta tegevus"
 msgid "Do you really want to delete this action?"
 msgstr "Kas te tõesti soovite kustutada seda tegevust?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Kaust"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Loon üldiste omaduste akent...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Üldised omadused"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Tsitaat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Ekraan"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Kiri"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Muud asjad"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Kasuta välist programmi kirjade võtmiseks"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Käsklus"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Võta kirjad lokaalsest kirja jadast"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtreeri kirju nende võtmisel"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Võta kirju"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "iga"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuti järel"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Võta uued kirjad töö alguses"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Uuenda kõik lokaalsed kaustad peale kirjade võtmist"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Eemalda kohe peale liigutamist või kustutamist"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Võtan uute kirjade arvu (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Kasuta saatmisel välist programmi"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Pane saadetud kirjad kausta Saadetud"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Väljuva kirja kooditabel"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automaatne (Soovitatav)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7 bitine ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unikood (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Lääne-Euroopa (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Lääne-Euroopa (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Kesk Euroopa (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Balti (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Balti (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Kreeka (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Kreeka (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Kirillits (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Türgi (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Kirillits (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Kirillits (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Kirillits (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kirillits (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Jaapani (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Jaapani (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Jaapani (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Lihtsustatud Hiina (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Lihtsustatud Hiina (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Traditsionaalne Hiina (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Traditsionaalne Hiina (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Hiina (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korea (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tai (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Kui on märgitud 'Automaatne', siis kasutatakse praeguse\n"
-"lokaali jaoks optimaalset kodeeringut."
-
-#: src/prefs_common.c:1287
-#, fuzzy
-msgid "Transfer encoding"
-msgstr "Äärista enne saatmist"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Allkirja eraldaja"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Lisa automaatselt"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Käivita väline redaktor automaatselt"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Meelespeetavaid muudatusi"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Äärista kirjaread"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "sümboli laiuseks"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Äärista tsitaati"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Murra kõik pikad read sisestamisel"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Äärista enne saatmist"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Vali vastuste jaoks konto automaatselt"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Kirjale vastamisel tsiteeri seda."
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Vasta nupp käivitab vastamise kirjalisti"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Vastuse formaat"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Tsitaadi märk"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Edasta formaat"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Sümbolite seletus "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Tekstistiil"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Tõlgi päise nimed (näiteks From: Subject: ...)"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "lühenda uudistegruppe, mis on pikemad kui"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "tähte"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Kirjaloendi vaade"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Näita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Paisuta teemad"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Kuupäeva formaat"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Määra kirjaloendis näidatavad elemendid... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Kirja värvimine lubatud"
-
-#: src/prefs_common.c:1814
-#, fuzzy
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "Näita 2-baidiliste sümbolitega teksti 1-baidiliste sümbolitega"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Näita kirja päist ülalpool kirja vaadet"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Näita päiseid lühidalt"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Näita päiseid lühidalt"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Reavahe"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pinkti"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Kerimine"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Pool lehte"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Sujuv kerimine"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Samm"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr ""
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Päise näitamine"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Käivita"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Käivita"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Kaust"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtreeri saabuvaid kirju"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automaatselt kontrolli allkirju"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Säilita parooli ajutiselt mälus"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Aegub pärast"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minuteid"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Kui seada '0'-ks, siis parool salvesatakse\n"
-"kogu sessiooniks)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Näita stardi ajal hoiatust kui GnuPG ei tööta"
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "Teate faili ei ole valitud."
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Kausta sisenedes ava esimene lugemata kiri"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Kiri tuleb uues aknas avades märkida kui loetu"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Ava Sisendkaust peale uute kirjade vastuvõtmist"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Eemalda kohe peale liigutamist või kustutamist"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Kirjad lihtsalt märgitakse enne täitmit\n"
-" kui see on välja lülitatud)"
-
-#: src/prefs_common.c:2239
-#, fuzzy
-msgid "Receive dialog"
-msgstr "Näita vastuvõtmise dialoogi"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Näita vastuvõtmise dialoogi"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Alati"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Mitte iial"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Ära tekita vea teadet vastuvõtmise vea korral"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Sulge vastuvõtmise dialoog kui lõpetatud"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Määra klahvi seosed... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Välised käsklused (%s asendatakse faili / URI nimega)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Weebi sirvur"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Lisa aadress sihtlahtrisse kui topeltklõpsutan"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Programmist väljumisel"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Kontrolli väljumist"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Tühjenda prügikast"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Küsi enne tühjendamist"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Hoiata mind, kui järjekorras on kirju"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "*Kirjutan koondy puvrisse (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "nädalapäeva esitähed"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "täielik nädalapäeva nimi"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "lühendatud kuu nimetus"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "täispikk kuu nimetus"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "sajandi number (aasta/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "Kuupäev kümnendnumbrina"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "päev aastas kui kümnendnumber"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "kuu kui kümnendnumber"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minutid kümnendnumbrina"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "kas EL või PL"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekundin kümnendnumbrina"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "nädalapäev kümnendnumbrina"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "eelistatud kuupäev"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "viimased kaks aasta numbrit"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "aasta kümnendnumbrina"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "ajatsoon või nimi või lühend"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "*Määraja"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Seletus"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Näide"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Säti kirja värvid"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Värvid"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Tsiteeritud tekst - Aste 1"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Tsiteeritud tekst - Aste 2"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Tsiteeritud tekst - Aste 3"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI viide"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Tsitaadi värvid ringelvad"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Vali astme 1 tsitaadile värv"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Vali astme 2 tsitaadile värv"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Vali astme 3 tsitaadile värv"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Vali URI-le värv"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Sümbolite kirjeldus"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Kuupäev\n"
-"Kellelt\n"
-"Saatja täisnimi\n"
-"Saatja eesnimi\n"
-"Saatja initsiaal\n"
-"Pealkiri\n"
-"Kellele\n"
-"Koopia\n"
-"Uudistegrupp\n"
-"Kirja-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Kui x on seatud, näitab väljendit"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Teate keha\n"
-"Tsiteeritud teate keha\n"
-"Teate keha allkirjata\n"
-"Tsiteeritud teate keha allkirjata\n"
-"Literaal %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Täht tagasinihe\n"
-"Täht küsimärk\n"
-"Täht avanev loogeline sulg\n"
-"Täht sulgev loogeline sulg"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Klahvi seosed"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Märgi klahvide seoste eelseadistus.\n"
-"Te võite ka modifitseerida iga menüü kiirklahve vajutades\n"
-"suvalistele klahvidele asetades samal ajal hiire sellele."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Vana Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Enda määratud päise häälestus"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Päis"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Kustuta "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Enda määratud päis"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Päise nimi ei ole sisestatud."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Kustuta päis"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Kas te tõesti tahate seda päist kustutada?"
 
@@ -5325,12 +4131,21 @@ msgstr "Filtri sättimine"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Redigeeri"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Kas te tõesti soovite seda reeglit kustutada?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Tiitlita"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Kustuta reegel"
 
@@ -5419,6 +4234,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5561,6 +4380,10 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr ""
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Säti järgmised aadressid automaatselt"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr ""
@@ -5635,64 +4458,46 @@ msgstr "Näidatud elemendid"
 msgid " Revert to default "
 msgstr " Vaikimisi tagasi "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Malli nimi"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registreeri"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr "Lisa"
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Sümbolid "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registreeritud mallid"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Vormid"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Vorm"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Malli formaadi viga."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Kustuta mall"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Kas te tõesti tahate seda vormi kustutada?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "Ei suuda avada märgifaili\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "ei suuda võtta kirja %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Trükkimise käsurida on vale: %s\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Loon progressi dialoogi...\n"
@@ -5701,29 +4506,21 @@ msgstr "Loon progressi dialoogi...\n"
 msgid "Status"
 msgstr "Staatus"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "tekkis viga andmete võtmisel.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Ei saa kirjutada faili.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Ei suuda leida selle võtme jaoks kasutaja ID-d."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Allkiri %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Viga allkirja kontrollimisel"
 
@@ -5749,6 +4546,10 @@ msgstr "Võtme ID"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Muud asjad"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Lisa võti"
@@ -5769,88 +4570,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Järjekorda seatud kirja päis on katki.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ei saanud välist käsklust käima: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Ühendan"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Ühendun SMTP serveriga: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autoriseerimine"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Saadan kirja"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Saadan"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Saadan RCPT..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Saadan andmed..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Väljun..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Saadan kirja"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Kirja saatmisel tekkis viga."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5950,33 +4751,20 @@ msgstr "HALB allkiri"
 msgid "No public key to verify the signature"
 msgstr "Pole avalikku võtit allkirja kontrollimiseks"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH pole saadav\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "autoriseerimisel tekkis viga\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Loon lähtekoodi akent...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Kirja lähtekood"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Näitan %s-i lähtekoodi ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Lähtekood"
@@ -6373,6 +5161,895 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Mõned kirjutusaknad on avatud.\n"
+#~ "Palun sulge kõik kirjutusaknad enne kontode redigeerimist."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Avan kontode redigeerimisakna...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Loon kontode redigeerimisakna...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Kontode redigeerimine"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "*Uusi teateid võetakse selles järjekorras. Märgi kastikesed\n"
+#~ "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokoll"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Määra vaikimisi kontoks "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Kas te tõesti soovite kustutada kontot?"
+
+#~ msgid "Delete account"
+#~ msgstr "Kustuta konto"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Avan konto parameetrite akent...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Konto%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Uue konto omadused"
+
+#~ msgid "Account preferences"
+#~ msgstr "Konto omadused"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Loon konto omaduste akent...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Saabuvad kirjad"
+
+#~ msgid "Privacy"
+#~ msgstr "Privaatsus"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Spetsiaalne"
+
+#~ msgid "Name of this account"
+#~ msgstr "Selle konto nimi"
+
+#~ msgid "Set as default"
+#~ msgstr " Määra vaikimisi kontoks "
+
+#~ msgid "Personal information"
+#~ msgstr "Isiku informatsioon"
+
+#~ msgid "Full name"
+#~ msgstr "Täisnimi"
+
+#~ msgid "Mail address"
+#~ msgstr "E-Posti aadress"
+
+#~ msgid "Organization"
+#~ msgstr "Ofganisatsioon"
+
+#~ msgid "Server information"
+#~ msgstr "Serveri informatsioon"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Uudised (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Lokaalarvutist"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "See servar nõuab autoriseerimist"
+
+#~ msgid "News server"
+#~ msgstr "Uudiste server"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Sissetulevate kirjade server"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Saatmise server (SMTP)"
+
+#~ msgid "User ID"
+#~ msgstr "Kasutajanimi"
+
+#~ msgid "Password"
+#~ msgstr "Parool"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "See servar nõuab autoriseerimist"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Kustuta kirjad pärast kohalejõudmist serverist"
+
+#~ msgid "Remove after"
+#~ msgstr "Eemalda pärast"
+
+#~ msgid "days"
+#~ msgstr "päeva"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 päeva: eemalda kohe)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Võta serverist kõik kirjad"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Tõmbamise suuruse limiit"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtreeri saabuvaid kirju"
+
+#~ msgid "Default inbox"
+#~ msgstr "Vaikimisi sisendkast"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Autoriseerimise meetod"
+
+#~ msgid "Automatic"
+#~ msgstr "Automaatne"
+
+#~ msgid "News"
+#~ msgstr "Uudised"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maksimaalne võetavate artiklite arv\n"
+#~ "(määramata kui sisestate 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Saaja pole määratud."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "Kui vajutate nuppu 'Võta kõik', siis uusi kirju võetakse ka siia"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Lisa kuupäev päisesse"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Loo Kirja-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Lisa kasutaja defineeritud päis"
+
+#~ msgid " Edit... "
+#~ msgstr " Redigeeri... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autoriseerimine"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP Autoriseerimine (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Kui te jätate need sissekanded tühjaks, siis \n"
+#~ "kasutatakse vastuvõtva kasutaja ID-d ja parooli."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autoriseeri POP3 enne saatmist"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Käsklus"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Vastus saata"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Vaikimisi tuleb kiri allkirjastada"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Vaikimisi tuleb kiri krüpteerida"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Kasuta ASCII-ga varustatud krüpteerimise formaati"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Kasuta seleget teksti allkirja"
+
+#~ msgid "Sign key"
+#~ msgstr "Allkirja võti"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Kasuta algset GnuPG võtit"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Vali võti elektronposti aadressi juurest"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Määra võti käsitsi"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Kasutaja või võtme ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Ära kasuta SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Kasuta SSL-i POP3-e ühenduse jaoks"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Kasuta STARTTLS käsklust et alustada SSL sessiooni"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Kasuta SSL-i IMAP4-ja ühenduse jaoks"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Kasuta SSL-i NNTP ühenduse loomisel"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Saada (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Kasuta SSL-i SMTP ühenduse jaoks"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Määra SMTP port"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Määra POP3 port"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Määra IMAP4 port"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Määra NNTP port"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Määra domeeni nimi"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP serveri kataloog"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Pane saadetud kirjad"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Pane mustandi kirjad"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Pane kustutatud kirjad"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Konto nime ei ole sisestatud."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Postiaadressi ei ole sisestatud."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP serverit ei ole sisestatud."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Kasutajanime ei ole sisestatud."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3 serverit ei ole sisestatud."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4 serverit ei ole sisestatud"
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP serverit ei ole sisestatud."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Ei ole soovitav kasutada vanastiilset ASCII-ga varustatud\n"
+#~ "krüpteerimise reziimi. See ei sobi RFC 3516 - MIME \n"
+#~ "turvalisusega kasutades OpenPGP-d."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Loon üldiste omaduste akent...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Üldised omadused"
+
+#~ msgid "Quote"
+#~ msgstr "Tsitaat"
+
+#~ msgid "Display"
+#~ msgstr "Ekraan"
+
+#~ msgid "Message"
+#~ msgstr "Kiri"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Kasuta välist programmi kirjade võtmiseks"
+
+#~ msgid "Command"
+#~ msgstr "Käsklus"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Võta kirjad lokaalsest kirja jadast"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtreeri kirju nende võtmisel"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Võta kirju"
+
+#~ msgid "every"
+#~ msgstr "iga"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuti järel"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Võta uued kirjad töö alguses"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Uuenda kõik lokaalsed kaustad peale kirjade võtmist"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Eemalda kohe peale liigutamist või kustutamist"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Võtan uute kirjade arvu (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Kasuta saatmisel välist programmi"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Pane saadetud kirjad kausta Saadetud"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Väljuva kirja kooditabel"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automaatne (Soovitatav)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7 bitine ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unikood (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Lääne-Euroopa (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Lääne-Euroopa (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Kesk Euroopa (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Balti (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Balti (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Kreeka (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Kreeka (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Kirillits (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Türgi (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Kirillits (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Kirillits (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Kirillits (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Kirillits (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Jaapani (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Jaapani (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Jaapani (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Lihtsustatud Hiina (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Lihtsustatud Hiina (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Traditsionaalne Hiina (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Traditsionaalne Hiina (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Hiina (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korea (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tai (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Kui on märgitud 'Automaatne', siis kasutatakse praeguse\n"
+#~ "lokaali jaoks optimaalset kodeeringut."
+
+#, fuzzy
+#~ msgid "Transfer encoding"
+#~ msgstr "Äärista enne saatmist"
+
+#~ msgid "Signature separator"
+#~ msgstr "Allkirja eraldaja"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Lisa automaatselt"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Käivita väline redaktor automaatselt"
+
+#~ msgid "Undo level"
+#~ msgstr "Meelespeetavaid muudatusi"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Äärista kirjaread"
+
+#~ msgid "characters"
+#~ msgstr "sümboli laiuseks"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Äärista tsitaati"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Murra kõik pikad read sisestamisel"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Äärista enne saatmist"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Vali vastuste jaoks konto automaatselt"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Kirjale vastamisel tsiteeri seda."
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Vasta nupp käivitab vastamise kirjalisti"
+
+#~ msgid "Reply format"
+#~ msgstr "Vastuse formaat"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Tsitaadi märk"
+
+#~ msgid "Forward format"
+#~ msgstr "Edasta formaat"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Sümbolite seletus "
+
+#~ msgid "Font"
+#~ msgstr "Tekstistiil"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Tõlgi päise nimed (näiteks From: Subject: ...)"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "lühenda uudistegruppe, mis on pikemad kui"
+
+#~ msgid "letters"
+#~ msgstr "tähte"
+
+#~ msgid "Summary View"
+#~ msgstr "Kirjaloendi vaade"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Näita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
+
+#~ msgid "Expand threads"
+#~ msgstr "Paisuta teemad"
+
+#~ msgid "Date format"
+#~ msgstr "Kuupäeva formaat"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Määra kirjaloendis näidatavad elemendid... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Kirja värvimine lubatud"
+
+#, fuzzy
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "Näita 2-baidiliste sümbolitega teksti 1-baidiliste sümbolitega"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Näita kirja päist ülalpool kirja vaadet"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Näita päiseid lühidalt"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Näita päiseid lühidalt"
+
+#~ msgid "Line space"
+#~ msgstr "Reavahe"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pinkti"
+
+#~ msgid "Scroll"
+#~ msgstr "Kerimine"
+
+#~ msgid "Half page"
+#~ msgstr "Pool lehte"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Sujuv kerimine"
+
+#~ msgid "Step"
+#~ msgstr "Samm"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Päise näitamine"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Käivita"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Käivita"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Kaust"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtreeri saabuvaid kirju"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Automaatselt kontrolli allkirju"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Säilita parooli ajutiselt mälus"
+
+#~ msgid "Expired after"
+#~ msgstr "Aegub pärast"
+
+#~ msgid "minute(s) "
+#~ msgstr "minuteid"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Kui seada '0'-ks, siis parool salvesatakse\n"
+#~ "kogu sessiooniks)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Näita stardi ajal hoiatust kui GnuPG ei tööta"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Teate faili ei ole valitud."
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Kausta sisenedes ava esimene lugemata kiri"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Kiri tuleb uues aknas avades märkida kui loetu"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Ava Sisendkaust peale uute kirjade vastuvõtmist"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Eemalda kohe peale liigutamist või kustutamist"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Kirjad lihtsalt märgitakse enne täitmit\n"
+#~ " kui see on välja lülitatud)"
+
+#, fuzzy
+#~ msgid "Receive dialog"
+#~ msgstr "Näita vastuvõtmise dialoogi"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Näita vastuvõtmise dialoogi"
+
+#~ msgid "Always"
+#~ msgstr "Alati"
+
+#~ msgid "Never"
+#~ msgstr "Mitte iial"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Ära tekita vea teadet vastuvõtmise vea korral"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Sulge vastuvõtmise dialoog kui lõpetatud"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Määra klahvi seosed... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Välised käsklused (%s asendatakse faili / URI nimega)"
+
+#~ msgid "Web browser"
+#~ msgstr "Weebi sirvur"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Lisa aadress sihtlahtrisse kui topeltklõpsutan"
+
+#~ msgid "On exit"
+#~ msgstr "Programmist väljumisel"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Kontrolli väljumist"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Tühjenda prügikast"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Küsi enne tühjendamist"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Hoiata mind, kui järjekorras on kirju"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "*Kirjutan koondy puvrisse (%s)..."
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "nädalapäeva esitähed"
+
+#~ msgid "the full weekday name"
+#~ msgstr "täielik nädalapäeva nimi"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "lühendatud kuu nimetus"
+
+#~ msgid "the full month name"
+#~ msgstr "täispikk kuu nimetus"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "sajandi number (aasta/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "Kuupäev kümnendnumbrina"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "päev aastas kui kümnendnumber"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "kuu kui kümnendnumber"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minutid kümnendnumbrina"
+
+#~ msgid "either AM or PM"
+#~ msgstr "kas EL või PL"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekundin kümnendnumbrina"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "nädalapäev kümnendnumbrina"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "eelistatud kuupäev"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "viimased kaks aasta numbrit"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "aasta kümnendnumbrina"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "ajatsoon või nimi või lühend"
+
+#~ msgid "Specifier"
+#~ msgstr "*Määraja"
+
+#~ msgid "Description"
+#~ msgstr "Seletus"
+
+#~ msgid "Example"
+#~ msgstr "Näide"
+
+#~ msgid "Set message colors"
+#~ msgstr "Säti kirja värvid"
+
+#~ msgid "Colors"
+#~ msgstr "Värvid"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Tsiteeritud tekst - Aste 1"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Tsiteeritud tekst - Aste 2"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Tsiteeritud tekst - Aste 3"
+
+#~ msgid "URI link"
+#~ msgstr "URI viide"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Tsitaadi värvid ringelvad"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Vali astme 1 tsitaadile värv"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Vali astme 2 tsitaadile värv"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Vali astme 3 tsitaadile värv"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Vali URI-le värv"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Sümbolite kirjeldus"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Kuupäev\n"
+#~ "Kellelt\n"
+#~ "Saatja täisnimi\n"
+#~ "Saatja eesnimi\n"
+#~ "Saatja initsiaal\n"
+#~ "Pealkiri\n"
+#~ "Kellele\n"
+#~ "Koopia\n"
+#~ "Uudistegrupp\n"
+#~ "Kirja-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Kui x on seatud, näitab väljendit"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Teate keha\n"
+#~ "Tsiteeritud teate keha\n"
+#~ "Teate keha allkirjata\n"
+#~ "Tsiteeritud teate keha allkirjata\n"
+#~ "Literaal %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Täht tagasinihe\n"
+#~ "Täht küsimärk\n"
+#~ "Täht avanev loogeline sulg\n"
+#~ "Täht sulgev loogeline sulg"
+
+#~ msgid "Key bindings"
+#~ msgstr "Klahvi seosed"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Märgi klahvide seoste eelseadistus.\n"
+#~ "Te võite ka modifitseerida iga menüü kiirklahve vajutades\n"
+#~ "suvalistele klahvidele asetades samal ajal hiire sellele."
+
+#~ msgid "Default"
+#~ msgstr "Vaikimisi"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Vana Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Fondi valik"
 
@@ -6727,9 +6404,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Sätin vidinaid..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tMärgin kirju..."
 
diff --git a/po/fr.po b/po/fr.po
index 7fee03c6..bd676378 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -22,13 +22,405 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Lecture de la configuration des comptes...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Échec d'écriture de la configuration dans le fichier\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "La connexion IMAP4 vers %s a été interrompue. Reconnexion...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Le serveur IMAP4 désactive LOGIN.\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "création de la connexion IMAP4 vers %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Impossible d'initier la session TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Envoi du message (%d / %d octets)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Copie du message %s%c%d vers %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Copie du message %s%c%d vers %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Réception des messages de %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "impossible de marquer pour la suppression : %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "impossible de purger\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Réception des messages de %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "impossible de marquer pour la suppression : 1 : *\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "impossible de fermer le dossier\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "le dossier racine %s n'existe pas\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "Une erreur est survenue lors de la réception de LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Impossible de créer « %s »\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Impossible de créer « %s » sous Réception \n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "impossible de créer la boîte aux lettres\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "impossible de renomer la boîte aux lettres %s en %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "impossible de supprimer la boîte aux lettres\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "Impossible de faire une enveloppe\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Envoi du message (%d / %d octets)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "erreur lors de la lecture de l'enveloppe.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "impossible d'analyser l'enveloppe : %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Impossible d'établir une session IMAP4 avec : %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "Impossible d'obtenir l'espace nom\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "Impossible de sélectionner le dossier : %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "L'authentification IMAP4 a échoué.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Échec au login IMAP4.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "Impossible de d'ajouter %s à %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(envoi du fichier...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "impossible d'ajouter le message à %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "impossible de copier %s vers %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "erreur avec la commande IMAP : STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "erreur avec la commande IMAP : CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv ne peut convertir de %s vers UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "Impossible de copier le message de %s à %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Impossible d'ouvrir le fichier des marques.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "dossier source identique à la destination.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Copie du message %s%c%d vers %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Dernier numéro dans le répertoire %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Le fichier « %s » existe déjà.\n"
+"Impossible de créer le dossier."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"Le nom de dossier\n"
+"« %s » n'est pas une chaîne UTF-8 correcte.\n"
+"Peut-être que le jeu de caracères local est utilisé pour le nom de fichier.\n"
+"Dans ce cas de figure, vous devez définir la variable d'environnement "
+"suivante\n"
+"(voir le fichier README pour les détails) :\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "Création de la connexion NNTP vers %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "La connexion NNTP vers %s:%d a été coupée. Reconnexion...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "L'article %d a déjà été caché.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "Récupération de l'article %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "Impossible de lire l'article %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "Impossible d'obtenir la liste des groupes de discussion\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "Impossible de poster l'article.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "Impossible de récupérer l'article %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "impossible de sélectionner le groupe : %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "Intervalle d'articles invalide : %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "Pas d'article.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "Exécution de xover %d - %d sur %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "Impossible de faire un xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "Une erreur a eu lieu pendant la lecture du xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "Ligne xover invalide : %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "Impossible d'obtenir xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "Erreur lors de la réception de xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Impossible de se connecter au serveur NNTP : %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "Erreur de protocole : %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "Erreur de protocole\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Erreur lors de l'envoi.\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Une erreur est survenue pendant l'envoi de la commande\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Le 'timestamp' APOP n'a pas été reçu\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Erreur de syntaxe du 'timestamp' dans la bannière\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Erreur de protocole POP3\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "réponse UIDL invalide : %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Suppression du message expiré %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Message ignoré %d (%d octets)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "La boîte aux lettres est verrouillée\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "dépassement du délai de réponse (timeout) de la session\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "échec lors de l'ouverture de la session TLS\n"
+
+#
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "Erreur lors de l'authorisation\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "commande non supportée\n"
+
+#
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "Une erreur est survenue pendant la session POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -38,6 +430,53 @@ msgstr "Trouvé : %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "Dossier des messages indésirables"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): la conversion de code a échoué.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "Impossible d'ouvrir le fichier des marques\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "impossible de récupérer le message %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Impossible d'obtenir la partie texte\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "La ligne de commande d'impression est invalide : « %s »\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "Une erreur est survenue pendant la récupération des données.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Impossible d'écrire dans le fichier.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH pas disponible\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "mauvaise réponse SMTP\n"
+
+#
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "Une erreur est survenue pendant la session SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 absent\n"
@@ -169,78 +608,6 @@ msgstr ""
 "programme. Si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc.,, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Lecture de la configuration des comptes...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Des fenêtres de composition de message sont ouvertes.\n"
-"Veuillez fermer toutes les fenêtres de composition avant de configurer les "
-"comptes."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Ouverture de la fenêtre de configuration de compte...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Création de la fenêtre de configuration de compte...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Édition des comptes"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Le courrier sera relevé suivant l'ordre des comptes. Cocher la\n"
-"case dans la colonne G pour relever le courrier du compte \n"
-"correspondant lorsque « Tout relever » est activé"
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nom"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protocole"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Serveur"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Éditer"
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr "_Définir comme compte par défaut"
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Voulez-vous vraiment supprimer le compte « %s » ?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(Sans titre)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Supprimer le compte"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -340,6 +707,14 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nom"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -354,8 +729,8 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fichier"
 
@@ -376,9 +751,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
@@ -394,7 +769,7 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
@@ -426,8 +801,8 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Outils"
 
@@ -435,13 +810,13 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
@@ -458,17 +833,17 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/É_dition"
 
@@ -480,7 +855,7 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -490,14 +865,14 @@ msgstr "Nom :"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Supprimer"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -508,11 +883,11 @@ msgid "Lookup"
 msgstr "Rechercher"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Copie :"
 
@@ -539,7 +914,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -652,7 +1027,7 @@ msgstr "Erreur de conversion du carnet d'adresses"
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interface"
 
@@ -672,8 +1047,7 @@ msgstr "Adresse électronique"
 msgid "Group"
 msgstr "Groupe"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Dossier"
 
@@ -697,15 +1071,15 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Erreur"
 
@@ -760,8 +1134,8 @@ msgstr "/_Ajouter..."
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
@@ -801,8 +1175,8 @@ msgstr "/É_dition/_Annuler"
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
@@ -810,7 +1184,7 @@ msgstr "/É_dition/---"
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
@@ -822,7 +1196,7 @@ msgstr "/É_dition/Co_ller"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
@@ -838,7 +1212,7 @@ msgstr "/É_dition/Justifier tout le _message"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Affichage"
@@ -860,9 +1234,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
@@ -878,7 +1252,7 @@ msgstr "/_Affichage/_Afficher une règle"
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
@@ -889,103 +1263,103 @@ msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/_Baltique (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Europe du Nord (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
@@ -993,14 +1367,14 @@ msgstr "/_Outils/_Carnet d'adresses"
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
@@ -1021,10 +1395,6 @@ msgstr "/_Outils/_Chiffrer"
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Impossible d'obtenir la partie texte\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
@@ -1102,7 +1472,7 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez sélectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
@@ -1195,8 +1565,7 @@ msgstr "Type MIME"
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Envoyer"
 
@@ -1236,8 +1605,7 @@ msgstr "Joindre"
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Signature"
 
@@ -1245,7 +1613,7 @@ msgstr "Signature"
 msgid "Insert signature"
 msgstr "Insérer la signature"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Éditeur de texte"
 
@@ -1439,7 +1807,7 @@ msgstr "Modifier"
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valeur"
 
@@ -1472,7 +1840,6 @@ msgid " Check File "
 msgstr " Vérifier le fichier "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Fichier"
 
@@ -1529,12 +1896,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -1551,7 +1918,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1615,7 +1982,7 @@ msgstr "Délai d'attente (secs)"
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Général"
 
@@ -1673,7 +2040,6 @@ msgid "Exporting file:"
 msgstr "Fichier mbox :"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Choisir... "
 
@@ -1697,161 +2063,161 @@ msgstr "Remplacer le fichier existant ?"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Créer un _nouveau dossier..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/_Déplacer le dossier..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Rechercher dans le _dossier..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Té_lécharger"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Inscription aux groupes de discussion..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Création de la vue des dossiers...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du téléchargement des messages dans « %s »."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1861,21 +2227,21 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1886,21 +2252,21 @@ msgstr ""
 "Tous les dossiers et messages sous « %s » vont être définitivement effacés.\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1909,34 +2275,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:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -1997,7 +2363,7 @@ msgstr "%d groupes de discussion reçus (%s lu)"
 msgid "Newsgroups:"
 msgstr "Groupe de discussion :"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Sujet :"
 
@@ -2021,159 +2387,6 @@ msgstr "Création de la vue de l'image...\n"
 msgid "Can't load the image."
 msgstr "Impossible de charger l'image."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "La connexion IMAP4 vers %s a été interrompue. Reconnexion...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Le serveur IMAP4 désactive LOGIN.\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "création de la connexion IMAP4 vers %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Impossible d'initier la session TLS.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "impossible de marquer pour la suppression : %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "impossible de purger\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "impossible de marquer pour la suppression : 1 : *\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "impossible de fermer le dossier\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "le dossier racine %s n'existe pas\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "Une erreur est survenue lors de la réception de LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Impossible de créer « %s »\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Impossible de créer « %s » sous Réception \n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "impossible de créer la boîte aux lettres\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "impossible de renomer la boîte aux lettres %s en %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "impossible de supprimer la boîte aux lettres\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "Impossible de faire une enveloppe\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "erreur lors de la lecture de l'enveloppe.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "impossible d'analyser l'enveloppe : %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Impossible d'établir une session IMAP4 avec : %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "Impossible d'obtenir l'espace nom\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "Impossible de sélectionner le dossier : %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "L'authentification IMAP4 a échoué.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Échec au login IMAP4.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "Impossible de d'ajouter %s à %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(envoi du fichier...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "impossible d'ajouter le message à %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "impossible de copier %s vers %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "erreur avec la commande IMAP : STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "erreur avec la commande IMAP : CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv ne peut convertir de %s vers UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importer"
@@ -2273,7 +2486,7 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Suivant"
 
@@ -2289,143 +2502,143 @@ msgstr "Attributs"
 msgid "Finish"
 msgstr "Terminé"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Ancien Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Terminé - %d message(s) %s reçu(s)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Réception - %d message(s) %s reçu(s)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2434,28 +2647,28 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2464,11 +2677,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2477,15 +2690,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -2503,29 +2716,20 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Le fichier « %s » existe déjà.\n"
-"Impossible de créer le dossier."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2536,24 +2740,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2561,23 +2765,23 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2601,23 +2805,23 @@ msgstr ""
 "\n"
 "Poursuivre ?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2626,15 +2830,15 @@ msgstr ""
 "Support OpenPGP désactivé."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2642,619 +2846,619 @@ msgstr ""
 "Une ancienne version de configuration a été trouvée.\n"
 "Voulez-vous migrer vers la nouvelle ?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Fichier/_Dossier"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichier/_Dossier/Créer un _nouveau dossier..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichier/_Dossier/_Renommer le dossier..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichier/_Dossier/_Déplacer le dossier..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichier/_Dossier/_Supprimer le dossier"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Fichier/_Boîte aux lettres"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichier/_Boîte aux lettres/Ajouter une _boîte aux lettres..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichier/_Boîte aux lettres/_Supprimer la boîte aux lettres"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichier/_Boîte aux lettres/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichier/_Boîte aux lettres/Re_chercher les nouveaux messages"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Fichier/_Boîte aux lettres/Rechercher les nouveaux messages dans _toutes "
 "les boîtes"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichier/_Boîte aux lettres/Reconstruire l'_arborescence"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichier/_Importer un fichier mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichier/_Exporter vers un fichier mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichier/_Vider les corbeilles"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fichier/Enregistrer _sous..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fichier/Im_primer..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Fichier/_Travailler déconnecté"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Fichier/_Quitter"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/É_dition/Sélectionner l'en_filade"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/É_dition/Rechercher dans le _message..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/É_dition/Rechercher dans le _dossier..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Affichage/Affic_her ou masquer"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre des _dossiers"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre de _message"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/Icônes _et textes"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Textes seulement"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr ""
 "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Pas de barre d'outils"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Affichage/_Trier"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Affichage/_Trier/Trier par _numéro"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Affichage/_Trier/Trier par _taille"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Affichage/_Trier/Trier par e_xpéditeur"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Affichage/_Trier/Trier par d_estinataire"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Affichage/_Trier/Trier par _sujet"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Affichage/_Trier/Trier par _couleur"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Affichage/_Trier/Trier par _marque"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Affichage/_Trier/Trier par non _lu"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Affichage/_Trier/Trier par pièce _jointe"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Affichage/_Trier/Ne _pas trier"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Affichage/_Trier/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Affichage/_Trier/_Ordre croissant"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Affichage/_Trier/_Attirer par sujet"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Affichage/Affichage par _fil de conversation"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Affichage/Dé_ployer les fils de conversation"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Affichage/_Compacter les fils de conversation"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Affichage/Sélect_ion des éléments affichés..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Affichage/_Aller à"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Affichage/_Aller à/Message _précédent"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Affichage/_Aller à/Message suiva_nt"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Affichage/_Aller à/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Affichage/_Aller à/Non l_u précédent"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Affichage/_Aller à/Non _lu suivant"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Affichage/_Aller à/Message nouveau précédent"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Affichage/_Aller à/Message nouveau suivant"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Affichage/_Aller à/M_arqué précédent"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Affichage/_Aller à/_Marqué suivant"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Affichage/_Aller à/C_oloré précédent"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Affichage/_Aller à/_Coloré suivant"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Message/_Marquer comme _indésirable"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme in_téressant"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réédit_er"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur l'_expéditeur"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le(s) _destinataire(s)"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le _sujet"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Outils/Filtrer les _indésirables du dossier"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Outils/Filtrer les indésirables dans les _messages sélectionnés"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Message/Supprimer les messages en dou_ble"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Outils/E_xécuter"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/Ou_tils/_Journal de connexion"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changement du type de séparation de fenêtre de %d vers %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3263,16 +3467,16 @@ msgstr ""
 "Saisissez le nom de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3282,149 +3486,148 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "Marquer comme indésirable"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Vous êtes déconnecté. Cliquer sur l'icône pour vous connecter."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Vous êtes connecté. Cliquer sur l'icône pour vous déconnecter."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -3542,32 +3745,32 @@ msgstr "Fin de message atteint, reprendre depuis le début ?"
 msgid "Search finished"
 msgstr "Recherche terminée"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Création de la vue message...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Texte"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3576,7 +3779,7 @@ msgstr ""
 "Saisissez la ligne commande pour imprimer :\n"
 "(« %s » sera remplacé par le nom du fichier)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3585,49 +3788,6 @@ msgstr ""
 "La ligne de commande d'impression est invalide :\n"
 "« %s »"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "Impossible de copier le message de %s à %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Impossible d'ouvrir le fichier des marques.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "dossier source identique à la destination.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Copie du message %s%c%d vers %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Dernier numéro dans le répertoire %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"Le nom de dossier\n"
-"« %s » n'est pas une chaîne UTF-8 correcte.\n"
-"Peut-être que le jeu de caracères local est utilisé pour le nom de fichier.\n"
-"Dans ce cas de figure, vous devez définir la variable d'environnement "
-"suivante\n"
-"(voir le fichier README pour les détails) :\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Ouvrir"
@@ -3711,115 +3871,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La ligne de commande du visualiseur MIME est invalide: « %s »"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "Création de la connexion NNTP vers %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "La connexion NNTP vers %s:%d a été coupée. Reconnexion...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "L'article %d a déjà été caché.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "Récupération de l'article %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "Impossible de lire l'article %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "Impossible d'obtenir la liste des groupes de discussion\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "Impossible de poster l'article.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "Impossible de récupérer l'article %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "impossible de sélectionner le groupe : %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "Intervalle d'articles invalide : %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "Pas d'article.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "Exécution de xover %d - %d sur %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "Impossible de faire un xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "Une erreur a eu lieu pendant la lecture du xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "Ligne xover invalide : %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "Impossible d'obtenir xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "Erreur lors de la réception de xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Impossible de se connecter au serveur NNTP : %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "Erreur de protocole : %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "Erreur de protocole\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Erreur lors de l'envoi.\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Une erreur est survenue pendant l'envoi de la commande\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Phrase secrète"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[pas d'ID utilisateur]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3832,7 +3892,7 @@ msgstr ""
 " %.*s \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3840,449 +3900,6 @@ msgstr ""
 "Phrase secrète incorrecte. Autre tentative...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Le 'timestamp' APOP n'a pas été reçu\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Erreur de syntaxe du 'timestamp' dans la bannière\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Erreur de protocole POP3\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "réponse UIDL invalide : %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Suppression du message expiré %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Message ignoré %d (%d octets)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "La boîte aux lettres est verrouillée\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "dépassement du délai de réponse (timeout) de la session\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "échec lors de l'ouverture de la session TLS\n"
-
-#
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "Erreur lors de l'authorisation\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "commande non supportée\n"
-
-#
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "Une erreur est survenue pendant la session POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Ouverture de la fenêtre de configuration du compte...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Compte%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Configuration du nouveau compte"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Configuration du compte"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Création de la fenêtre de configuration du compte...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Réception"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Confidentialité"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avancée"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Nom du compte"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Définir comme compte par défaut"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Informations personnelles"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Nom complet"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Adresse électronique"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organisation"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Configuration des serveurs"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Aucun (local)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Ce serveur nécessite une authentification"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Serveur de groupes de discussion"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Serveur de réception"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Serveur SMTP (envoi)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Nom de l'utilisateur"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Mot de passe"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Utiliser l'authentification sécurisée (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Suppression des messages du serveur après réception"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Supprimer après"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "jours"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 jours : supprimer immédiatement)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Réception de tous les messages sur le serveur"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Taille maximale pour la réception"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "Ko"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrage des messages à la réception"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Boîte de réception par défaut"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "Les messages non filtrés seront placés dans ce dossier."
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Méthode d'authentification"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatique"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Articles de groupes de discussion"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "Nombre maximum d'articles à récupérer"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "Aucune limite pour la valeur 0."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "« Tout relever » relève le courrier pour ce compte"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "En-tête"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Ajouter un champ « Date » à l'en-tête"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Génération d'un Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Ajouter des en-têtes supplémentaires"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Modifier... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Authentification"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Authentification SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Laissez ces champs vides pour utiliser le nom d'utilisateur et le mot de "
-"passe spécifiés pour la réception."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "S'authentifier sur le POP3 avant l'envoi"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Sortie"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Définition automatique des adresses suivantes"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Copie"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Copie discrète"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Répondre à"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Signer le message par défaut"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Chiffrer le message par défaut"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "Chiffrer les réponses à un message chiffré"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Utiliser le format ASCII-armé pour le chiffrement"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Utiliser une signature non chiffrée"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Clé de signature"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Utiliser la clé par défaut de GnuPG"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Sélectionner la clé en fonction de l'adresse électronique"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Indiquer manuellement la clé"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Utilisateur ou identificateur (ID) de clé :"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Ne pas utiliser SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Utiliser SSL pour les connexions POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Utiliser SSL pour les connexions IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Utiliser SSL pour les connexions NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Envoi (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Utiliser SSL pour les connexions SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Utiliser SSL non-bloquant"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "Désactivez ceci si vous rencontrez des problèmes de connexion SSL."
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Indiquer le port SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Indiquer le port POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Indiquer le port IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Indiquer le port NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Indiquer le nom de domaine"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Répertoire IMAP4"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Placer les messages envoyés dans"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Placer les brouillons dans"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Placer les messages supprimés dans"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Nom du compte non indiqué."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Adresse électronique non saisie."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Serveur SMTP non indiqué."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Nom d'utilisateur manquant."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Serveur POP3 non indiqué."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Serveur IMAP4 non indiqué."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Serveur NNTP non indiqué."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Il est déconseillé d'utiliser l'ancien mode ASCII-armé\n"
-"pour les messages chiffrés. Il n'est pas conforme avec\n"
-"la RFC 3156, intitulée « MIME Security with OpenPGP »."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Actions"
@@ -4349,17 +3966,17 @@ msgstr " Aide "
 msgid "Registered actions"
 msgstr "Actions enregistrées"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Plus haut"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Plus bas"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nouveau)"
 
@@ -4401,826 +4018,31 @@ msgstr "Supprimer l'action"
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer cette action ?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "Dossier des messages indésirables"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Création de la fenêtre des préférences générales...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Préférences générales"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citation"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Affichage"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Message"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Courrier indésirable"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Autres"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Utiliser un programme externe pour l'incorporation"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Commande"
-
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "Incorporation à partir du spool local"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrage à l'incorporation"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Chemin du spool"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Relève automatique du courrier"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "chaque"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minute(s)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Relever le courrier au démarrage"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Mettre à jour tous les dossiers locaux après incorporation"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr "Exécuter la commande lors de l'arrivée de nouveaux messages"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "« %d » sera remplacé par le nombre de nouveaux messages."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Utiliser un programme externe pour l'envoi"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Enregistrer les messages envoyés dans la boîte d'envoi"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "Appliquer les règles de filtrage aux messages envoyés"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Jeu de caractères pour l'envoi"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatique (recommandé)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "ASCII 7 bits (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Europe occidentale (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Europe occidentale (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Europe centrale (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltique (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Europe du Nord (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grec (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Hébreu (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Hébreu (Windows-1255)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turc (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrillique (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrillique (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cyrillique (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillique (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonais (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonais (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonais (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Chinois simplifié (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Chinois simplifié (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Chinois traditionnel (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Chinois traditionnel (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chinois (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Coréen (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thaï (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thaï (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Si « Automatique » est sélectionné, le jeu de caractères optimal pour la "
-"langue utilisée sera choisi automatiquement."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Algo. de transmission"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Précise le champ « Content-Transfer-Encoding » utilisé quand le corps du "
-"message contient des caractères non ASCII."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Séparateur de signature"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Insérer automatiquement"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Lancer automatiquement l'éditeur externe"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Nombre maximal d'annulations"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Justifier les messages à"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "caractères"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Justifier la citation"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Justification automatique"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Justifier avant d'envoyer"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Sélection automatique du compte lors d'une réponse"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citer le message en répondant"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Le bouton répondre agit pour la liste de diffusion"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Citation lors d'une réponse"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Caractère de citation"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Citation lors d'un transfert"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Description des symboles "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Police"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Traduire le nom des en-têtes « From: », « Subject: », etc."
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Afficher le nombre de messages non lus près du nom de dossier"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Abréger les noms des groupes de discussion de plus de"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "lettres"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Résumé des messages"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr ""
-"Afficher le destinataire dans la colonne « Expéditeur » si vous êtes "
-"l'expéditeur du message"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Déployer les fils de conversation"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Format de la date"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Éléments affichés dans le résumé... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Coloration des messages"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Afficher l'alphabet et les nombres multi-octets\n"
-"comme des caractères ASCII (Japonais seulement)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Afficher un panneau d'en-têtes au dessus du message"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Afficher des en-têtes courts dans la fenêtre des messages"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "Afficher les messages HTML comme du texte"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Afficher le curseur dans la fenêtre des messages"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Espacement des lignes"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(s)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Défilement"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Demi-page"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Défilement continu"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "par pas de"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "Images"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Adapter les images aux dimensions de la fenêtre des messages"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Afficher les images directement dans le message"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "Activer la gestion des messages indésirables"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "Commande d'apprentissage :"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "Normal"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "Commande de détection"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "Dossier des indésirables"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-"Les messages marqués comme indésirables seront déplacés dans ce dossier."
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr "Tri des messages détectés comme indésirables à la réception"
-
-#: src/prefs_common.c:2051
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"Les messages filtrés seront placés dans le dossier des indésirables et "
-"effacés du serveur."
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Vérifier automatiquement les signatures"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Afficher le résultat de la vérification dans une fenêtre"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Mémoriser temporairement la phrase secrète"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Expiration après"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minute(s) "
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"Mettre 0 pour mémoriser la phrase secrète pendant toute la durée de la "
-"session."
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Ouvrir automatiquement les messages sélectionnés dans le résumé"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr ""
-"Marquer un message comme lu uniquement si ouvert dans une nouvelle fenêtre"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Aller dans la boîte de réception lors de l'arrivée de nouveau courrier"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr "Si désactivé, les messages resteront marqués jusqu'à exécution."
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Message de réception"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Afficher une fenêtre lors de la réception :"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr " toujours"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Seulement lors d'une relève manuelle du courrier"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr " jamais"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Ne pas afficher de fenêtre d'erreur lors d'une erreur de réception"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Fermer la fenêtre de réception à la fin"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "Mettre les boutons en conformité avec les « HIG » GNOME"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Choisir les raccourcis clavier... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Commandes externes (%s sera remplacé par le nom du fichier/URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Navigateur web"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "En quittant"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Confirmer en quittant"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Vider la corbeille en quittant"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Demander avant de vider"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Activer la vérification stricte de l'intégrité des caches d'index"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-"Activez ceci si le contenu des dossiers peut-être modifié par d'autres "
-"programmes.\n"
-"Cette option réduira les performances d'affichage du résumé des messages."
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Dépassement du délai de réponse (timeout) des E/S du socket :"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "seconde(s)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "nom du jour de la semaine (abrégé)"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "nom du jour de la semaine"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "nom du mois (abrégé)"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "nom du mois"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "le format par défaut de la date et de l'heure"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "le 'siècle' (année/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "le jour du mois"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "l'heure en tant que nombre (0-23)"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "l'heure en tant que nombre (1-12)"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "le jour de l'année en tant que nombre"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "le mois en tant que nombre"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "les minutes en tant que nombre"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM (matin) ou PM (après-midi)"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "les secondes en tant que nombre"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "le jour de la semaine en tant que nombre"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "le format par défaut de la date"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "les deux derniers chiffres de l'année"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "l'année"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "le fuseau horaire, son nom ou abréviation"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Code"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Description"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Exemple"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Paramétrer les couleurs de message"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Couleurs"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Texte cité - 1er niveau"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Texte cité - 2e niveau"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Texte cité - 3e niveau"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Lien URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Réutiliser les couleurs"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Choix de la couleur de la citation niveau 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Choix de la couleur de la citation niveau 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Choix de la couleur de la citation niveau 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Choix de la couleur pour les liens URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Description des symboles"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Date\n"
-"De\n"
-"Nom complet de l'expéditeur\n"
-"Prénom de l'expéditeur\n"
-"Initiales de l'expéditeur\n"
-"Sujet\n"
-"À\n"
-"Copie\n"
-"Groupes de discussions\n"
-"Message-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Si x est défini, afficher expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Corps du message\n"
-"Corps du message en tant que citation\n"
-"Corps du message sans signature\n"
-"Corps du message sans signature en tant que citation\n"
-"Caractère pourcent « % »"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Caractère « \\ »\n"
-"Caractère « ? »\n"
-"Caractère « { »\n"
-"Caractère « } »"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Raccourcis clavier"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Sélectionnez une configuration de raccourcis clavier.\n"
-"\n"
-"Vous pouvez aussi modifier le raccourci de chaque menu\n"
-"en le pointant avec la souris et en pressant une\n"
-"combinaison de touches."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Par défaut"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Ancien Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Édition des en-têtes supplémentaires"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "En-tête"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Supprimer "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "En-tête supplémentaires"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Le nom de l'en-tête n'est pas défini."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Supprimer l'en-tête"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Voulez-vous vraiment détruire cet en-tête ?"
 
@@ -5268,12 +4090,20 @@ msgstr "Règles de filtrage"
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Éditer"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Voulez-vous vraiment supprimer la règle « %s » ?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(Sans titre)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Supprimer une règle"
 
@@ -5357,6 +4187,10 @@ msgstr "est plus long que"
 msgid "is shorter than"
 msgstr "est plus court que"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "Ko"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Déplacer vers"
@@ -5478,6 +4312,10 @@ msgstr "Supprimer [...] ou (...) au début du sujet lors d'une réponse"
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Définition automatique des adresses suivantes"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "utiliser également pour les réponses"
@@ -5552,64 +4390,46 @@ msgstr "Éléments affichés"
 msgid " Revert to default "
 msgstr " Revenir aux valeurs par défaut "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Enregistrer"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Remplacer "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Symboles "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Modèles enregistrés"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Modèle"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Erreur de format dans le modèle."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Supprimer le modèle"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment détruire ce modèle ?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): la conversion de code a échoué.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "Impossible d'ouvrir le fichier des marques\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "impossible de récupérer le message %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "La ligne de commande d'impression est invalide : « %s »\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Création du dialogue d'avancement...\n"
@@ -5618,29 +4438,21 @@ msgstr "Création du dialogue d'avancement...\n"
 msgid "Status"
 msgstr "État"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "Une erreur est survenue pendant la récupération des données.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Impossible d'écrire dans le fichier.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Pas d'ID utilisateur pour cette clé"
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\tdit « %s »\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Date de la signature : %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Erreur lors de la vérification de la signature"
 
@@ -5666,6 +4478,10 @@ msgstr "ID de la clé"
 msgid "Val"
 msgstr "Validité"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Autres"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Ajouter une clé"
@@ -5690,84 +4506,84 @@ msgstr ""
 "vous ne pourrez pas savoir s'il ira ou non au bon destinataire.\n"
 "Avez-vous néanmoins assez confiance en celle-ci pour l'utiliser ?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "L'en-tête du message en attente est corrompu.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Envoi du message avec la commande : %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Impossible d'exécuter la commande : %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Une erreur est survenue pendant l'exécution de la commande : %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connection au serveur SMTP : %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Envoi de HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Envoi de EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Envoi de MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Envoi"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Envoi de RCPT TO"
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Envoi de DATA"
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Fermeture..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Envoi de message"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Une erreur est survenue pendant l'envoi de message."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5868,33 +4684,20 @@ msgstr "MAUVAISE signature"
 msgid "No public key to verify the signature"
 msgstr "Pas de clé publique pour vérifier la signature"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH pas disponible\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "mauvaise réponse SMTP\n"
-
-#
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "Une erreur est survenue pendant la session SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Création de la fenêtre source...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Source du message"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Afficher le source de %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Source"
@@ -6285,6 +5088,940 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Des fenêtres de composition de message sont ouvertes.\n"
+#~ "Veuillez fermer toutes les fenêtres de composition avant de configurer "
+#~ "les comptes."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Ouverture de la fenêtre de configuration de compte...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Création de la fenêtre de configuration de compte...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Édition des comptes"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Le courrier sera relevé suivant l'ordre des comptes. Cocher la\n"
+#~ "case dans la colonne G pour relever le courrier du compte \n"
+#~ "correspondant lorsque « Tout relever » est activé"
+
+#~ msgid "Protocol"
+#~ msgstr "Protocole"
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid " _Set as default account "
+#~ msgstr "_Définir comme compte par défaut"
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Voulez-vous vraiment supprimer le compte « %s » ?"
+
+#~ msgid "Delete account"
+#~ msgstr "Supprimer le compte"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Ouverture de la fenêtre de configuration du compte...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Compte%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Configuration du nouveau compte"
+
+#~ msgid "Account preferences"
+#~ msgstr "Configuration du compte"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Création de la fenêtre de configuration du compte...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Réception"
+
+#~ msgid "Privacy"
+#~ msgstr "Confidentialité"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancée"
+
+#~ msgid "Name of this account"
+#~ msgstr "Nom du compte"
+
+#~ msgid "Set as default"
+#~ msgstr "Définir comme compte par défaut"
+
+#~ msgid "Personal information"
+#~ msgstr "Informations personnelles"
+
+#~ msgid "Full name"
+#~ msgstr "Nom complet"
+
+#~ msgid "Mail address"
+#~ msgstr "Adresse électronique"
+
+#~ msgid "Organization"
+#~ msgstr "Organisation"
+
+#~ msgid "Server information"
+#~ msgstr "Configuration des serveurs"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Aucun (local)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Ce serveur nécessite une authentification"
+
+#~ msgid "News server"
+#~ msgstr "Serveur de groupes de discussion"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Serveur de réception"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Serveur SMTP (envoi)"
+
+#~ msgid "User ID"
+#~ msgstr "Nom de l'utilisateur"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Utiliser l'authentification sécurisée (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Suppression des messages du serveur après réception"
+
+#~ msgid "Remove after"
+#~ msgstr "Supprimer après"
+
+#~ msgid "days"
+#~ msgstr "jours"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 jours : supprimer immédiatement)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Réception de tous les messages sur le serveur"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Taille maximale pour la réception"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrage des messages à la réception"
+
+#~ msgid "Default inbox"
+#~ msgstr "Boîte de réception par défaut"
+
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "Les messages non filtrés seront placés dans ce dossier."
+
+#~ msgid "Authentication method"
+#~ msgstr "Méthode d'authentification"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatique"
+
+#~ msgid "News"
+#~ msgstr "Articles de groupes de discussion"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "Nombre maximum d'articles à récupérer"
+
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Aucune limite pour la valeur 0."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "« Tout relever » relève le courrier pour ce compte"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Ajouter un champ « Date » à l'en-tête"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Génération d'un Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Ajouter des en-têtes supplémentaires"
+
+#~ msgid " Edit... "
+#~ msgstr " Modifier... "
+
+#~ msgid "Authentication"
+#~ msgstr "Authentification"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Authentification SMTP (SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Laissez ces champs vides pour utiliser le nom d'utilisateur et le mot de "
+#~ "passe spécifiés pour la réception."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "S'authentifier sur le POP3 avant l'envoi"
+
+#~ msgid "Command output"
+#~ msgstr "Sortie"
+
+#~ msgid "Cc"
+#~ msgstr "Copie"
+
+#~ msgid "Bcc"
+#~ msgstr "Copie discrète"
+
+#~ msgid "Reply-To"
+#~ msgstr "Répondre à"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Signer le message par défaut"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Chiffrer le message par défaut"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "Chiffrer les réponses à un message chiffré"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Utiliser le format ASCII-armé pour le chiffrement"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Utiliser une signature non chiffrée"
+
+#~ msgid "Sign key"
+#~ msgstr "Clé de signature"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Utiliser la clé par défaut de GnuPG"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Sélectionner la clé en fonction de l'adresse électronique"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Indiquer manuellement la clé"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Utilisateur ou identificateur (ID) de clé :"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Ne pas utiliser SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Utiliser SSL pour les connexions POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Utiliser SSL pour les connexions IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Utiliser SSL pour les connexions NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Envoi (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Utiliser SSL pour les connexions SMTP"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Utiliser SSL non-bloquant"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "Désactivez ceci si vous rencontrez des problèmes de connexion SSL."
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Indiquer le port SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Indiquer le port POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Indiquer le port IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Indiquer le port NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Indiquer le nom de domaine"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Répertoire IMAP4"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Placer les messages envoyés dans"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Placer les brouillons dans"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Placer les messages supprimés dans"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Nom du compte non indiqué."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Adresse électronique non saisie."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Serveur SMTP non indiqué."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Nom d'utilisateur manquant."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Serveur POP3 non indiqué."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Serveur IMAP4 non indiqué."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Serveur NNTP non indiqué."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Il est déconseillé d'utiliser l'ancien mode ASCII-armé\n"
+#~ "pour les messages chiffrés. Il n'est pas conforme avec\n"
+#~ "la RFC 3156, intitulée « MIME Security with OpenPGP »."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Création de la fenêtre des préférences générales...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Préférences générales"
+
+#~ msgid "Quote"
+#~ msgstr "Citation"
+
+#~ msgid "Display"
+#~ msgstr "Affichage"
+
+#~ msgid "Message"
+#~ msgstr "Message"
+
+#~ msgid "Junk mail"
+#~ msgstr "Courrier indésirable"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Utiliser un programme externe pour l'incorporation"
+
+#~ msgid "Command"
+#~ msgstr "Commande"
+
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Incorporation à partir du spool local"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrage à l'incorporation"
+
+#~ msgid "Spool path"
+#~ msgstr "Chemin du spool"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Relève automatique du courrier"
+
+#~ msgid "every"
+#~ msgstr "chaque"
+
+#~ msgid "minute(s)"
+#~ msgstr "minute(s)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Relever le courrier au démarrage"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Mettre à jour tous les dossiers locaux après incorporation"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Exécuter la commande lors de l'arrivée de nouveaux messages"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "« %d » sera remplacé par le nombre de nouveaux messages."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Utiliser un programme externe pour l'envoi"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Enregistrer les messages envoyés dans la boîte d'envoi"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "Appliquer les règles de filtrage aux messages envoyés"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Jeu de caractères pour l'envoi"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatique (recommandé)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "ASCII 7 bits (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Europe occidentale (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Europe occidentale (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Europe centrale (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltique (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Europe du Nord (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grec (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Hébreu (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Hébreu (Windows-1255)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turc (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cyrillique (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cyrillique (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cyrillique (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cyrillique (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonais (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonais (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonais (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Chinois simplifié (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Chinois simplifié (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Chinois traditionnel (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Chinois traditionnel (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chinois (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Coréen (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thaï (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thaï (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Si « Automatique » est sélectionné, le jeu de caractères optimal pour la "
+#~ "langue utilisée sera choisi automatiquement."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Algo. de transmission"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Précise le champ « Content-Transfer-Encoding » utilisé quand le corps du "
+#~ "message contient des caractères non ASCII."
+
+#~ msgid "Signature separator"
+#~ msgstr "Séparateur de signature"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Insérer automatiquement"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Lancer automatiquement l'éditeur externe"
+
+#~ msgid "Undo level"
+#~ msgstr "Nombre maximal d'annulations"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Justifier les messages à"
+
+#~ msgid "characters"
+#~ msgstr "caractères"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Justifier la citation"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Justification automatique"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Justifier avant d'envoyer"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Sélection automatique du compte lors d'une réponse"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citer le message en répondant"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Le bouton répondre agit pour la liste de diffusion"
+
+#~ msgid "Reply format"
+#~ msgstr "Citation lors d'une réponse"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Caractère de citation"
+
+#~ msgid "Forward format"
+#~ msgstr "Citation lors d'un transfert"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Description des symboles "
+
+#~ msgid "Font"
+#~ msgstr "Police"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Traduire le nom des en-têtes « From: », « Subject: », etc."
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Afficher le nombre de messages non lus près du nom de dossier"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Abréger les noms des groupes de discussion de plus de"
+
+#~ msgid "letters"
+#~ msgstr "lettres"
+
+#~ msgid "Summary View"
+#~ msgstr "Résumé des messages"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr ""
+#~ "Afficher le destinataire dans la colonne « Expéditeur » si vous êtes "
+#~ "l'expéditeur du message"
+
+#~ msgid "Expand threads"
+#~ msgstr "Déployer les fils de conversation"
+
+#~ msgid "Date format"
+#~ msgstr "Format de la date"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Éléments affichés dans le résumé... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Coloration des messages"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Afficher l'alphabet et les nombres multi-octets\n"
+#~ "comme des caractères ASCII (Japonais seulement)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Afficher un panneau d'en-têtes au dessus du message"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Afficher des en-têtes courts dans la fenêtre des messages"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "Afficher les messages HTML comme du texte"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Afficher le curseur dans la fenêtre des messages"
+
+#~ msgid "Line space"
+#~ msgstr "Espacement des lignes"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(s)"
+
+#~ msgid "Scroll"
+#~ msgstr "Défilement"
+
+#~ msgid "Half page"
+#~ msgstr "Demi-page"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Défilement continu"
+
+#~ msgid "Step"
+#~ msgstr "par pas de"
+
+#~ msgid "Images"
+#~ msgstr "Images"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Adapter les images aux dimensions de la fenêtre des messages"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Afficher les images directement dans le message"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "Activer la gestion des messages indésirables"
+
+#~ msgid "Learning command:"
+#~ msgstr "Commande d'apprentissage :"
+
+#~ msgid "Not Junk"
+#~ msgstr "Normal"
+
+#~ msgid "Classifying command"
+#~ msgstr "Commande de détection"
+
+#~ msgid "Junk folder"
+#~ msgstr "Dossier des indésirables"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr ""
+#~ "Les messages marqués comme indésirables seront déplacés dans ce dossier."
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Tri des messages détectés comme indésirables à la réception"
+
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "Les messages filtrés seront placés dans le dossier des indésirables et "
+#~ "effacés du serveur."
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Vérifier automatiquement les signatures"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Afficher le résultat de la vérification dans une fenêtre"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Mémoriser temporairement la phrase secrète"
+
+#~ msgid "Expired after"
+#~ msgstr "Expiration après"
+
+#~ msgid "minute(s) "
+#~ msgstr "minute(s) "
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "Mettre 0 pour mémoriser la phrase secrète pendant toute la durée de la "
+#~ "session."
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Ouvrir automatiquement les messages sélectionnés dans le résumé"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr ""
+#~ "Marquer un message comme lu uniquement si ouvert dans une nouvelle fenêtre"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr ""
+#~ "Aller dans la boîte de réception lors de l'arrivée de nouveau courrier"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr "Si désactivé, les messages resteront marqués jusqu'à exécution."
+
+#~ msgid "Receive dialog"
+#~ msgstr "Message de réception"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Afficher une fenêtre lors de la réception :"
+
+#~ msgid "Always"
+#~ msgstr " toujours"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Seulement lors d'une relève manuelle du courrier"
+
+#~ msgid "Never"
+#~ msgstr " jamais"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Ne pas afficher de fenêtre d'erreur lors d'une erreur de réception"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Fermer la fenêtre de réception à la fin"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "Mettre les boutons en conformité avec les « HIG » GNOME"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Choisir les raccourcis clavier... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Commandes externes (%s sera remplacé par le nom du fichier/URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Navigateur web"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr ""
+#~ "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
+
+#~ msgid "On exit"
+#~ msgstr "En quittant"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Confirmer en quittant"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Vider la corbeille en quittant"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Demander avant de vider"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Activer la vérification stricte de l'intégrité des caches d'index"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Activez ceci si le contenu des dossiers peut-être modifié par d'autres "
+#~ "programmes.\n"
+#~ "Cette option réduira les performances d'affichage du résumé des messages."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Dépassement du délai de réponse (timeout) des E/S du socket :"
+
+#~ msgid "second(s)"
+#~ msgstr "seconde(s)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "nom du jour de la semaine (abrégé)"
+
+#~ msgid "the full weekday name"
+#~ msgstr "nom du jour de la semaine"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "nom du mois (abrégé)"
+
+#~ msgid "the full month name"
+#~ msgstr "nom du mois"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "le format par défaut de la date et de l'heure"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "le 'siècle' (année/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "le jour du mois"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "l'heure en tant que nombre (0-23)"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "l'heure en tant que nombre (1-12)"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "le jour de l'année en tant que nombre"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "le mois en tant que nombre"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "les minutes en tant que nombre"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM (matin) ou PM (après-midi)"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "les secondes en tant que nombre"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "le jour de la semaine en tant que nombre"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "le format par défaut de la date"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "les deux derniers chiffres de l'année"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "l'année"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "le fuseau horaire, son nom ou abréviation"
+
+#~ msgid "Specifier"
+#~ msgstr "Code"
+
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#~ msgid "Example"
+#~ msgstr "Exemple"
+
+#~ msgid "Set message colors"
+#~ msgstr "Paramétrer les couleurs de message"
+
+#~ msgid "Colors"
+#~ msgstr "Couleurs"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Texte cité - 1er niveau"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Texte cité - 2e niveau"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Texte cité - 3e niveau"
+
+#~ msgid "URI link"
+#~ msgstr "Lien URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Réutiliser les couleurs"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Choix de la couleur de la citation niveau 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Choix de la couleur de la citation niveau 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Choix de la couleur de la citation niveau 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Choix de la couleur pour les liens URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Description des symboles"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Date\n"
+#~ "De\n"
+#~ "Nom complet de l'expéditeur\n"
+#~ "Prénom de l'expéditeur\n"
+#~ "Initiales de l'expéditeur\n"
+#~ "Sujet\n"
+#~ "À\n"
+#~ "Copie\n"
+#~ "Groupes de discussions\n"
+#~ "Message-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Si x est défini, afficher expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Corps du message\n"
+#~ "Corps du message en tant que citation\n"
+#~ "Corps du message sans signature\n"
+#~ "Corps du message sans signature en tant que citation\n"
+#~ "Caractère pourcent « % »"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Caractère « \\ »\n"
+#~ "Caractère « ? »\n"
+#~ "Caractère « { »\n"
+#~ "Caractère « } »"
+
+#~ msgid "Key bindings"
+#~ msgstr "Raccourcis clavier"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Sélectionnez une configuration de raccourcis clavier.\n"
+#~ "\n"
+#~ "Vous pouvez aussi modifier le raccourci de chaque menu\n"
+#~ "en le pointant avec la souris et en pressant une\n"
+#~ "combinaison de touches."
+
+#~ msgid "Default"
+#~ msgstr "Par défaut"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Ancien Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Sélection de la police"
 
diff --git a/po/gl.po b/po/gl.po
index 38efb5cf..7ce455eb 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -14,13 +14,401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Lendo configuración de cada conta...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo a configuración a ficheiro\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "Perdeuse a conexión IMAP4 con %s:%d . Reconectando...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Directorio do servidor IMAP4"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "creando conexión IMAP4 con %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Non podo iniciar a sesión TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Enviando mensaxe (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Movendo mensaxe %s%c%d a %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Copiando mensaxe %s%c%d a %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Obtendo mensaxes dende %s en %s...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "non podo establecer os indicadores borrados: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "non podo baleirar\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Obtendo mensaxes dende %s en %s...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "non podo establecer os indicadores borrados: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "non se pode seleccionar a carpeta: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Ficheiro de marcas non atopado.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "ocurriu un erro obtendo LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Non podo crear '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Non podo crear '%s' bajo Entrada\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "non podo crear a: LIST falló\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "non podo crear a caixa de correo\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "non podo renomear a caixa de correo: %s a %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "non podo borrar a caixa de correo\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "non se pode obter a estructura da mensaxe\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Enviando mensaxe (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "Erro obtendo a estructura da mensaxe.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Non se pode conectar con o servidor IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "no se pode obter o espacio de nomes\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "non se pode seleccionar a carpeta: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Fallo de autenticación"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Autentificación IMAP4 fallida.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "non podo engadir %s a %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(enviando ficheiro...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "non se pode engadir o mensaxe %s\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "non podo copiar %d a %s\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "erro no comando imap: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "erro no comando imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "erro no comando imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv non pode convertir UTF-7 a %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv non pode convertir %s a UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "non se pode copiar mensaxe %s a %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Non se pode abrir o ficheiro de marcas.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "carpetas de orixen e destiño idénticas.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Copiando mensaxe %s%c%d a %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Último número en directorio %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"o Ficheiro `%s' xa existe.\n"
+"Non podo crear a carpeta."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "creando conexión NNTP con %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "perdeuse a conexión NNTP con %s:%d . Reconectando...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "o artigo %d xa esta en caché.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "obtendo artigo %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "no podo leer o artículo %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "no podo obter a lista de grupos\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "no se pode enviar o artículo.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "no podo obter o artículo %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "non podo seleccionar grupo %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "rango de artículos no válido: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "no hai artículos novos.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "obteniendo xover %d - %d en %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "no se pode obtener xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "ocurriu un erro obtendo xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "linea xover non válida: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "non se pode obter xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "ocurriu un erro obtendo xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Non se pode conectar con o servidor NNTP: %s:%d\n"
+
+#: 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
+msgid "protocol error\n"
+msgstr "erro do protocolo\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Ocurríu un erro mentras se enviaba\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Ocurriu un erro mentras se enviaba o correo."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Non se atopou no saudo a marca temporal APOP requerida\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "a marca temporal do saudo ten un erro de sintaxis\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Erro do protocolo POP3\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "linea xover non válida: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Borrando mensaxe expirado %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Ignorando mensaxe %d (%d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "a caixa de correo está bloqueado\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "non podo abrir a sesión TLs\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "ocurriu algún erro na autenticación\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "Comando non soportado\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "ocurriu algún erro na sesión POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +418,53 @@ msgstr "Atopado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración gardada.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Carpeta"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "no se pode abrir o ficheiro de marcas\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "non se pode obter o mensaxe %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Non se pode obter o texto\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "o comando de impresión non é válido: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "ocurriu un erro mentras se obtían datos.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Non se pode escribir ó ficheiro.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH non está disponible\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "ocurriu algún erro na sesión SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 non está disponible\n"
@@ -163,78 +598,6 @@ msgstr ""
 "con este programa; en caso contrario, escriba a  Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Lendo configuración de cada conta...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Hai Fiestras de composición abertas.\n"
-"Peche todas as fiestras de composición antes de editar as contas."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Abrindo fiestra de edición de conta...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Creando fiestra de edición de conta...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Editar contas"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"A orde de comprobación de mensaxes será este. Marque as casilas\n"
-"na columna `G' para activar a descarga mediante `Traer todo'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nome"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Servidor"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Editar"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " conta por defecto "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "¿Realmente quere borrar esta conta?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Sen título"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Borrar conta"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -332,6 +695,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nome"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -346,8 +717,8 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Ficheiro"
 
@@ -368,9 +739,9 @@ msgid "/_File/New _Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
@@ -386,7 +757,7 @@ msgstr "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
@@ -418,8 +789,8 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
@@ -427,13 +798,13 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
@@ -450,17 +821,17 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -472,7 +843,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -482,14 +853,14 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Borrar"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -500,11 +871,11 @@ msgid "Lookup"
 msgstr "Buscar"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -530,7 +901,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -644,7 +1015,7 @@ msgstr "Erro na conversión da axenda"
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -664,8 +1035,7 @@ msgstr "Enderezo e-mail"
 msgid "Group"
 msgstr "Grupo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -689,15 +1059,15 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Erro"
 
@@ -752,8 +1122,8 @@ msgstr "/_Engadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -797,8 +1167,8 @@ msgstr "/_Editar/_Desfacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
@@ -806,7 +1176,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
@@ -818,7 +1188,7 @@ msgstr "/_Editar/_Pegar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -835,7 +1205,7 @@ msgstr "/_Editar/_Cortar todas as líneas longas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ver"
@@ -857,9 +1227,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -875,7 +1245,7 @@ msgstr "/_Ver/_Regra"
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
@@ -887,127 +1257,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
@@ -1015,14 +1385,14 @@ msgstr "/_Ferramentas/_Axenda de enderezos"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
@@ -1046,10 +1416,6 @@ msgstr "/_Mensaxe/_Encriptar"
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Non se pode obter o texto\n"
-
 #: src/compose.c:1419
 #, fuzzy
 msgid "Quote mark format error."
@@ -1127,7 +1493,7 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
@@ -1219,8 +1585,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Enviar"
 
@@ -1260,8 +1625,7 @@ msgstr "Adxuntar"
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Sinatura"
 
@@ -1269,7 +1633,7 @@ msgstr "Sinatura"
 msgid "Insert signature"
 msgstr "Inserir sinatura"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1466,7 +1830,7 @@ msgstr "Modificar"
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valor"
 
@@ -1499,7 +1863,6 @@ msgid " Check File "
 msgstr " Comprobar ficheiro "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Ficheiro"
 
@@ -1555,12 +1918,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -1577,7 +1940,7 @@ 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.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1641,7 +2004,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Basico"
 
@@ -1699,7 +2062,6 @@ msgid "Exporting file:"
 msgstr "Ficheiro de exportación:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -1723,164 +2085,164 @@ msgstr "¿Sobreescribir o ficheiro existente?"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Buscar nas mensaxes"
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Non hai mensaxes sin leer."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non leídos"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Establecendo información de carpeta...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1890,21 +2252,21 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1915,21 +2277,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1938,34 +2300,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2026,7 +2388,7 @@ msgstr "%d grupos de novas recibidos (%s leídos)"
 msgid "Newsgroups:"
 msgstr "Grupos de novas:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -2050,164 +2412,6 @@ msgstr "Creando vista de imaxen...\n"
 msgid "Can't load the image."
 msgstr "Non se pode cargar a imaxen."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Perdeuse a conexión IMAP4 con %s:%d . Reconectando...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Directorio do servidor IMAP4"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "creando conexión IMAP4 con %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Non podo iniciar a sesión TLS.\n"
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "non podo establecer os indicadores borrados: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "non podo baleirar\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "non podo establecer os indicadores borrados: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "non se pode seleccionar a carpeta: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Ficheiro de marcas non atopado.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "ocurriu un erro obtendo LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Non podo crear '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Non podo crear '%s' bajo Entrada\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "non podo crear a: LIST falló\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "non podo crear a caixa de correo\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "non podo renomear a caixa de correo: %s a %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "non podo borrar a caixa de correo\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "non se pode obter a estructura da mensaxe\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "Erro obtendo a estructura da mensaxe.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Non se pode conectar con o servidor IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "no se pode obter o espacio de nomes\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "non se pode seleccionar a carpeta: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Fallo de autenticación"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Autentificación IMAP4 fallida.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "non podo engadir %s a %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(enviando ficheiro...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "non se pode engadir o mensaxe %s\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "non podo copiar %d a %s\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "erro no comando imap: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "erro no comando imap: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "erro no comando imap: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv non pode convertir UTF-7 a %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv non pode convertir %s a UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importar"
@@ -2305,7 +2509,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2321,145 +2525,145 @@ msgstr "Atributos"
 msgid "Finish"
 msgstr "Finalizar"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Antigos de Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "feito (non hai mensaxes novos)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2468,28 +2672,28 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2498,12 +2702,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2512,15 +2716,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -2538,29 +2742,20 @@ msgstr "Contrasinal"
 msgid "Protocol log"
 msgstr "Rexistro do protocolo"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"o Ficheiro `%s' xa existe.\n"
-"Non podo crear a carpeta."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non está soportado por glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre a fiestra de edición"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2570,48 +2765,48 @@ msgstr ""
 "                         abre a fiestra de composición con os ficheiros\n"
 "                         especificados como adxuntos"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe as mensaxes novas"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe novas mensaxes para todas as contas"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todas as mensaxes na cola"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta axuda e finaliza"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              da a información da versión e finaliza"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Codificación para enviar"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2625,19 +2820,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Está compoñendo unha mensaxe. ¿Quere sair?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Mensaxes en cola"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2646,661 +2841,661 @@ msgstr ""
 "Soporte para OpenPGP deshabilitado."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Ficheiro/_Carpeta_/Crear _nova carpeta..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Ficheiro/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Eliminar _mailbox"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Ficheiro/_Comprobar mensaxes novas en todas as carpetas"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Ficheiro/I_mportar ficheiro mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Ficheiro/_Exportar a ficheiro mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Ficheiro/_Baleirar Papeleira"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Ficheiro/_Imprimir"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Ficheiro/Sai_r"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fio"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar na mensaxe actual..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en carpeta..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar ou o_cultar"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar ou o_cultar/_Arbre de carpetas"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar ou o_cultar/_Mensaxes"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/Iconos _e texto"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Texto"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Ocultar"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordear/Por _número"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordear/Por tamañ_o"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordear/Por _destinatario"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordear/Por as_unto"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordear/Por _cor da etiqueta"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordear/Por _marca"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordear/Por _non leído"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordear/Por adxun_to"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordear/N_on ordear"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordear/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordear/Ascendente"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordear/Atraer _por asunto"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista xerárquica"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos os fios"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos os fios"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaxe a_nterior"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaxe s_eguinte"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin ler"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Seguinte sin ler"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaxe no_va anterior"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaxe nova s_eguinte"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaxe marcada a_nterior"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Seguinte mensaxe _marcada"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaxe etiqueta_da anterior"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas as cabeceiras"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando o tipo de separación de fiestra de %d a %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3310,16 +3505,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3329,153 +3524,152 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
@@ -3593,32 +3787,32 @@ msgstr "Chegóuse ó final da mensaxe. ¿Seguir dende o principio?"
 msgid "Search finished"
 msgstr "Búsqueda concluida"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaxe...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Adxuntos"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3627,7 +3821,7 @@ msgstr ""
 "Teclee o comando para imprimir:\n"
 "(`%s' será sustituido por o ficheiro)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3636,41 +3830,6 @@ msgstr ""
 "o comando de impresión non é válido:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "non se pode copiar mensaxe %s a %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Non se pode abrir o ficheiro de marcas.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "carpetas de orixen e destiño idénticas.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Copiando mensaxe %s%c%d a %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Último número en directorio %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Abrir"
@@ -3757,116 +3916,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "o comando do visor MIME non é válido: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "creando conexión NNTP con %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "perdeuse a conexión NNTP con %s:%d . Reconectando...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "o artigo %d xa esta en caché.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "obtendo artigo %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "no podo leer o artículo %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "no podo obter a lista de grupos\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "no se pode enviar o artículo.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "no podo obter o artículo %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "non podo seleccionar grupo %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "rango de artículos no válido: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "no hai artículos novos.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "obteniendo xover %d - %d en %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "no se pode obtener xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "ocurriu un erro obtendo xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "linea xover non válida: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "non se pode obter xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "ocurriu un erro obtendo xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Non se pode conectar con o servidor NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "erro do protocolo: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "erro do protocolo\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Ocurríu un erro mentras se enviaba\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Ocurriu un erro mentras se enviaba o correo."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Frase contrasinal"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[sin id usuario]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3879,7 +3937,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3887,455 +3945,6 @@ msgstr ""
 "¡Contrasinal erróneo! Intenteo de novo...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Non se atopou no saudo a marca temporal APOP requerida\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "a marca temporal do saudo ten un erro de sintaxis\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Erro do protocolo POP3\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "linea xover non válida: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Borrando mensaxe expirado %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Ignorando mensaxe %d (%d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "a caixa de correo está bloqueado\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "non podo abrir a sesión TLs\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "ocurriu algún erro na autenticación\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "Comando non soportado\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "ocurriu algún erro na sesión POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Abrindo Fiestra de preferencias de conta...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "conta%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Preferencias para unha nova conta"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Preferencias da conta"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Creando Fiestra de preferencias de conta...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Recibir"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privacidad"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avanzadas"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Nome desta conta"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "conta por defecto"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Información persoal"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Nome completo"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Enderezo de correo"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organización"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Información do servidor"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Novas (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Ningunha (local)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Este servidor require autenticación"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Servidor de novas"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Servidor de recepción"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Servidor SMTP (enviar)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Usuario"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Contrasinal"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Este servidor require autenticación"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Eliminar mensaxes do servidor ó recibir"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Eliminar despois de"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "días"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 días: eliminar inmediatamente)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Descargar todas as mensaxes do servidor"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Tamaño límite para recibir"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrar mensaxes ó recibir"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Caixa de correo por defecto"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Método de autenticación"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automática"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Novas"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Número máximo de artigos a descargar\n"
-"(sen límite si se especifica 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Non se especificou o destinatario."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Cabeceira"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Engadir campo Data"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Xenerar ID-Mensaxe"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Engadir cabeceira de usuario"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Editar... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Autenticación SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Si deixa estes campos valeiros, utilizaráse o mesmo\n"
-"ID de usuario e contrasinal usados para a recepción."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autenticación con POP3 antes de enviar"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Saida do comando"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Establecer os seguintes enderezos automáticamente"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Respostar a"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Asinar a mensaxe por defecto"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Encriptar a mensaxe por defecto"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Usar formato ASCII blindado para encriptación"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Usar sinatura de texto claro"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Asinar clave"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Usar clave GnuPG por defecto"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Seleccionar clave por dirección de correo"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Especificar clave manualmente"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Usuario ou ID clave:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Non usar SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Usar SSL para a conexión POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Usar o comando STARTTLS para abrir a sesión SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Usar SSL para a conexión IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Usar SSL para a conexión NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Enviar (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Usar SSL para a conexión SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Porto SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Porto POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Porto IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Porto NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Nome do dominio"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Directorio do servidor IMAP4"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Poñer mensaxes enviadas en"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Poñer borradores de mensaxes en"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Poñer mensaxes borradas en"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Non se especificou o nome de conta."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Non se especificou o enderezo de correo."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Non se especificou o servidor SMTP."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Non se especificou o usuario."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Non se especificou o servidor POP3."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Non se especificou o servidor IMAP4."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Non se especificou o servidor NNTP."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Non se recomenda usar o estilo antigo de blindaxe de\n"
-"ASCII plano para mensaxes encriptados. Non cumple con o\n"
-"RFC 3156 - Seguridade MIME con OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "configuración das accions"
@@ -4395,17 +4004,17 @@ msgstr " Axuda sintaxis "
 msgid "Registered actions"
 msgstr "Accions rexistradas"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Arriba"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nova)"
 
@@ -4448,837 +4057,31 @@ msgstr "Borrar acción"
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quere borrar esta acción?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Carpeta"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Creando fiestra de preferencias comuns...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Preferencias comuns"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citar"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Ver"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Mensaxe"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Outras"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Usar un programa externo para incorporar"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Comando"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Incorporar do almacén"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrar ó incorporar"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Comprobar correo novo"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "cada"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Comproba correo novo ó inicio"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Actualizar todas as carpetas locales despois de incorporar"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Obtendo o número de novas mensaxes (asT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Usar programa externo para enviar"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Gardar mensaxes enviados en Saida"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Codificación para enviar"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automático (Recomendado)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "ASCII de 7 bits (US-ASC_II)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Europeo Occidental (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Europeo Occidental (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Centroeuropeo (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Báltico (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Báltico (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grego (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grego (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Cirílico (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turco (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirílico (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirílico (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cirílico (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirílico (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Xaponés (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Xaponés (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Xaponés (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Chines simplificado (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Chines simplificado (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Chines tradicional (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Chines tradicional (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chines (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tailandés (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tailandés (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Si se selecciona `Automático' utilizarase a\n"
-"codificación óptima para a localización actual."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Codificación de transferencia"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Especificar a codificación de transferencia (Content-Transfer-Encoding)\n"
-"cando o corpo do mensaxe conten caracteres non-ASCII."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Separador de sinatura"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Inserir automáticamente"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Lanzar o editor externo automáticamente"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Niveles de desfacer"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Recortar mensaxes ós"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "caracteres"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Recortar citación"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Recortar mentras se escribe"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Recortar antes de enviar"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Seleccionar automáticamente a conta para respostar"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citar a mensaxe ó respostar"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "o botón Respostar invoca respostar á lista de correo"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Formato de réplica"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Marca de citación"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Formato de reenvio"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Descripción de símbolos "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Fonte"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Traducir cabeceiras (como `Dende:', `Asunto:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Ver o número de non leídas xunto ó nome da carpeta"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Abreviar nomes de grupos con mais de"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "letras"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Vista resumo"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Expandir fíos"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Formato de data"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Elementos visibles no resumo... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Permitir cores na mensaxe"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Mostrar alfabéticos e numéricos multi-byte como\n"
-"caracteres ASCII (só para Xaponés)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "cabeceiras breves na vista da mensaxe"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "cabeceiras breves na vista da mensaxe"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Interlineado"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(s)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Desplazamento"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Media páxina"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Desplazamiento suave"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Paso"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "Redimensionar as imáxes adxuntas"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Ver propiedades de cabeceiras"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Executar"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Executar"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Carpeta"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrar mensaxes ó recibir"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Comprobar as sinaturas automáticamente"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Mostrar diálogo de comprobación de sinatura"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Manter contrasinal en memoria temporalmente"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Expirar despois de"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minuto(s) "
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Poniendo '0' mantendrá a contraseña\n"
-" durante toda a sesión)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Capturar a entrada mentras se introducen contrasinais"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Mostrar aviso no inicio si non funciona GnuPG"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Abrir a primeira mensaxe non leída ó abrir unha carpeta"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Marcar mensaxe como leída só ó abrila nunha fiestra nova"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Abrir entrada despois de recibir correo novo"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Os mensaxes marcaránse hasta a execución\n"
-" si está desactivado)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Diálogo de recepción"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Mostrar diálogo de recepción"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Sempre"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nunca"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Non mostrar diálogo de erro si hai erros de recepción"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Mostrar diálogo de recepción ó finalizar"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Establecer atallos de teclado... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Comandos externos (%s se sustituirá con o nome de ficheiro / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Navegador web"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Engadir dirección ó destino con doble click"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Ó sair"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Confirmar ó sair"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Baleirar papeleira ó sair"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Preguntar antes de baleirar"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Avisar si existen mensaxes na cola"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Escribindo caché resumo (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "o dia da semana abreviado"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "o dia da semana completo"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "o nome do mes abreviado"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "o nome do mes completo"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "a data e hora preferida para a localización actual"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "o número de século (año/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "o dia do mes como número decimal"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "a hora como número usando o reloxo de 24 horas"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "a hora como número usando o reloxo de 12 horas"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "o dia do ano como número decimal"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "o mes como número decimal"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "o minuto como número decimal"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM o PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "o segundo como número decimal"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "o dia da semana como número decimal"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "a data preferida para a localización actual"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "os dous últimos díxitos do ano"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "o ano como número decimal"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "zona horaria ou nome ou abreviatura"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Especificador"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Descripción"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Exemplo"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Cores do mensaxe"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Cores"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Texto citado - Primer nivel"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Texto citado - Segundo nivel"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Texto citado - Tercer nivel"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Enlace URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Reutilizar cores de citación"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Escoller cor para o nivel de citado 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Escoller cor para o nivel de citado 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Escoller cor para o nivel de citado 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Escoller cor para URIs"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Descripción de símbolos"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Data\n"
-"Dende\n"
-"Nome completo do remitente\n"
-"Nome do remitente\n"
-"Inicial do remitente\n"
-"Asunto\n"
-"Para\n"
-"Cc\n"
-"Grupos de novas\n"
-"ID-Mensaxe"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Si x está, mostra expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Corpo da mensaxe\n"
-"Corpo da mensaxe citado\n"
-"Corpo da mensaxe sen sinatura\n"
-"Corpo da mensaxe citado sen sinatura\n"
-"o carácter %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Carácter barra invertida\n"
-"Carácter de interrogación\n"
-"Carácter chave aberta\n"
-"Carácter chave pechada"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Atallos de teclado"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Selecciona o conxunto de atallos de teclado.\n"
-"Se poden modificar tamén os atallos dos menús pulsando\n"
-"calquer tecla(s) ó situar o ratón sobre o elemento do menú."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Por defecto"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Antigos de Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Configuración de cabeceiras de usuario"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Cabeceira"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Borrar "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "cabeceiras de usuario"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Non se estableceu o nome de cabeceira"
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Borrar cabeceira"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "¿Quere borrar realmente esta cabeceira?"
 
@@ -5326,12 +4129,21 @@ msgstr "Preferencias de filtrado"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Editar"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "¿Quere borrar realmente esta regra?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Sen título"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Borrar regra"
 
@@ -5420,6 +4232,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5561,6 +4377,10 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr "Aplicar en subcarpetas"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Establecer os seguintes enderezos automáticamente"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "utilizar tamén ó respostar"
@@ -5634,64 +4454,46 @@ msgstr "Elementos visibles"
 msgid " Revert to default "
 msgstr " Valores por defecto "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Nome de plantilla"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Rexistrar"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Substituír "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Plantilas rexistradas"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Plantilas"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Error de formato na plantilla."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "¿Quere borrar realmente esta plantilla?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "no se pode abrir o ficheiro de marcas\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "non se pode obter o mensaxe %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "o comando de impresión non é válido: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Creando diálogo de progreso...\n"
@@ -5700,29 +4502,21 @@ msgstr "Creando diálogo de progreso...\n"
 msgid "Status"
 msgstr "Estado"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "ocurriu un erro mentras se obtían datos.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Non se pode escribir ó ficheiro.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Non atopo o ID de usuario para esta clave."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Sinatura feita en %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Error ó verificar a sinatura"
 
@@ -5748,6 +4542,10 @@ msgstr "ID tecla"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Outras"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Engadir clave"
@@ -5768,85 +4566,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Cabeceira corrupta no mensaxe en cola.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Non se pode executar o comando externo: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ocurriu un erro mentras se enviaba o correo."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con o servidor SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Ocurriu un erro enviando as mensaxes."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5948,32 +4746,20 @@ msgstr "Sinatura INVÁLIDA"
 msgid "No public key to verify the signature"
 msgstr "Non hai clave pública para verificar a sinatura"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH non está disponible\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "ocurriu algún erro na sesión SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Creando fiestra de fonte...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Fonte da mensaxe"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Mostrando a fonte de %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Fonte"
@@ -6370,6 +5156,905 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Hai Fiestras de composición abertas.\n"
+#~ "Peche todas as fiestras de composición antes de editar as contas."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Abrindo fiestra de edición de conta...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Creando fiestra de edición de conta...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Editar contas"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "A orde de comprobación de mensaxes será este. Marque as casilas\n"
+#~ "na columna `G' para activar a descarga mediante `Traer todo'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protocolo"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " conta por defecto "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "¿Realmente quere borrar esta conta?"
+
+#~ msgid "Delete account"
+#~ msgstr "Borrar conta"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Abrindo Fiestra de preferencias de conta...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "conta%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Preferencias para unha nova conta"
+
+#~ msgid "Account preferences"
+#~ msgstr "Preferencias da conta"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Creando Fiestra de preferencias de conta...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Recibir"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacidad"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzadas"
+
+#~ msgid "Name of this account"
+#~ msgstr "Nome desta conta"
+
+#~ msgid "Set as default"
+#~ msgstr "conta por defecto"
+
+#~ msgid "Personal information"
+#~ msgstr "Información persoal"
+
+#~ msgid "Full name"
+#~ msgstr "Nome completo"
+
+#~ msgid "Mail address"
+#~ msgstr "Enderezo de correo"
+
+#~ msgid "Organization"
+#~ msgstr "Organización"
+
+#~ msgid "Server information"
+#~ msgstr "Información do servidor"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Novas (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Ningunha (local)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Este servidor require autenticación"
+
+#~ msgid "News server"
+#~ msgstr "Servidor de novas"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Servidor de recepción"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Servidor SMTP (enviar)"
+
+#~ msgid "User ID"
+#~ msgstr "Usuario"
+
+#~ msgid "Password"
+#~ msgstr "Contrasinal"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Este servidor require autenticación"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Eliminar mensaxes do servidor ó recibir"
+
+#~ msgid "Remove after"
+#~ msgstr "Eliminar despois de"
+
+#~ msgid "days"
+#~ msgstr "días"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 días: eliminar inmediatamente)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Descargar todas as mensaxes do servidor"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Tamaño límite para recibir"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrar mensaxes ó recibir"
+
+#~ msgid "Default inbox"
+#~ msgstr "Caixa de correo por defecto"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Método de autenticación"
+
+#~ msgid "Automatic"
+#~ msgstr "Automática"
+
+#~ msgid "News"
+#~ msgstr "Novas"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Número máximo de artigos a descargar\n"
+#~ "(sen límite si se especifica 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Non se especificou o destinatario."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Engadir campo Data"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Xenerar ID-Mensaxe"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Engadir cabeceira de usuario"
+
+#~ msgid " Edit... "
+#~ msgstr " Editar... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticación"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Autenticación SMTP (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Si deixa estes campos valeiros, utilizaráse o mesmo\n"
+#~ "ID de usuario e contrasinal usados para a recepción."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autenticación con POP3 antes de enviar"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Saida do comando"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Respostar a"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Asinar a mensaxe por defecto"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Encriptar a mensaxe por defecto"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Usar formato ASCII blindado para encriptación"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Usar sinatura de texto claro"
+
+#~ msgid "Sign key"
+#~ msgstr "Asinar clave"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Usar clave GnuPG por defecto"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Seleccionar clave por dirección de correo"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Especificar clave manualmente"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Usuario ou ID clave:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Non usar SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Usar SSL para a conexión POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Usar o comando STARTTLS para abrir a sesión SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Usar SSL para a conexión IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Usar SSL para a conexión NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Enviar (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Usar SSL para a conexión SMTP"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Porto SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Porto POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Porto IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Porto NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Nome do dominio"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Directorio do servidor IMAP4"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Poñer mensaxes enviadas en"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Poñer borradores de mensaxes en"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Poñer mensaxes borradas en"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Non se especificou o nome de conta."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Non se especificou o enderezo de correo."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Non se especificou o servidor SMTP."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Non se especificou o usuario."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Non se especificou o servidor POP3."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Non se especificou o servidor IMAP4."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Non se especificou o servidor NNTP."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Non se recomenda usar o estilo antigo de blindaxe de\n"
+#~ "ASCII plano para mensaxes encriptados. Non cumple con o\n"
+#~ "RFC 3156 - Seguridade MIME con OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Creando fiestra de preferencias comuns...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Preferencias comuns"
+
+#~ msgid "Quote"
+#~ msgstr "Citar"
+
+#~ msgid "Display"
+#~ msgstr "Ver"
+
+#~ msgid "Message"
+#~ msgstr "Mensaxe"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Usar un programa externo para incorporar"
+
+#~ msgid "Command"
+#~ msgstr "Comando"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Incorporar do almacén"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrar ó incorporar"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Comprobar correo novo"
+
+#~ msgid "every"
+#~ msgstr "cada"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto(s)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Comproba correo novo ó inicio"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Actualizar todas as carpetas locales despois de incorporar"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Obtendo o número de novas mensaxes (asT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Usar programa externo para enviar"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Gardar mensaxes enviados en Saida"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Codificación para enviar"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automático (Recomendado)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "ASCII de 7 bits (US-ASC_II)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Europeo Occidental (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Europeo Occidental (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Centroeuropeo (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Báltico (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Báltico (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grego (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grego (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Cirílico (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turco (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cirílico (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cirílico (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cirílico (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cirílico (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Xaponés (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Xaponés (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Xaponés (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Chines simplificado (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Chines simplificado (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Chines tradicional (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Chines tradicional (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chines (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Coreano (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tailandés (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tailandés (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Si se selecciona `Automático' utilizarase a\n"
+#~ "codificación óptima para a localización actual."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Codificación de transferencia"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Especificar a codificación de transferencia (Content-Transfer-Encoding)\n"
+#~ "cando o corpo do mensaxe conten caracteres non-ASCII."
+
+#~ msgid "Signature separator"
+#~ msgstr "Separador de sinatura"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Inserir automáticamente"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Lanzar o editor externo automáticamente"
+
+#~ msgid "Undo level"
+#~ msgstr "Niveles de desfacer"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Recortar mensaxes ós"
+
+#~ msgid "characters"
+#~ msgstr "caracteres"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Recortar citación"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Recortar mentras se escribe"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Recortar antes de enviar"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Seleccionar automáticamente a conta para respostar"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citar a mensaxe ó respostar"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "o botón Respostar invoca respostar á lista de correo"
+
+#~ msgid "Reply format"
+#~ msgstr "Formato de réplica"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Marca de citación"
+
+#~ msgid "Forward format"
+#~ msgstr "Formato de reenvio"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Descripción de símbolos "
+
+#~ msgid "Font"
+#~ msgstr "Fonte"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Traducir cabeceiras (como `Dende:', `Asunto:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Ver o número de non leídas xunto ó nome da carpeta"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Abreviar nomes de grupos con mais de"
+
+#~ msgid "letters"
+#~ msgstr "letras"
+
+#~ msgid "Summary View"
+#~ msgstr "Vista resumo"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
+
+#~ msgid "Expand threads"
+#~ msgstr "Expandir fíos"
+
+#~ msgid "Date format"
+#~ msgstr "Formato de data"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Elementos visibles no resumo... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Permitir cores na mensaxe"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Mostrar alfabéticos e numéricos multi-byte como\n"
+#~ "caracteres ASCII (só para Xaponés)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "cabeceiras breves na vista da mensaxe"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "cabeceiras breves na vista da mensaxe"
+
+#~ msgid "Line space"
+#~ msgstr "Interlineado"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(s)"
+
+#~ msgid "Scroll"
+#~ msgstr "Desplazamento"
+
+#~ msgid "Half page"
+#~ msgstr "Media páxina"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Desplazamiento suave"
+
+#~ msgid "Step"
+#~ msgstr "Paso"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Redimensionar as imáxes adxuntas"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Ver propiedades de cabeceiras"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Executar"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Executar"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Carpeta"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrar mensaxes ó recibir"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Comprobar as sinaturas automáticamente"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Mostrar diálogo de comprobación de sinatura"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Manter contrasinal en memoria temporalmente"
+
+#~ msgid "Expired after"
+#~ msgstr "Expirar despois de"
+
+#~ msgid "minute(s) "
+#~ msgstr "minuto(s) "
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Poniendo '0' mantendrá a contraseña\n"
+#~ " durante toda a sesión)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Capturar a entrada mentras se introducen contrasinais"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Mostrar aviso no inicio si non funciona GnuPG"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Abrir a primeira mensaxe non leída ó abrir unha carpeta"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Marcar mensaxe como leída só ó abrila nunha fiestra nova"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Abrir entrada despois de recibir correo novo"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Os mensaxes marcaránse hasta a execución\n"
+#~ " si está desactivado)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Diálogo de recepción"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Mostrar diálogo de recepción"
+
+#~ msgid "Always"
+#~ msgstr "Sempre"
+
+#~ msgid "Never"
+#~ msgstr "Nunca"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Non mostrar diálogo de erro si hai erros de recepción"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Mostrar diálogo de recepción ó finalizar"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Establecer atallos de teclado... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Comandos externos (%s se sustituirá con o nome de ficheiro / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Navegador web"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Engadir dirección ó destino con doble click"
+
+#~ msgid "On exit"
+#~ msgstr "Ó sair"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Confirmar ó sair"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Baleirar papeleira ó sair"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Preguntar antes de baleirar"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Avisar si existen mensaxes na cola"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Escribindo caché resumo (%s)..."
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "o dia da semana abreviado"
+
+#~ msgid "the full weekday name"
+#~ msgstr "o dia da semana completo"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "o nome do mes abreviado"
+
+#~ msgid "the full month name"
+#~ msgstr "o nome do mes completo"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "a data e hora preferida para a localización actual"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "o número de século (año/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "o dia do mes como número decimal"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "a hora como número usando o reloxo de 24 horas"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "a hora como número usando o reloxo de 12 horas"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "o dia do ano como número decimal"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "o mes como número decimal"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "o minuto como número decimal"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM o PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "o segundo como número decimal"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "o dia da semana como número decimal"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "a data preferida para a localización actual"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "os dous últimos díxitos do ano"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "o ano como número decimal"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "zona horaria ou nome ou abreviatura"
+
+#~ msgid "Specifier"
+#~ msgstr "Especificador"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
+#~ msgid "Example"
+#~ msgstr "Exemplo"
+
+#~ msgid "Set message colors"
+#~ msgstr "Cores do mensaxe"
+
+#~ msgid "Colors"
+#~ msgstr "Cores"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Texto citado - Primer nivel"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Texto citado - Segundo nivel"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Texto citado - Tercer nivel"
+
+#~ msgid "URI link"
+#~ msgstr "Enlace URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Reutilizar cores de citación"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Escoller cor para o nivel de citado 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Escoller cor para o nivel de citado 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Escoller cor para o nivel de citado 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Escoller cor para URIs"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Descripción de símbolos"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Data\n"
+#~ "Dende\n"
+#~ "Nome completo do remitente\n"
+#~ "Nome do remitente\n"
+#~ "Inicial do remitente\n"
+#~ "Asunto\n"
+#~ "Para\n"
+#~ "Cc\n"
+#~ "Grupos de novas\n"
+#~ "ID-Mensaxe"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Si x está, mostra expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Corpo da mensaxe\n"
+#~ "Corpo da mensaxe citado\n"
+#~ "Corpo da mensaxe sen sinatura\n"
+#~ "Corpo da mensaxe citado sen sinatura\n"
+#~ "o carácter %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Carácter barra invertida\n"
+#~ "Carácter de interrogación\n"
+#~ "Carácter chave aberta\n"
+#~ "Carácter chave pechada"
+
+#~ msgid "Key bindings"
+#~ msgstr "Atallos de teclado"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Selecciona o conxunto de atallos de teclado.\n"
+#~ "Se poden modificar tamén os atallos dos menús pulsando\n"
+#~ "calquer tecla(s) ó situar o ratón sobre o elemento do menú."
+
+#~ msgid "Default"
+#~ msgstr "Por defecto"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Antigos de Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Selección de fonte"
 
@@ -6731,9 +6416,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Establecendo controles..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Movendo mensaxe %s%c%d a %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tMarcando as mensaxes..."
 
diff --git a/po/hr.po b/po/hr.po
index e2158e52..c3c97035 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,407 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Čitam konfiguracije za svaki račun...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Direktorij IMAP poslužitelja"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr ""
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Šaljem poruku (%d / %d bytea)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Premještam poruke %s%c%d u %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopiram poruke %s%c%d u %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Primam poruke sa %s u %s...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "ne mogu postaviti obrisane oznake: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "ne mogu obrisati\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Primam poruke sa %s u %s...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "ne mogu odabrati spis: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Označena datoteka ne postoji.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "došlo je do greške prilikom dobivanja LISTe.\n"
+
+#: libsylph/imap.c:1981
+#, fuzzy, c-format
+msgid "Can't create '%s'\n"
+msgstr "ne mogu kreirati %s\n"
+
+#: libsylph/imap.c:1986
+#, fuzzy, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "ne mogu kreirati %s\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "ne mogu kreirati sandučić: LIST nije uspio\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "ne mogu kreirati sandučić\n"
+
+#: libsylph/imap.c:2163
+#, fuzzy, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "ne mogu kreirati sandučić\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "ne mogu obrisati sandučić\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "ne mogu dobiti omot\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Šaljem poruku (%d / %d bytea)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "došlo je do greške prilikom dobivanja omota.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "ne mogu analizirati omot: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
+
+#: libsylph/imap.c:2460
+#, fuzzy, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "ne mogu dobiti namespace\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "ne mogu odabrati spis: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Autorizacija"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 login propao.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "ne mogu pričvrstiti %s na %s\n"
+
+#: libsylph/imap.c:3593
+#, fuzzy
+msgid "(sending file...)"
+msgstr "Šaljem DATA..."
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "ne mogu obilježiti poruku %s\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "ne mogu kopirati %d u %s\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "greška prilikom imap naredbe: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "greška prilikom imap naredbe: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "greška prilikom imap naredbe: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr ""
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr ""
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "ne mogu kopirati poruku %s u %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Ne mogu otvoriti označenu datoteku.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "izvorni spis jednak je destinaciji.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopiram poruke %s%c%d u %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Posljednji broj u direktoriju %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Datoteka `%s' već postoji.\n"
+"Ne mogu stvoriti spis."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "uspostavljam NNTP vezu s %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP veza s %s:%d je pukla. Povezujem ponovo...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "članak %d već je pohranjen.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "primam članak %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "ne mogu pročitati članak %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "ne mogu primiti listu news grupa\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "ne mogu poslati članak.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "ne mogu primiti članak %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "ne mogu odabrati grupu %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "pogrešan opseg članaka: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "nema novih članaka.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "primam xover %d - %d u %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "ne mogu dobiti xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "došlo je do greške prilikom dobivanja xovera.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "pogrešna xover linija: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "ne mogu dobiti xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "došlo je do greške prilikom dobivanja xhdra.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Ne mogu uspostaviti vezu s NNTP poslužiteljem: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protokol greška: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protokol greška\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Došlo je do greške prilikom slanja\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Došlo je do greške pri radu s poštom."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Nužni APOP timestamp nije pronađen u pozdravu\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Syntax greška u timestampu kod pozdrava\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 protokol greška\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "pogrešna xover linija: %s\n"
+
+#: libsylph/pop.c:616
+#, fuzzy, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "Brišim duplicirane poruke..."
+
+#: libsylph/pop.c:624
+#, fuzzy, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "Šaljem poruku (%d / %d bytea)"
+
+#: libsylph/pop.c:655
+#, fuzzy
+msgid "mailbox is locked\n"
+msgstr "Postavke sandučića"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+#, fuzzy
+msgid "can't start TLS session\n"
+msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "greška prilikom ovjeravanja\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Naredba"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "greška prilikom ovjeravanja\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +424,55 @@ msgstr "Pronađen %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Spis"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "ne mogu otvoriti obilježenu datoteku\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "ne mogu dohvatiti poruku %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Ne mogu dobiti dio tekst\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Naredba za ispis nije dobra: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "došlo je do greške prilikom prihvaćanja podataka.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Ne mogu pisati u datoteku.\n"
+
+#: libsylph/smtp.c:156
+#, fuzzy
+msgid "SMTP AUTH not available\n"
+msgstr "TLSv1 nije dostupan\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "greška prilikom ovjeravanja\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nije dostupan\n"
@@ -162,78 +605,6 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Čitam konfiguracije za svaki račun...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Neki prozori za pisanje pisma su otvoreni.\n"
-"Molim, zatvorite sve prozore prije uređivanja računa."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Otvaram prozor za uređivanje računa...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Stvaram prozor za uređivanje računa...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Uredi račune"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nove poruke biti će provjerene ovim redom. Označite pod\n"
-"S one račune s kojih želite skinuti poštu sa `Primi sve'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Ime"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Poslužitelj"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Uredi"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Postavi kao uobičajeni račun "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Želite li usitinu obrisati ovaj račun?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neimenovano"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Obriši račun"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -328,6 +699,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Ime"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -342,8 +721,8 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datoteka"
 
@@ -365,9 +744,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -383,7 +762,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -415,8 +794,8 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Alati"
 
@@ -424,13 +803,13 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
@@ -447,17 +826,17 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Uredi"
 
@@ -469,7 +848,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adresar"
 
@@ -479,14 +858,14 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Obriši"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -497,11 +876,11 @@ msgid "Lookup"
 msgstr "Potraži"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -527,7 +906,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -633,7 +1012,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Sučelje"
 
@@ -653,8 +1032,7 @@ msgstr "E-mail adresa"
 msgid "Group"
 msgstr "Grupa"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Spis"
 
@@ -679,15 +1057,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Obavijest"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Greška"
 
@@ -742,8 +1120,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
@@ -788,8 +1166,8 @@ msgstr "/_Uredi/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
@@ -797,7 +1175,7 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
@@ -810,7 +1188,7 @@ msgstr "/_Uredi/U_baci"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
@@ -827,7 +1205,7 @@ msgstr "/_Uredi/Sažmi sve duge _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pregled"
@@ -853,9 +1231,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -874,7 +1252,7 @@ msgstr "/_Pregled/Pr_egledaj izvor"
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
@@ -886,127 +1264,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
@@ -1016,15 +1394,15 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
@@ -1049,10 +1427,6 @@ msgstr "/_Poruka/_Kriptiraj"
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Ne mogu dobiti dio tekst\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
@@ -1129,7 +1503,7 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
@@ -1219,8 +1593,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Pošalji"
 
@@ -1260,8 +1633,7 @@ msgstr "Priloži"
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Potpis"
 
@@ -1269,7 +1641,7 @@ msgstr "Potpis"
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Uređivač"
 
@@ -1469,7 +1841,7 @@ msgstr "Promjeni"
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Iznos"
 
@@ -1502,7 +1874,6 @@ msgid " Check File "
 msgstr " Provjeri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Datoteka"
 
@@ -1558,12 +1929,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -1580,7 +1951,7 @@ msgid "Edit JPilot Entry"
 msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1644,7 +2015,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -1701,7 +2072,6 @@ msgid "Exporting file:"
 msgstr "Iznosim datoteku:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -1725,171 +2095,171 @@ msgstr "Prepisati postojeću datoteku?"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi spis..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Obriši spis"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Pribilježi se na _news grupu..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Ukloni news _grupu"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1899,21 +2269,21 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1924,21 +2294,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1947,35 +2317,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2036,7 +2406,7 @@ msgstr "%d news grupa primljeno (%s pročitano)"
 msgid "Newsgroups:"
 msgstr "News grupe:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -2060,166 +2430,6 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Direktorij IMAP poslužitelja"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr ""
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "ne mogu postaviti obrisane oznake: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "ne mogu obrisati\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "ne mogu odabrati spis: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Označena datoteka ne postoji.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "došlo je do greške prilikom dobivanja LISTe.\n"
-
-#: src/imap.c:1944
-#, fuzzy, c-format
-msgid "Can't create '%s'\n"
-msgstr "ne mogu kreirati %s\n"
-
-#: src/imap.c:1949
-#, fuzzy, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "ne mogu kreirati %s\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "ne mogu kreirati sandučić: LIST nije uspio\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "ne mogu kreirati sandučić\n"
-
-#: src/imap.c:2126
-#, fuzzy, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "ne mogu kreirati sandučić\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "ne mogu obrisati sandučić\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "ne mogu dobiti omot\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "došlo je do greške prilikom dobivanja omota.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "ne mogu analizirati omot: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
-
-#: src/imap.c:2404
-#, fuzzy, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "ne mogu dobiti namespace\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "ne mogu odabrati spis: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Autorizacija"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 login propao.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "ne mogu pričvrstiti %s na %s\n"
-
-#: src/imap.c:3535
-#, fuzzy
-msgid "(sending file...)"
-msgstr "Šaljem DATA..."
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "ne mogu obilježiti poruku %s\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "ne mogu kopirati %d u %s\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "greška prilikom imap naredbe: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "greška prilikom imap naredbe: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "greška prilikom imap naredbe: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr ""
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr ""
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Uvezi"
@@ -2327,7 +2537,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -2345,206 +2555,206 @@ msgstr "Atributi korisnika"
 msgid "Finish"
 msgstr ""
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:162
+#: src/inc.c:161
 msgid "Sylpheed"
 msgstr ""
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:555
+#: src/inc.c:554
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:630
+#: src/inc.c:629
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:639
+#: src/inc.c:638
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -2562,78 +2772,69 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Datoteka `%s' već postoji.\n"
-"Ne mogu stvoriti spis."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread nije podržan od glib-a.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prima sve poruke sa svih računa"
 
-#: src/main.c:328
+#: src/main.c:338
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikazuje ovu pomoć i izlazi"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2647,19 +2848,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Pisanje poruke postoji. Uistinu prekinuti?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
 
-#: src/main.c:561
+#: src/main.c:574
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2669,729 +2870,729 @@ msgstr ""
 "OpenPGP podrška je onemogućena."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Spis/Kreiraj _novi spis..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Spis/_Obriši spis"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unesi mbox datoteku"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvezi u mbox datoteku..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Is_piši..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Uredi/P_ronađi u poruci"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/_Stablo spisa"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/_Traka alata"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/_Traka alata/Slike i tekst"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo spisa"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/_Održavanje/Pos_loži/Posloži po _broju"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/_Održavanje/Pos_loži/Posloži po _pošiljatelju"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Održavanje/Pos_loži/Posloži po _temi"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Održavanje/Pos_loži/Posloži oznaci _boje"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Održavanje/Pos_loži/Posloži po _oznaci"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Održavanje/Pos_loži/Posloži po _prilogu"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Održavanje/Pos_loži/P_rivuci po temi"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "Raširi stablo"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Održavanje/Postavi po_jedinosti prikaza"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Održavanje/Idi pre_ma/Prethodna _nepročitana poruka"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Održavanje/Idi pre_ma/_Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Održavanje/P_rethodna označena poruka"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _označena poruka"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Održavanje/Idi pre_ma/Pre_thodna label poruka"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Pošta/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Pošta/Prem_jesti..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Pošta/Kopir_aj"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Pošta/O_briši"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Pošta/O_znači"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Pošta/O_znači/_Označi"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Pošta/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Pošta/O_znači/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Pošta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Pošta/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Održavanje/_Obriši duplicirane poruke"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/_Izvrši"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni račun..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi račun..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni račun"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_O"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3401,16 +3602,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3419,156 +3620,155 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3686,34 +3886,34 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Potraga završena"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Kreiram pregled poruka...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 #, fuzzy
 msgid "Attachments"
 msgstr "Prilog"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3722,7 +3922,7 @@ msgstr ""
 "Unesite naredbu za ispis:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3731,41 +3931,6 @@ msgstr ""
 "Naredba za ispis je pogrešna:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "ne mogu kopirati poruku %s u %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Ne mogu otvoriti označenu datoteku.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "izvorni spis jednak je destinaciji.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopiram poruke %s%c%d u %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Posljednji broj u direktoriju %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Otvori"
@@ -3852,116 +4017,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Naredba MIME preglednika nije ispravna: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "uspostavljam NNTP vezu s %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP veza s %s:%d je pukla. Povezujem ponovo...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "članak %d već je pohranjen.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "primam članak %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "ne mogu pročitati članak %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "ne mogu primiti listu news grupa\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "ne mogu poslati članak.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "ne mogu primiti članak %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "ne mogu odabrati grupu %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "pogrešan opseg članaka: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "nema novih članaka.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "primam xover %d - %d u %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "ne mogu dobiti xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "došlo je do greške prilikom dobivanja xovera.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "pogrešna xover linija: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "ne mogu dobiti xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "došlo je do greške prilikom dobivanja xhdra.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Ne mogu uspostaviti vezu s NNTP poslužiteljem: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protokol greška: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protokol greška\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Došlo je do greške prilikom slanja\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Došlo je do greške pri radu s poštom."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Lozinka"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[nema ID korinika]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3974,7 +4038,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3982,463 +4046,6 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Nužni APOP timestamp nije pronađen u pozdravu\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Syntax greška u timestampu kod pozdrava\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 protokol greška\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "pogrešna xover linija: %s\n"
-
-#: src/pop.c:616
-#, fuzzy, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "Brišim duplicirane poruke..."
-
-#: src/pop.c:624
-#, fuzzy, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "Šaljem poruku (%d / %d bytea)"
-
-#: src/pop.c:655
-#, fuzzy
-msgid "mailbox is locked\n"
-msgstr "Postavke sandučića"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-#, fuzzy
-msgid "can't start TLS session\n"
-msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "greška prilikom ovjeravanja\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Naredba"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "greška prilikom ovjeravanja\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Otvaram prozor za postavke računa...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Račun%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Postavke za novi račun"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Postavke računa"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Kreiram prozor za postvake računa...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Primanje"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privatnost"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Napredno"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Ime ovog računa"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Postavi kao uobičajeni"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Osobne informacije"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Puno ime"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-mail adresa"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizacija"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informacije o poslužitelju"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Ništa (lokalno)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Ovaj server zahtijeva autorizaciju"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "News poslužitelj"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Poslužitelj za primanje"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP poslužitelj (slanje)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "ID korisnika"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Lozinka"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Ovaj server zahtijeva autorizaciju"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Ukloni poruke sa poslužitelja nakon primanja"
-
-#: src/prefs_account.c:1045
-#, fuzzy
-msgid "Remove after"
-msgstr "Ukloni spis"
-
-#: src/prefs_account.c:1054
-#, fuzzy
-msgid "days"
-msgstr "Uvijek"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr ""
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Primi sve poruke sa poslužitelja"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr ""
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtriraj poruke pri primanju"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Uobičajeni sandučić"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-#, fuzzy
-msgid "Authentication method"
-msgstr "Autorizacija"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr ""
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "News"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maksimalni broj članaka za skidanje\n"
-"(0 je za neograničeno)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Nije upisan primatelj."
-
-#: src/prefs_account.c:1188
-#, fuzzy
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Primi sve' uzima poštu s ovog računa"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Zaglavlje"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Dodaj polje Datum u zaglavlje"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generiraj ID poruke"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Dodatna zaglavlja"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Uredi... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autorizacija"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP autorizacija (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autoriziraj s POP3 prije slanja"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Naredba"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Automatski postavi slijedeće adrese"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Odvovori-Na"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Uvijek potpiši poruke"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Uvijek kriptiraj poruke"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr ""
-
-#: src/prefs_account.c:1526
-#, fuzzy
-msgid "Use clear text signature"
-msgstr "Unesi potpis"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Ključ potpisa"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Koristi uobičajeni GnuPG ključ"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Odaberi ključ po e-mail adresi"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Neki drugi ključ"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "ID ključa ili korisnika:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Ne koristi SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Koristi SSL za POP3 veze"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Koristi SSL za IMAP4 veze"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr ""
-
-#: src/prefs_account.c:1708
-#, fuzzy
-msgid "Use SSL for NNTP connection"
-msgstr "Koristi SSL za SMTP veze"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Slanje (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Koristi SSL za SMTP veze"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Specificirani SMTP port"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Specificirani POP3 port"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Specificirani IMAP4 port"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Specificirani NNTP port"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Specificirano ime domene"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Direktorij IMAP poslužitelja"
-
-#: src/prefs_account.c:1916
-#, fuzzy
-msgid "Put sent messages in"
-msgstr "Spremi poslane poruke u poslano"
-
-#: src/prefs_account.c:1918
-#, fuzzy
-msgid "Put draft messages in"
-msgstr "Sažmi poruke na"
-
-#: src/prefs_account.c:1920
-#, fuzzy
-msgid "Put deleted messages in"
-msgstr "Obriši poruku/e"
-
-#: src/prefs_account.c:1981
-#, fuzzy
-msgid "Account name is not entered."
-msgstr "E-mail adresa nije upisana."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "E-mail adresa nije upisana."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP poslužitelj nije upisan."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "ID korisnika nije upisan."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3 poslužitelj nije upisan."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4 poslužitelj nije upisan."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP poslužitelj nije upisan."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4490,17 +4097,17 @@ msgstr ""
 msgid "Registered actions"
 msgstr "Registrirani obrasci"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Gore"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Dolje"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -4544,830 +4151,31 @@ msgstr "Obriši račun"
 msgid "Do you really want to delete this action?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Spis"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Stvaram prozor za uobičajene postavke...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Uobičajene postavke"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Prikaz"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Pošta"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Drugo"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Koristi vanjski program za prihvat"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Naredba"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Prihvati sa spoola"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtriraj pri prihvaćanju"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Auto-provjera nove pošte"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "svakih"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuta"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Provjeri poštu prilikom starta"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Osvježi sve spise poslije prihvaćanja"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Primam broj novih poruka (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Koristi vanjski program za slanje"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Spremi poslane poruke u poslano"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Izlazni charset"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatsko (preporučeno)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Zapadno-Europski (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-#, fuzzy
-msgid "Western European (ISO-8859-15)"
-msgstr "Zapadno-Europski (ISO-8859-1)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Srednje-Europski (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Blatički (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Blatički (ISO'8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grčki (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grčki (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Ćirilica (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turski (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Čirilica (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Čirilica (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Čirilica (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Ćirilica (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japanski (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japanski (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japanski (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Pojednostavljeni Kineski (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Pojednostavljeni Kineski (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradicionalni Kineski (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradicionalni Kineski (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Kineski (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korejski (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Ako je `Automatski' odabrano, optimalni charset\n"
-"za locale će biti korišten."
-
-#: src/prefs_common.c:1287
-#, fuzzy
-msgid "Transfer encoding"
-msgstr "Sažmi prije slanja"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Razdjelnik potpisa"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Ubaci automatski"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Automatski pokreni vanjski uređivač"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr ""
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Sažmi poruke na"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "znakova"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Sažmi citat"
-
-#: src/prefs_common.c:1447
-#, fuzzy
-msgid "Wrap on input"
-msgstr "/_Uredi/Sažmi sve duge _linije"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Sažmi prije slanja"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Automatski odaberi račun pri odgovaranju"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citiraj poruku pri odgovaranju"
-
-#: src/prefs_common.c:1463
-#, fuzzy
-msgid "Reply button invokes mailing list reply"
-msgstr "/Odgovori svi_ma"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Format odgovora"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Oznaka citata"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Format prosljeđivanja"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Objašnjenje simbola "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Font"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr ""
-
-#: src/prefs_common.c:1690
-#, fuzzy
-msgid "letters"
-msgstr "Obriši"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Pregled održavanja"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Raširi stablo"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Format datuma"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Postavi pojedinosti prikaza... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Omogući poruke u boji"
-
-#: src/prefs_common.c:1814
-#, fuzzy
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "Prikaži 2-byte abecedu i brojeve s 1-byte znakovima"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Prikaži zaglavlje iznad poruke"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Prikaži kratko zaglavlje na pregledu poruka"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Prikaži kratko zaglavlje na pregledu poruka"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Razmak linija"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(a)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Scroll"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Pola stranice"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Miran scroll"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Korak"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr ""
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Prikaz postavki zaglavlja"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Izvrši"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Izvrši"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Spis"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtriraj poruke pri primanju"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automatski provjeri potpis"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Prikaži potpis u popup prozoru"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr ""
-
-#: src/prefs_common.c:2110
-#, fuzzy
-msgid "Expired after"
-msgstr "Pošalji kasnije"
-
-#: src/prefs_common.c:2123
-#, fuzzy
-msgid "minute(s) "
-msgstr "minuta"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Uhvati unos pri upisivanju lozinke"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "poruka neće biti primljena\n"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Otvori prvu nepročitanu poruku pri ulasku u spis"
-
-#: src/prefs_common.c:2212
-#, fuzzy
-msgid "Only mark message as read when opened in new window"
-msgstr "/_Pošta/O_tvori u novom prozoru"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Idi u sandučić nakon primanja pošte"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Poruke će samo biti označene do izvršenja\n"
-" ako je ovo isključeno)"
-
-#: src/prefs_common.c:2239
-#, fuzzy
-msgid "Receive dialog"
-msgstr "Prikaži dijalog primanja"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Prikaži dijalog primanja"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Uvijek"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nikada"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr ""
-
-#: src/prefs_common.c:2270
-#, fuzzy
-msgid "Close receive dialog when finished"
-msgstr "Prikaži dijalog primanja"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr ""
-
-#: src/prefs_common.c:2333
-#, fuzzy, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Vanjski uređivač (%s predstavlja ime datoteke)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr ""
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Na izlazu"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Potvrdi izlaz"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Isprazni smeće pri izlazu"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Pitaj prije pražnjenja"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Upozori ako ima odloženih poruka"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Pišem pohranu pregleda (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "pojednostavljeno ime tjedna"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "puno ime tjedna"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "skraćeno ime mjeseca"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "puno ime mjeseca"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "željeni datum i vrijeme za trenutni locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "broj stoljeća (godina/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "dan u mjesecu kao decimalni broj"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "sat kao decimalni broj koristeći 24 satno vrijeme"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "sat kao decimalni broj koristeći 12 satno vrijeme"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "dan u godini kao decimalni broj"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "mjesec kao decimalni broj"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minute kao decimalni broj"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AP ili PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekunde kao decimalni broj"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "dan u tjednu kao decimalni broj"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "željeni datum za trenutni locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "posljednje dvije znamenke godine"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "godina kao decimalni broj"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "vremenska zona"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Označitelj"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Opis"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Primjer"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Postavi boje poruka"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Boje"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Citirani tekst - prvi stupanj"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Citirani tekst - drugi stupanj"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Citirani tekst - treći stupanj"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI poveznice"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Ciklički mijenjaj boje citata"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Odaberite boju za citat 1. stupnja"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Odaberite boju za citat 2. stupnja"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Odaberite boju za citat 3. stupnja"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Odaberite boju za URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Obajšnjenje znakova"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Datum\n"
-"Od\n"
-"Puno ime pošiljatelja\n"
-"Ime pošiljatelja\n"
-"Inicijali pošiljatelja\n"
-"Tema\n"
-"Za\n"
-"Cc\n"
-"News grupe\n"
-"ID poruke"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Ako je x odabrano, prikazuje expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-
-#: src/prefs_common.c:3224
-#, fuzzy
-msgid "Key bindings"
-msgstr "Šaljem"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-#, fuzzy
-msgid "Default"
-msgstr "Uobičajeni sandučić"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr ""
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Postaljvanje određenog zaglavlja"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Zaglavlje"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Obriši "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Određeno zaglavlje"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Obriši zaglavlje"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Uistinu obrisati ovo zaglavlje?"
 
@@ -5415,12 +4223,21 @@ msgstr "Postavke filtera"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Uredi"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Uistinu obrisati pravilo?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neimenovano"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
@@ -5509,6 +4326,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5651,6 +4472,10 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr ""
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Automatski postavi slijedeće adrese"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr ""
@@ -5725,64 +4550,46 @@ msgstr "Prikazane pojedinosti"
 msgid " Revert to default "
 msgstr " Vrati na uobičajeno "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Ime obrasca"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Unesi"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Zamjeni "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrirani obrasci"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Obrasci"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Obrazac"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Greška formata obrasca."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Briši obrazac"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "ne mogu otvoriti obilježenu datoteku\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "ne mogu dohvatiti poruku %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Naredba za ispis nije dobra: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Kreiram dijalog napretka...\n"
@@ -5791,29 +4598,21 @@ msgstr "Kreiram dijalog napretka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "došlo je do greške prilikom prihvaćanja podataka.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Ne mogu pisati u datoteku.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Ne mogu naći ID korisnika za ovaj ključ."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, fuzzy, c-format
 msgid "Signature made at %s\n"
 msgstr "Potpis napravio/la %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Greška pri potvrđivanju potpisa"
 
@@ -5839,6 +4638,10 @@ msgstr "ID ključa"
 msgid "Val"
 msgstr "Oznaka"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Drugo"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj ključ"
@@ -5860,88 +4663,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne mogu izvršiti vanjsku naredbu: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP poslužitelj: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autorizacija"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Završavam..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6042,34 +4845,20 @@ msgstr "LOŠ potpis"
 msgid "No public key to verify the signature"
 msgstr "Nema javnog ključa za potvrdu potpisa"
 
-#: src/smtp.c:156
-#, fuzzy
-msgid "SMTP AUTH not available\n"
-msgstr "TLSv1 nije dostupan\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "greška prilikom ovjeravanja\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Kreiram prozor izvora...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Izvorna poruka"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Prikazujem izvor od %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Izvor"
@@ -6474,6 +5263,824 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Neki prozori za pisanje pisma su otvoreni.\n"
+#~ "Molim, zatvorite sve prozore prije uređivanja računa."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Otvaram prozor za uređivanje računa...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Stvaram prozor za uređivanje računa...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Uredi račune"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nove poruke biti će provjerene ovim redom. Označite pod\n"
+#~ "S one račune s kojih želite skinuti poštu sa `Primi sve'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokol"
+
+#~ msgid "Server"
+#~ msgstr "Poslužitelj"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Postavi kao uobičajeni račun "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Želite li usitinu obrisati ovaj račun?"
+
+#~ msgid "Delete account"
+#~ msgstr "Obriši račun"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Otvaram prozor za postavke računa...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Račun%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Postavke za novi račun"
+
+#~ msgid "Account preferences"
+#~ msgstr "Postavke računa"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Kreiram prozor za postvake računa...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Primanje"
+
+#~ msgid "Privacy"
+#~ msgstr "Privatnost"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Name of this account"
+#~ msgstr "Ime ovog računa"
+
+#~ msgid "Set as default"
+#~ msgstr "Postavi kao uobičajeni"
+
+#~ msgid "Personal information"
+#~ msgstr "Osobne informacije"
+
+#~ msgid "Full name"
+#~ msgstr "Puno ime"
+
+#~ msgid "Mail address"
+#~ msgstr "E-mail adresa"
+
+#~ msgid "Organization"
+#~ msgstr "Organizacija"
+
+#~ msgid "Server information"
+#~ msgstr "Informacije o poslužitelju"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Ništa (lokalno)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Ovaj server zahtijeva autorizaciju"
+
+#~ msgid "News server"
+#~ msgstr "News poslužitelj"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Poslužitelj za primanje"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP poslužitelj (slanje)"
+
+#~ msgid "User ID"
+#~ msgstr "ID korisnika"
+
+#~ msgid "Password"
+#~ msgstr "Lozinka"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Ovaj server zahtijeva autorizaciju"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Ukloni poruke sa poslužitelja nakon primanja"
+
+#, fuzzy
+#~ msgid "Remove after"
+#~ msgstr "Ukloni spis"
+
+#, fuzzy
+#~ msgid "days"
+#~ msgstr "Uvijek"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Primi sve poruke sa poslužitelja"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtriraj poruke pri primanju"
+
+#~ msgid "Default inbox"
+#~ msgstr "Uobičajeni sandučić"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
+
+#, fuzzy
+#~ msgid "Authentication method"
+#~ msgstr "Autorizacija"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maksimalni broj članaka za skidanje\n"
+#~ "(0 je za neograničeno)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Nije upisan primatelj."
+
+#, fuzzy
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Primi sve' uzima poštu s ovog računa"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Dodaj polje Datum u zaglavlje"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generiraj ID poruke"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Dodatna zaglavlja"
+
+#~ msgid " Edit... "
+#~ msgstr " Uredi... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autorizacija"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP autorizacija (SMTP AUTH)"
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autoriziraj s POP3 prije slanja"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Naredba"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Odvovori-Na"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Uvijek potpiši poruke"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Uvijek kriptiraj poruke"
+
+#, fuzzy
+#~ msgid "Use clear text signature"
+#~ msgstr "Unesi potpis"
+
+#~ msgid "Sign key"
+#~ msgstr "Ključ potpisa"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Koristi uobičajeni GnuPG ključ"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Odaberi ključ po e-mail adresi"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Neki drugi ključ"
+
+#~ msgid "User or key ID:"
+#~ msgstr "ID ključa ili korisnika:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Ne koristi SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Koristi SSL za POP3 veze"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Koristi SSL za IMAP4 veze"
+
+#, fuzzy
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Koristi SSL za SMTP veze"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Slanje (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Koristi SSL za SMTP veze"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Specificirani SMTP port"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Specificirani POP3 port"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Specificirani IMAP4 port"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Specificirani NNTP port"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Specificirano ime domene"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Direktorij IMAP poslužitelja"
+
+#, fuzzy
+#~ msgid "Put sent messages in"
+#~ msgstr "Spremi poslane poruke u poslano"
+
+#, fuzzy
+#~ msgid "Put draft messages in"
+#~ msgstr "Sažmi poruke na"
+
+#, fuzzy
+#~ msgid "Put deleted messages in"
+#~ msgstr "Obriši poruku/e"
+
+#, fuzzy
+#~ msgid "Account name is not entered."
+#~ msgstr "E-mail adresa nije upisana."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "E-mail adresa nije upisana."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP poslužitelj nije upisan."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "ID korisnika nije upisan."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3 poslužitelj nije upisan."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4 poslužitelj nije upisan."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP poslužitelj nije upisan."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Stvaram prozor za uobičajene postavke...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Uobičajene postavke"
+
+#~ msgid "Quote"
+#~ msgstr "Citat"
+
+#~ msgid "Display"
+#~ msgstr "Prikaz"
+
+#~ msgid "Message"
+#~ msgstr "Pošta"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Koristi vanjski program za prihvat"
+
+#~ msgid "Command"
+#~ msgstr "Naredba"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Prihvati sa spoola"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtriraj pri prihvaćanju"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Auto-provjera nove pošte"
+
+#~ msgid "every"
+#~ msgstr "svakih"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuta"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Provjeri poštu prilikom starta"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Osvježi sve spise poslije prihvaćanja"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Primam broj novih poruka (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Koristi vanjski program za slanje"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Spremi poslane poruke u poslano"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Izlazni charset"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatsko (preporučeno)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Zapadno-Europski (ISO-8859-1)"
+
+#, fuzzy
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Zapadno-Europski (ISO-8859-1)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Srednje-Europski (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Blatički (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Blatički (ISO'8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grčki (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grčki (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Ćirilica (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turski (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Čirilica (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Čirilica (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Čirilica (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Ćirilica (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japanski (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japanski (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japanski (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Pojednostavljeni Kineski (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Pojednostavljeni Kineski (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradicionalni Kineski (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradicionalni Kineski (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Kineski (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korejski (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Ako je `Automatski' odabrano, optimalni charset\n"
+#~ "za locale će biti korišten."
+
+#, fuzzy
+#~ msgid "Transfer encoding"
+#~ msgstr "Sažmi prije slanja"
+
+#~ msgid "Signature separator"
+#~ msgstr "Razdjelnik potpisa"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Ubaci automatski"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Automatski pokreni vanjski uređivač"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Sažmi poruke na"
+
+#~ msgid "characters"
+#~ msgstr "znakova"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Sažmi citat"
+
+#, fuzzy
+#~ msgid "Wrap on input"
+#~ msgstr "/_Uredi/Sažmi sve duge _linije"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Sažmi prije slanja"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Automatski odaberi račun pri odgovaranju"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citiraj poruku pri odgovaranju"
+
+#, fuzzy
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "/Odgovori svi_ma"
+
+#~ msgid "Reply format"
+#~ msgstr "Format odgovora"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Oznaka citata"
+
+#~ msgid "Forward format"
+#~ msgstr "Format prosljeđivanja"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Objašnjenje simbola "
+
+#~ msgid "Font"
+#~ msgstr "Font"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
+
+#, fuzzy
+#~ msgid "letters"
+#~ msgstr "Obriši"
+
+#~ msgid "Summary View"
+#~ msgstr "Pregled održavanja"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
+
+#~ msgid "Expand threads"
+#~ msgstr "Raširi stablo"
+
+#~ msgid "Date format"
+#~ msgstr "Format datuma"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Postavi pojedinosti prikaza... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Omogući poruke u boji"
+
+#, fuzzy
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "Prikaži 2-byte abecedu i brojeve s 1-byte znakovima"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Prikaži zaglavlje iznad poruke"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Prikaži kratko zaglavlje na pregledu poruka"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Prikaži kratko zaglavlje na pregledu poruka"
+
+#~ msgid "Line space"
+#~ msgstr "Razmak linija"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(a)"
+
+#~ msgid "Scroll"
+#~ msgstr "Scroll"
+
+#~ msgid "Half page"
+#~ msgstr "Pola stranice"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Miran scroll"
+
+#~ msgid "Step"
+#~ msgstr "Korak"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Prikaz postavki zaglavlja"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Izvrši"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Izvrši"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Spis"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtriraj poruke pri primanju"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Automatski provjeri potpis"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Prikaži potpis u popup prozoru"
+
+#, fuzzy
+#~ msgid "Expired after"
+#~ msgstr "Pošalji kasnije"
+
+#, fuzzy
+#~ msgid "minute(s) "
+#~ msgstr "minuta"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Uhvati unos pri upisivanju lozinke"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "poruka neće biti primljena\n"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Otvori prvu nepročitanu poruku pri ulasku u spis"
+
+#, fuzzy
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "/_Pošta/O_tvori u novom prozoru"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Idi u sandučić nakon primanja pošte"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Poruke će samo biti označene do izvršenja\n"
+#~ " ako je ovo isključeno)"
+
+#, fuzzy
+#~ msgid "Receive dialog"
+#~ msgstr "Prikaži dijalog primanja"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Prikaži dijalog primanja"
+
+#~ msgid "Always"
+#~ msgstr "Uvijek"
+
+#~ msgid "Never"
+#~ msgstr "Nikada"
+
+#, fuzzy
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Prikaži dijalog primanja"
+
+#, fuzzy
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Vanjski uređivač (%s predstavlja ime datoteke)"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
+
+#~ msgid "On exit"
+#~ msgstr "Na izlazu"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Potvrdi izlaz"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Isprazni smeće pri izlazu"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Pitaj prije pražnjenja"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Upozori ako ima odloženih poruka"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Pišem pohranu pregleda (%s)..."
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "pojednostavljeno ime tjedna"
+
+#~ msgid "the full weekday name"
+#~ msgstr "puno ime tjedna"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "skraćeno ime mjeseca"
+
+#~ msgid "the full month name"
+#~ msgstr "puno ime mjeseca"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "željeni datum i vrijeme za trenutni locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "broj stoljeća (godina/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "dan u mjesecu kao decimalni broj"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "sat kao decimalni broj koristeći 24 satno vrijeme"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "sat kao decimalni broj koristeći 12 satno vrijeme"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "dan u godini kao decimalni broj"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "mjesec kao decimalni broj"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minute kao decimalni broj"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AP ili PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekunde kao decimalni broj"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "dan u tjednu kao decimalni broj"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "željeni datum za trenutni locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "posljednje dvije znamenke godine"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "godina kao decimalni broj"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "vremenska zona"
+
+#~ msgid "Specifier"
+#~ msgstr "Označitelj"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "Example"
+#~ msgstr "Primjer"
+
+#~ msgid "Set message colors"
+#~ msgstr "Postavi boje poruka"
+
+#~ msgid "Colors"
+#~ msgstr "Boje"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Citirani tekst - prvi stupanj"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Citirani tekst - drugi stupanj"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Citirani tekst - treći stupanj"
+
+#~ msgid "URI link"
+#~ msgstr "URI poveznice"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Ciklički mijenjaj boje citata"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Odaberite boju za citat 1. stupnja"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Odaberite boju za citat 2. stupnja"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Odaberite boju za citat 3. stupnja"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Odaberite boju za URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Obajšnjenje znakova"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Datum\n"
+#~ "Od\n"
+#~ "Puno ime pošiljatelja\n"
+#~ "Ime pošiljatelja\n"
+#~ "Inicijali pošiljatelja\n"
+#~ "Tema\n"
+#~ "Za\n"
+#~ "Cc\n"
+#~ "News grupe\n"
+#~ "ID poruke"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Ako je x odabrano, prikazuje expr"
+
+#, fuzzy
+#~ msgid "Key bindings"
+#~ msgstr "Šaljem"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Uobičajeni sandučić"
+
 #~ msgid "Font selection"
 #~ msgstr "Odabir fonta"
 
@@ -6793,9 +6400,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Postavljam widgete..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Premještam poruke %s%c%d u %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tOznačujem poruku..."
 
diff --git a/po/hu.po b/po/hu.po
index 5b2b2a7a..b505d52e 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2005-07-04 17:05+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -15,13 +15,402 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Beállítások beolvasása az összes hozzáféréshez...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "a beállításokat nem lehetett elmenteni\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "Az IMAP4 kapcsolat %s felé megszakadt. Újrakapcsolódás...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP szerver LOGIN kikapcsolva.\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "%s:%d IMAP4 kapcsolat létrehozása ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Nem lehet TLS menetet indítani.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Üzenet küldése (%d / %d bájt)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "%s%c%d üzenet másolása %s-ba ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "%s%c%d üzenet másolása %s-ba ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "%s üzeneteinek fogadása..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "nem lehet beállítani a törölt jelzést: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "nem lehet törölni\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "%s üzeneteinek fogadása..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "nem lehet beállítani a törölt jelzést: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "mappa bezárása nem sikerült\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "%s root mappa nem létezik\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "hiba történt a LISTA lekérdezése közben.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "'%s' nem hozható létre\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "'%s' nem hozható létre a BEJÖVŐ mappa alatt\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "nem lehet létrehozni postaládát: LISTA sikertelen\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "nem lehet létrehozni postaládát\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "nem lehet a postaládát átnevezni: %s -> %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "nem lehet törölni a postaládát\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "a borítékot nem lehet megszerezni\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Üzenet küldése (%d / %d bájt)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "hiba történt a boríték fogadása közben.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "nem lehet értelmezni a borítékot: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "%s:%d IMAP4 szerverhez nem lehet kapcsolódni\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "IMAP4 szerverhez nem sikerült kapcsolódni: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "névtér nem elérhető\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "%s mappa kiválasztása nem sikerült\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "Az IMAP4 azonosítás nem sikerült.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 bejelentkezés sikertelen.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "%s hozzáfűzése %s-he(oö)z nem sikerült\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(fájl küldése...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "üzenet hozzáfűzése %s-he(oö)z nem sikerült\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "%s nem másolható %s-be/ba\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "hiba az IMAP parancs közben: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "hiba az IMAP parancs közben: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "az iconv nem tud UTF-7-ből %s-be/ba konvertálni\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "az iconv nem tud %s-t UTF-7-re konvertálni\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "Nem lehet %s üzenetet %s-ba másolni\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "A jelölő fájlt nem lehet megnyitni.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "A forrás- és célmappa azonos.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "%s%c%d üzenet másolása %s-ba ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Az utolsó szám a(z) %s mappában = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"`%s' fájl már létezik.\n"
+"Mappa nem hozható létre."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"Könyvtár neve\n"
+"A(z) '%s' nem valós UTF-8 sztring.\n"
+"Talán a helyi karakterkódolás van használatban a fájlnevekre.\n"
+"Ha ez a helyzet, akkor be kell állítania a következő környezeti változót\n"
+"(lásd a README-t a részletekhez):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "NNTP kapcsolat létesítése %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "Az NNTP kapcsolat %s:%d megszakadt. Újrakapcsolódás...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "%d cikk már a gyorstárban van.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "%d cikk fogadása...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "%d cikket nem lehetett olvasni\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "Hírcsoport lista nem hozzáférhető\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "Nem lehet a cikket elküldeni.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "%d cikket nem lehet fogadni\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "%s csoport nem választható ki\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "érvénytelen cikk sorozat: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "Nincsenek új cikkek.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "Hírjegyzék fogadása %d - %d %s-ba...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "A hírjegyzék nem elérhető\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "Hiba a hírjegyzék fogadása közben.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "érvénytelen hírjegyzék sor: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "xhdr nem elérhető\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "Hiba történt xhdr vétele közben.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "%s:%d NNTP szerverhez nem sikerült kapcsolódni\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "Protokollhiba: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "Protokollhiba\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Hiba küldés közben\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Hiba történt parancsküldés közben\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "A szükséges APOP időpecsét nem található az üdvözletben\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Időpecsét szintaktikai hiba az üdvözletben\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 protokollhiba\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "érvénytelen UIDL válasz: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Lejárt üzenetek törlése %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: üzenet átugrása %d (%d bájt)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "a postafiók zárolt\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "kapcsolat időtúllépése\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "nem lehet TLS menetet indítani\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "Hiba történt az azonosításkor\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "A parancs nem támogatott\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "hiba történt a POP3 kapcsolat közben\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -31,6 +420,52 @@ msgstr "Találat %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Beállítások tárolva.\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "Levélszemét szűrő"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "A kijelölt fájl nem nyitható meg\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "%d üzenet vétele nem sikerült\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Nem tudtam olvasni a szövegrészt\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Érvénytelen nyomtató parancs: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "hiba az adatok fogadása közben.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Nem lehet a fájlba írni.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH nem elérhető\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "hibás SMTP válasz\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "hiba történt az SMTP kapcsolat közben\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nem elérhető\n"
@@ -165,77 +600,6 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. http://www."
 "fsf.org "
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Beállítások beolvasása az összes hozzáféréshez...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Néhány szerkesztő ablak nyitva van.\n"
-"Zárjon be minden szerkesztő ablakot a hozzáférések módosítása előtt."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Hozzáférések szerkesztőablakának megnyitása...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Hozzáférések szerkesztőablakának létrehozása...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Hozzáférések szerkesztése"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Az új üzenetek ebben a sorrendben lesznek ellenőrizve. A 'Minden üzenet "
-"letöltése'\n"
-"funkció bekapcsolásához válassza ki a 'G' oszlopban a jelölődobozt!"
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Név"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Szerver"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr " Alapértelmezett hozzá_férésként beállít "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Tényleg törölni szeretné  a(z) '%s' hozzáférést?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(Névtelen)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Hozzáférés törlése"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -336,6 +700,14 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Név"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -350,8 +722,8 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fájl"
 
@@ -372,9 +744,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fájl/Új _Szerver"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
@@ -390,7 +762,7 @@ msgstr "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
@@ -422,8 +794,8 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
@@ -431,13 +803,13 @@ msgstr "/_Eszközök"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
@@ -454,17 +826,17 @@ msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
@@ -476,7 +848,7 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -486,14 +858,14 @@ msgstr "Név:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Törlés"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -504,11 +876,11 @@ msgid "Lookup"
 msgstr "Előnézet"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Másolat:"
 
@@ -534,7 +906,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -642,7 +1014,7 @@ msgstr "Címjegyzék konverziós hiba"
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Illesztő"
 
@@ -662,8 +1034,7 @@ msgstr "E-mail cím"
 msgid "Group"
 msgstr "Csoport"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Mappa"
 
@@ -687,15 +1058,15 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Hiba"
 
@@ -750,8 +1121,8 @@ msgstr "/_Hozzáadás..."
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
@@ -791,8 +1162,8 @@ msgstr "/_Szerkesztés/_Visszavonás"
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
@@ -800,7 +1171,7 @@ msgstr "/_Szerkesztés/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
@@ -812,7 +1183,7 @@ msgstr "/_Szerkesztés/_Beillesztés"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
@@ -828,7 +1199,7 @@ msgstr "/__Szerkesztés/Minden hosszú _sor törése"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/A_utomata tördelés"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Nézet"
@@ -850,9 +1221,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
@@ -868,7 +1239,7 @@ msgstr "/_Nézet/V_onalzó"
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
@@ -879,103 +1250,103 @@ msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Nézet/_Karakterkódolás/Közép-Európai (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
@@ -983,14 +1354,14 @@ msgstr "/_Eszközök/_Címjegyzék"
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
@@ -1011,10 +1382,6 @@ msgstr "/_Eszközök/PGP _Titkosítás"
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Nem tudtam olvasni a szövegrészt\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
@@ -1090,7 +1457,7 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Válasszon ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak/nek küldendő üzenet küldése közben."
@@ -1184,8 +1551,7 @@ msgstr "MIME típus"
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Küldés"
 
@@ -1225,8 +1591,7 @@ msgstr "Csatolás"
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Aláírás"
 
@@ -1234,7 +1599,7 @@ msgstr "Aláírás"
 msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Szerkesztő"
 
@@ -1426,7 +1791,7 @@ msgstr "Módosít"
 msgid "Clear"
 msgstr "Töröl"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Érték"
 
@@ -1459,7 +1824,6 @@ msgid " Check File "
 msgstr " Fájl ellenőrzése"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Fájl"
 
@@ -1515,12 +1879,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -1537,7 +1901,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1601,7 +1965,7 @@ msgstr "Időtúllépés (mp)"
 msgid "Maximum Entries"
 msgstr "Maximális bejegyzések"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Alap"
 
@@ -1658,7 +2022,6 @@ msgid "Exporting file:"
 msgstr "Exportálás fájlba:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Kiválaszt... "
 
@@ -1682,160 +2045,160 @@ msgstr "Létező fájl felülírása?"
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Új _mappa létrehozása..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Mappa át_nevezése..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/Mappa át_helyezése..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Mappa _törlése"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/_Kuka ürítése"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Ú_j üzenetek ellenőrzése"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/_Mappafa újraépítése"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Ü_zenetek keresése..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Le_töltés"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Hírcsoport _előfizetése..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Hírcsoport e_ltávolítása"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Mappa nézet létrehozása...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Új"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Mappa információ beállítása...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa újra fog épülni. Folytatja?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése sikertelen."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek keresése minden mappában..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenetek letöltése %s mappába ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a(z) %s mappába történő üzenetek letöltése közben."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1845,21 +2208,21 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretne létrehozni,\n"
 "akkor tegyen egy `/' jelet a név végére)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1872,21 +2235,21 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1895,34 +2258,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:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -1983,7 +2346,7 @@ msgstr "%d hírcsoport letöltve (%s olvasott)"
 msgid "Newsgroups:"
 msgstr "Hírcsoportok:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Tárgy:"
 
@@ -2007,159 +2370,6 @@ msgstr "Kép nézet létrehozása...\n"
 msgid "Can't load the image."
 msgstr "Nem lehet betölteni a képet."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Az IMAP4 kapcsolat %s felé megszakadt. Újrakapcsolódás...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP szerver LOGIN kikapcsolva.\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "%s:%d IMAP4 kapcsolat létrehozása ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Nem lehet TLS menetet indítani.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "nem lehet beállítani a törölt jelzést: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "nem lehet törölni\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "nem lehet beállítani a törölt jelzést: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "mappa bezárása nem sikerült\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "%s root mappa nem létezik\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "hiba történt a LISTA lekérdezése közben.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "'%s' nem hozható létre\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "'%s' nem hozható létre a BEJÖVŐ mappa alatt\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "nem lehet létrehozni postaládát: LISTA sikertelen\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "nem lehet létrehozni postaládát\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "nem lehet a postaládát átnevezni: %s -> %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "nem lehet törölni a postaládát\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "a borítékot nem lehet megszerezni\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "hiba történt a boríték fogadása közben.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "nem lehet értelmezni a borítékot: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "%s:%d IMAP4 szerverhez nem lehet kapcsolódni\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "IMAP4 szerverhez nem sikerült kapcsolódni: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "névtér nem elérhető\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "%s mappa kiválasztása nem sikerült\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "Az IMAP4 azonosítás nem sikerült.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 bejelentkezés sikertelen.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "%s hozzáfűzése %s-he(oö)z nem sikerült\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(fájl küldése...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "üzenet hozzáfűzése %s-he(oö)z nem sikerült\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "%s nem másolható %s-be/ba\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "hiba az IMAP parancs közben: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "hiba az IMAP parancs közben: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "az iconv nem tud UTF-7-ből %s-be/ba konvertálni\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "az iconv nem tud %s-t UTF-7-re konvertálni\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importálás"
@@ -2257,7 +2467,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Következő"
 
@@ -2273,143 +2483,143 @@ msgstr "Tulajdonságok"
 msgid "Finish"
 msgstr "Vége"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Vége (%d új üzenet)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Régi Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Új üzenetek fogadása"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Kész (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Kész (nincs új üzenet)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Vége (%d új üzenet)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Vége (nincs új üzenet)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt a levelek fogadásakor."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hozzáférésről az új üzenetek letöltése...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új üzenetek fogadása"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s üzeneteinek fogadása..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új üzenetek számának megszerzése (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új üzenetek számának megszerzése (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új üzenetek számának megszerzése (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új üzenetek méretének megszerzése (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d üzenet törlése"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Üzenet vétele (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Üzenetek fogadása (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2418,28 +2628,28 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "A postafiók zárolt."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2448,11 +2658,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2461,15 +2671,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új üzeneteinek megszerzése %s mappába...\n"
@@ -2487,29 +2697,20 @@ msgstr "Adja meg a jelszót"
 msgid "Protocol log"
 msgstr "Protokoll napló"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"`%s' fájl már létezik.\n"
-"Mappa nem hozható létre."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread-et a glib nem támogatja.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPCIÓ]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2519,23 +2720,23 @@ msgstr ""
 "                          szerkesztőablak nyitása a megadott fájl(ok)\n"
 "                          csatolásával"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              új üzenetek vétele"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új üzenetek vétele minden hozzáférésről"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 minden várakozó levél küldése"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...  üzenetek számának kijelzése"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2543,23 +2744,23 @@ msgstr ""
 "  --status-full [mappa]...\n"
 "                       az összes mappa státuszának kijelzése"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső üzemmód"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 e segítség megjelenítése és kilépés"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              verzió információk kiírása és kilépés"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "Fájlnév karakterkódolása"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2583,19 +2784,19 @@ msgstr ""
 "\n"
 "Folytatja?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Üzenet szerkesztés alatt. Tényleg kilép?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Várakozó üzenetek"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen üzenetek. Kilépés most?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2604,15 +2805,15 @@ msgstr ""
 "OpenPGP támogatás kikapcsolva."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "Egy másik Sylpheed már fut.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2620,616 +2821,616 @@ msgstr ""
 "Az előző verzió konfigurációja megtalálva.\n"
 "Szeretné migrálni azokat?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Fájl/_Mappa"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fájl/_Mappa/Ú_j mappa létrehozása..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fájl/_Mappa/Mappa Át_nevezése..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fájl/_Mappa/Mappa át_helyezése..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fájl/_Mappa/Mappa _Törlése"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Fájl/_Postaláda"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fájl/_Postaláda/Postaláda _hozzáadása..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fájl/_Postaláda/Postaláda _eltávolítása"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fájl/_Postaláda/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fájl/_Postaláda/Ú_j üzenetek ellenőrzése"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fájl/_Postaláda/Ú_j üzenetek ellenőrzése az összes postaládában"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fájl/_Postaláda/_Mappafa újraépítése"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fájl/Mbox fájl _importálása..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fájl/Mbox fájl _exportálása..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Fájl/_Kuka ürítése"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fájl/_Mentés másként..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fájl/_Nyomtatás..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Fájl/Ka_pcsolat nélküli munka"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Fájl/Ki_lépés"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Szerkesztés/Üzenet_folyam kiválasztása"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Szerkesztés/_Keresés az aktuális üzenetben..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Szerkesztés/Ü_zenetek keresése..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Nézet/_Megjelenít vagy elrejt"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Mappa_fa"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Üzenet nézet"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Ikon és Szöveg"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Se_mmi"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsor"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappafa"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön üz_enetnézet"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Nézet/_Rendezés"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Nézet/_Rendezés/_Szám szerint"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Nézet/_Rendezés/_Méret szerint"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Nézet/_Rendezés/_Feladó szerint"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Nézet/_Rendezés/_Címzett szerint"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Nézet/_Rendezés/_Tárgy szerint"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Nézet/_Rendezés/S_zínes címke szerint"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Nézet/_Rendezés/_Jelölés szerint"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Nézet/_Rendezés/_Olvasatlan szerint"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Nézet/_Rendezés/Cs_atolás szerint"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Nézet/_Rendezés/Nem _rendez"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Nézet/_Rendez/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Nézet/_Rendezés/_Növekvő"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Nézet/_Rendezés/_Csökkenő"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Nézet/_Rendezés/_Tárgyhoz vonz"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Nézet/Ü_zenetfolyam nézet"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam kifejtése"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam bezárása"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Nézet/K_ijelzett cikk beállítás..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Nézet/_Ugrás"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Nézet/_Ugrás/_Előző üzenethez"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Nézet/_Ugrás/_Következő üzenethez"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Nézet/_Ugrás/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Nézet/_Ugrás/_Előző olvasatlan üzenethez"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Nézet/_Ugrás/_Következő olvasatlan üzenethez"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Nézet/_Ugrás/_Előző új üzenethez"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Nézet/_Ugrás/_Következő új üzenethez"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Nézet/_Ugrás/_Előző megjelölt üzenethez"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Nézet/_Ugrás/_Következő megjelölt üzenethez"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Nézet/_Ugrás/_Előző címkézett üzenethez"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Nézet/_Ugrás/_Következő címkézett üzenethez"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Üzenet"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/_Üzenet/Fog_adás"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Üzenet/Fog_adás/_Jelenlegi hozzáférésről"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Üzenet/Fog_adás/_Minden hozzáférésről"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Üzenet/Fo_gadás/Fogadás me_gszakítása"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Üzenet/Fog_adás/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Üzenet/Ü_zenetek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Üzenet/_Új üzenet szerkesztése"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Üzenet/Vá_lasz"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Üzenet/_Válasz másnak"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Üzenet/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Üzenet/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Üzenet/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Üzenet/_Továbbítás"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Üzenet/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Üzenet/Á_tirányít"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Üzenet/M_ozgatás..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Üzenet/_Másolás..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Üzenet/_Törlés"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Üzenet/_Megjelöl"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Üzenet/_Megjelöl/_Megjelöl"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Üzenet/_Megjelöl/Megjelölés visszavonása"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Üzenet/_Megjelöl/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Üzenet/_Megjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Üzenet/_Megjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Üzenet/_Megjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Üzenet/_Levélszemétként beállítás"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Üzenet/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Eszközök/Küldő hozzáadása a cím_jegyzékhez..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Összes üzenet szűrése a mappában"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek szűrése"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Eszközök/Levélszemét szűrése a mappában"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek levélszemét szűrése"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Eszközök/_Futtatás"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Közös _Beállítások..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/_Sablon..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/_Akciók..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/_Új hozzáférés létrehozása..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Hozzáférés _szerkesztése..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/Sú_gó/_Kézikönyv"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/Sú_gó/Kézikönyv/_Angol"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Sú_gó/Kézikönyv/_Japán"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/Sú_gó/_GYIK"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/Sú_gó/_GYIK/_Angol"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/Sú_gó/_GYIK/_Német"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Sú_gó/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/Sú_gó/_GYIK/_Francia"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Sú_gó/_GYIK/_Olasz"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/Sú_gó/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ablak elválasztás típus változtatása %d-ról, %d-ra\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3239,16 +3440,16 @@ msgstr ""
 "Ha már létezik a postaláda, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3257,150 +3458,149 @@ msgstr ""
 "A postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Új levelek fogadása"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Fogadás mindről"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Új levelek fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "Levélszemétként beállítás"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Ön kapcsolat nélküli módban van. Kattintson az ikonra a kapcsolódáshoz."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Ön kapcsolódva van. Kattintson az ikonra a kapcsolat nélküli módhoz."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
@@ -3518,32 +3718,32 @@ msgstr "Az üzenet végére értem; folytassam az elejéről?"
 msgid "Search finished"
 msgstr "Keresés befejeződött"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Eszközök/Küldő hozzáadása a cím_jegyzékhez"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Üzenet nézet létrehozása...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Csatolások"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3552,7 +3752,7 @@ msgstr ""
 "Adja meg a nyomtatási parancsot:\n"
 "(`%s' helyére a fájlnév kerül)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3561,48 +3761,6 @@ msgstr ""
 "Nyomtatási parancs érvénytelen:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "Nem lehet %s üzenetet %s-ba másolni\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "A jelölő fájlt nem lehet megnyitni.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "A forrás- és célmappa azonos.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "%s%c%d üzenet másolása %s-ba ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Az utolsó szám a(z) %s mappában = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"Könyvtár neve\n"
-"A(z) '%s' nem valós UTF-8 sztring.\n"
-"Talán a helyi karakterkódolás van használatban a fájlnevekre.\n"
-"Ha ez a helyzet, akkor be kell állítania a következő környezeti változót\n"
-"(lásd a README-t a részletekhez):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Megnyitás"
@@ -3687,115 +3845,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME megjelenítő parancssor érvénytelen: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "NNTP kapcsolat létesítése %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "Az NNTP kapcsolat %s:%d megszakadt. Újrakapcsolódás...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "%d cikk már a gyorstárban van.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "%d cikk fogadása...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "%d cikket nem lehetett olvasni\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "Hírcsoport lista nem hozzáférhető\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "Nem lehet a cikket elküldeni.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "%d cikket nem lehet fogadni\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "%s csoport nem választható ki\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "érvénytelen cikk sorozat: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "Nincsenek új cikkek.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "Hírjegyzék fogadása %d - %d %s-ba...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "A hírjegyzék nem elérhető\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "Hiba a hírjegyzék fogadása közben.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "érvénytelen hírjegyzék sor: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "xhdr nem elérhető\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "Hiba történt xhdr vétele közben.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "%s:%d NNTP szerverhez nem sikerült kapcsolódni\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "Protokollhiba: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "Protokollhiba\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Hiba küldés közben\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Hiba történt parancsküldés közben\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Jelmondat"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[nincs felhasználói azonosító]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3808,7 +3866,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3816,447 +3874,6 @@ msgstr ""
 "Rossz jelmondat! Próbálja újra...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "A szükséges APOP időpecsét nem található az üdvözletben\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Időpecsét szintaktikai hiba az üdvözletben\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 protokollhiba\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "érvénytelen UIDL válasz: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Lejárt üzenetek törlése %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: üzenet átugrása %d (%d bájt)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "a postafiók zárolt\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "kapcsolat időtúllépése\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "nem lehet TLS menetet indítani\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "Hiba történt az azonosításkor\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "A parancs nem támogatott\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "hiba történt a POP3 kapcsolat közben\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Hozzáférésbeállításokok ablak megnyitása...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Hozzáférés%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Új hozzáférés beállításai"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Hozzáférés beállítások"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Hozzáférésbeállítások ablak létrehozása...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Fogadás"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Magánszféra"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Haladó"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Hozzáférés neve"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Alapértelmzésként beállítás"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Személyes információ"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Teljes név"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-mail cím"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Szervezet"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Szerver információ"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Hírek (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Semmi (helyi)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Ezen a szerveren kötelező az azonosítás"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Hírszerver"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Szerver a fogadáshoz"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP szerver (küldés)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Felhasználói Azonosító"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Jelszó"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Biztonságos hitelesítés használata (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Üzenetek törlése a szerverről fogadás után"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Eltávolítás utána"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "nap"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 nap: azonnal eltávolítani)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Minden üzenet letöltése a szerverről"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Fogadott levél méretkorlát"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Üzenetek szűrése fogadás közben"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Alapértelmezett bejövő postafiók"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "A nem szűrt üzenetek ebbe a mappába fognak kerülni."
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Azonosítási módszer"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatikus"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Hírek"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "A letölteni kívánt maximális cikkek száma"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "Ha 0 van megadva, akkor korlátlan."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Fogadás mindről' ellenőrizze ezt a hozzáférést is"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Fejléc"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Dátum fejléc mező hozzáadás"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Üzenet-azonosító generálása"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Felhasználó által definiált fejléc hozzáadása"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Szerkesztés... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Azonosítás"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP Azonosítás (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Ha ezeket a mezőket üresen hagyja, a levelek fogadásához használt "
-"felhasználói azonosító és jelszó lesz használva."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Azonosítás küldés előtt POP3-mal"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Parancskimenet"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Az alábbi címek automatikus beállítása"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Másolat"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Titkos másolat"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Válaszcím"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Üzenetet mindig írja alá digitálisan"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Üzenetet mindig titkosítsa"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "Titkosítás, ha titkosított üzenetre válaszol"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "ASCII-páncélozott formátum használata titkosításhoz"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Szöveges aláírás használata"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Digitális aláírás kulcs"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Alapértelmezett GnuPG kulcs használata"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Kulcs választása az email címe alapján"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Kulcs kézi megadása"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Felhasználó vagy kulcs Azonosító:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Nem használ SSL-t"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "SSL használata POP3 kapcsolathoz"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "STARTTLS parancs használata SSL kapcsolat indításához"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "SSL használata IMAP4 kapcsolathoz"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "SSL használata NNTP kapcsolathoz"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Küldés (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "SSL használata SMTP kapcsolathoz"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Nem-blokkolódó SSL használata"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "Ezt kapcsolja ki, ha az SSL kapcsolattal probléma van."
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "SMTP port megadása"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "POP3 port megadása"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "IMAP4 port megadása"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "NNTP port megadása"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Tartománynév (domain) megadása"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP szerver könyvtár"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Elküldött üzenetek elhelyezése"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Vázlatok elhelyezése"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Törölt üzenetek elhelyezése"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Hozzáférés név nincs megadva."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Nincs email cím megadva."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Nincs megadott SMTP szerver."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Nincs felhasználói azonosító megadva."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Nincs megadott POP3 szerver."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Nincs megadott IMAP4 szerver."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Nincs megadott NNTP szerver."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Nem javasolt a régi tipusú ASCII-páncélozott mód\n"
-"használata titkosított üzenetekhez. Nem felel meg az\n"
-"RFC 3156 - MIME Security with OpenPGP-ben leírtaknak."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Műveletek beállítása"
@@ -4322,17 +3939,17 @@ msgstr " Szintaxis súgó "
 msgid "Registered actions"
 msgstr "Regisztrált műveletek"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Fel"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Le"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Új)"
 
@@ -4375,821 +3992,31 @@ msgstr "Művelet törlése"
 msgid "Do you really want to delete this action?"
 msgstr "Tényleg töröljem ezt a műveletet?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "Levélszemét szűrő"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Általános beállítások ablak létrehozása...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Általános beállítások"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Idézet"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Megjelenítés"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Üzenet"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Levélszemét"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Egyéb"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Külső program használata email fogadáshoz"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Parancs"
-
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "Fogadás helyi tárolóból"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Szűrés fogadás közben"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Tároló elérési útja"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Automatikus levélfigyelés"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "minden"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "perc"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Új levelek ellenőrzése induláskor"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Fogadás után minden helyi mappa frissítése"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr "Parancs végrehajtása, ha új üzenet érkezett"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "`%d' lesz helyettesítve az új üzenetek számával."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Külső program használata küldéshez"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Elküldött üzenetek mentése a Kimenő postafiókba"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "Szűrőszabályok alkalmazása az elküldött üzenetekre"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Kimenők karakterkódolása"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatikus (Ajánlott)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7 bites ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Nyugat Európai (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Nyugat Európai (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Közép Európai (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltikumi (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltikumi (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Görög (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Héber (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Héber (Windows-1255)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Török (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirill (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirill (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cirill (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirill (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japán (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japán (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japán (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Egyszerűsített Kínai (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Egyszerűsített Kínai (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradicionális Kínai (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradicionális Kínai (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Kínai (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Koreai (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Ha az `Automatikus' be van kapcsolva, akkor az optimális kódolást használja "
-"a helyi nyelvi beállításoknak megfelelően."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Átvitel kódolása"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Határozza meg a Content-Transfer-Encoding értékét, ha az üzenet tartalmaz "
-"nem-ASCII karaktereket is."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Aláírás elválasztó"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Automatikus beillesztés"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Külső szerkesztő automatikus indítása"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Visszavonás mélysége"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Sortörés helye"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "karakter"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Idézet törése"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Bevitel tördelése"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Sortördelés küldés előtt"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Automatikus hozzáférés választás válaszkor"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Üzenet idézése a válaszban"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "A `Válasz' gomb a `Válasz levelező listára' funkciót hozza fel"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Válasz formátuma"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Idézet jele"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Továbbítás formátuma"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Szimbólumok leírása "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Betűkészlet"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Fejléc fordítása (mint `Feladó:', `Tárgy:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Hírcsoportok rövidítése, ha hosszabb mint"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "levél"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Összefoglaló nézet"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Címzett mutatása a `Feladó' oszlopban, ha önmagának küldte"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Folyam kifejtése"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Dátum formátuma"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Összefoglalás kijelzésének beállítása... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Színek használata az üzenetekhez"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Több byte-os karakterek és számok megjelenítése\n"
-"ASCII karakterekkel (csak japán esetén)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Fejlécmező megjelenítése az üzenet fölött"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Rövid fejlécek az üzenet nézetben"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "HTML üzenet értelmezése szövegként"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Kurzor megjelenítése üzenet nézetben"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Sortávolság"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "Képpont"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Görgetés"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Fél oldal"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Finom görgetés"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Lépés"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "Képek"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "A nagy méretű csatolt képek ablakméretre igazítása"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Képek megjelenítése egyvonalban"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "Levélszemét szabályozás engedélyezése"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "Tanítás parancs:"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "Nem levélszemét"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "Osztályozó parancs"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "Levélszemét mappa"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-"Azon üzenetek, melyek levélszemétként lettek beállítva törlődni fognak ebből "
-"a mappából."
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr "A fogadáskor megszűrt üzenetek levélszemétként osztályozva"
-
-#: src/prefs_common.c:2051
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"A megszűrt üzenetek a levélszemét mappába kerülnek át, és a törlésre "
-"kerülnek a szerverről."
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Digitális aláírás automatikus ellenőrzése"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Aláírásellenőrzés eredménye felbukkanó ablakban"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Jelmondat ideiglenes tárolása a memóriában"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Lejár ennyi után"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "perc"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "'0'-ra állítva tárolja a jelmondatot a teljes menet alatt."
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Bevitel elkapása egy jelmondat beadásakor"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Az üzenetek mindig összefoglalva jelennek meg, ha ez kiválasztott"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Mappába lépéskor az első olvasatlan üzenet megnyitása"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Csak az új ablakban megnyitott üzeneteket jelölje olvasottként."
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Váltson a bejövő postafiókra email fogadás után"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Azonnali végrehajtás üzenet mozgatás vagy törlés esetén"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"Az üzenetek kijelölten láthatók a feldolgozás alatt, ha ez ki van kapcsolva."
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Fogadó ablak"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Fogadó ablak mutatása"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Mindig"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Csak kézi fogadáskor"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Soha"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Ne dobjon fel hibaablakot fogadási hiba esetén"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Fogadó ablak bezárása ha végzett"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "A gombrendszer elkészítése a GNOME HIG szerint"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Billentyű hozzárendelések... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Külső parancsok (%s helyére a fájlnév / URI kerül)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Web böngésző"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Dupla-klikk esetén cím a célmezőbe"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Kilépéskor"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Kilépéskor rákérdez"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Kuka ürítése kilépéskor"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Ürítés előtt rákérdez"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Elküldetlen üzenetek esetén figyelmeztet"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Összefoglaló gyorstár sértetlenségének pontos ellenőrzése"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-"Kapcsolja be, ha lehetőség van arra, hogy a mappák tartalmát egy másik "
-"alkalmazás módosíthatja.\n"
-"Ez az opció lassítja az összefoglalás megjelenésének idejét."
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Hálózati adatátvitel időtúllépés:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "másodperc"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "rövidített nap név"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "teljes nap név"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "rövidített hónapnév"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "a teljes hónapnév"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "ajánlott dátum- és időformátum a jelenlegi nyelvi beállításhoz"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "évszázad (év/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "hónap napja számként"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "óra számként (24 órás kijelzés)"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "óra számként (12 órás kijelzés)"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "Az év napja számként"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "hónap számként"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "perc számként"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "DE vagy DU"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "másodperc számként"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "hét napja számként"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "az évszám utolsó két számjegye"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "év számként"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "időzóna vagy név vagy rövidítés"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Vezérlőjel"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Leírás"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Példa"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Üzenetszín beállítása"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Színek"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Idézett szöveg - első szint"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Idézett szöveg - második szint"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Idézett szöveg - harmadik szint"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI-kapocs"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Idézet színeinek újrahasznosítása"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "1. szintű idézet színe"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "2. szintű idézet színe"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "3. szintű idézet színe"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "URI színe"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Szimbólumok leírása"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Dátum\n"
-"Feladó\n"
-"Feladó teljes neve\n"
-"Feladó keresztneve\n"
-"Feladó monogramja\n"
-"Tárgy\n"
-"Címzett\n"
-"Másolat\n"
-"Hírcsoportok\n"
-"Üzenet-azonosító"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Üzenet törzs\n"
-"Idézett üzenet törzs\n"
-"Üzenet törzs aláírás nélkül\n"
-"Idézett üzenet törzs aláírás nélkül\n"
-"Szó szerint %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Repjel karakterrel\n"
-"Kérdőjel karakterrel\n"
-"Nyitó kapcsos zárójel\n"
-"Záró kapcsos zárójel"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Billentyű hozzárendelések"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Billentyű hozzárendelés előválasztó beállítása.\n"
-"Módosíthatod minden menü gyorsbillentyűjét, ha az egérmutatóval\n"
-"rámutatva megnyomod a kívánt billentyűt."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Alapértelmezés"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Régi Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Saját fejléc beállítások"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Fejléc"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Törlés"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Saját fejléc"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Fejléc név nincs beállítva."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Fejléc törlése"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Tényleg törölni szeretné ezt a fejlécet?"
 
@@ -5237,12 +4064,20 @@ msgstr "Szűrő beállítása"
 msgid "Enabled"
 msgstr "Bakapcsolva"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Tényleg törölni szeretné a(z) '%s' szabályt?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(Névtelen)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Szabály törlése"
 
@@ -5326,6 +4161,10 @@ msgstr "régebbi, mint"
 msgid "is shorter than"
 msgstr "fiatalabb, mint"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Mozgatás ide"
@@ -5447,6 +4286,10 @@ msgstr "Válasz esetén törölje a [...] vagy (...) szöveget a tárgy mezőbő
 msgid "Apply to subfolders"
 msgstr "Alkalmazás almappákra"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Az alábbi címek automatikus beállítása"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "válasznál is használja"
@@ -5520,64 +4363,46 @@ msgstr "Megjelenített elemek"
 msgid " Revert to default "
 msgstr " Alapértelmezettre visszaállít"
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Sablon név"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Helyettesít "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Szimbólumok "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Regisztrált sablonok"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Sablonok"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Sablon"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Sablon formátumhiba."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Sablon törlése"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Tényleg törölni szeretné ezt a sablont?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "A kijelölt fájl nem nyitható meg\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "%d üzenet vétele nem sikerült\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Érvénytelen nyomtató parancs: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Készültségi ablak létrehozása...\n"
@@ -5586,29 +4411,21 @@ msgstr "Készültségi ablak létrehozása...\n"
 msgid "Status"
 msgstr "Állapot"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "hiba az adatok fogadása közben.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Nem lehet a fájlba írni.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Nem található felhasználói azonosító ehhez a kulcshoz."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\tazaz \"%s\"\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Az aláírás készült %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Hiba az aláírás ellenőrzése közben"
 
@@ -5634,6 +4451,10 @@ msgstr "Kulcs azonosító"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Egyéb"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Kulcs hozzáadás"
@@ -5658,84 +4479,84 @@ msgstr ""
 "tudhatja biztosan, hogy ahhoz a személyhez jut el, akinek szánta.\n"
 "Megbízik ennek ellenére annyira ebben a kulcsban, hogy használja?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "A várakozó üzenet fejléce sérült.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Üzenet küldésre használt parancs: %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "A parancs nem futtatható: %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Hiba történt a parancs futtatása közben: %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Kapcsolódás %s SMTP szerverhez..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "HELO küldése..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Azonosítás"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Üzenet küldése ..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "EHLO küldése..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM küldése..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Küldés"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO küldése..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "DATA küldése..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Kilépés..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Üzenet küldése (%d / %d bájt)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Üzenet küldése"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Hiba történt üzenetküldés közben."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5834,32 +4655,20 @@ msgstr "ROSSZ digitális aláírás"
 msgid "No public key to verify the signature"
 msgstr "Nincs publikus kulcs az aláírás ellenőrzéséhez"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH nem elérhető\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "hibás SMTP válasz\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "hiba történt az SMTP kapcsolat közben\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Forrás ablak létrehozása...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Az üzenet forrása"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "%s forrásának megjelenítése...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Forrás"
@@ -6248,6 +5057,933 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Néhány szerkesztő ablak nyitva van.\n"
+#~ "Zárjon be minden szerkesztő ablakot a hozzáférések módosítása előtt."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Hozzáférések szerkesztőablakának megnyitása...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Hozzáférések szerkesztőablakának létrehozása...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Hozzáférések szerkesztése"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Az új üzenetek ebben a sorrendben lesznek ellenőrizve. A 'Minden üzenet "
+#~ "letöltése'\n"
+#~ "funkció bekapcsolásához válassza ki a 'G' oszlopban a jelölődobozt!"
+
+#~ msgid "Protocol"
+#~ msgstr "Protokoll"
+
+#~ msgid "Server"
+#~ msgstr "Szerver"
+
+#~ msgid " _Set as default account "
+#~ msgstr " Alapértelmezett hozzá_férésként beállít "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Tényleg törölni szeretné  a(z) '%s' hozzáférést?"
+
+#~ msgid "Delete account"
+#~ msgstr "Hozzáférés törlése"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Hozzáférésbeállításokok ablak megnyitása...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Hozzáférés%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Új hozzáférés beállításai"
+
+#~ msgid "Account preferences"
+#~ msgstr "Hozzáférés beállítások"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Hozzáférésbeállítások ablak létrehozása...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Fogadás"
+
+#~ msgid "Privacy"
+#~ msgstr "Magánszféra"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Haladó"
+
+#~ msgid "Name of this account"
+#~ msgstr "Hozzáférés neve"
+
+#~ msgid "Set as default"
+#~ msgstr "Alapértelmzésként beállítás"
+
+#~ msgid "Personal information"
+#~ msgstr "Személyes információ"
+
+#~ msgid "Full name"
+#~ msgstr "Teljes név"
+
+#~ msgid "Mail address"
+#~ msgstr "E-mail cím"
+
+#~ msgid "Organization"
+#~ msgstr "Szervezet"
+
+#~ msgid "Server information"
+#~ msgstr "Szerver információ"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Hírek (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Semmi (helyi)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Ezen a szerveren kötelező az azonosítás"
+
+#~ msgid "News server"
+#~ msgstr "Hírszerver"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Szerver a fogadáshoz"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP szerver (küldés)"
+
+#~ msgid "User ID"
+#~ msgstr "Felhasználói Azonosító"
+
+#~ msgid "Password"
+#~ msgstr "Jelszó"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Biztonságos hitelesítés használata (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Üzenetek törlése a szerverről fogadás után"
+
+#~ msgid "Remove after"
+#~ msgstr "Eltávolítás utána"
+
+#~ msgid "days"
+#~ msgstr "nap"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 nap: azonnal eltávolítani)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Minden üzenet letöltése a szerverről"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Fogadott levél méretkorlát"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Üzenetek szűrése fogadás közben"
+
+#~ msgid "Default inbox"
+#~ msgstr "Alapértelmezett bejövő postafiók"
+
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "A nem szűrt üzenetek ebbe a mappába fognak kerülni."
+
+#~ msgid "Authentication method"
+#~ msgstr "Azonosítási módszer"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatikus"
+
+#~ msgid "News"
+#~ msgstr "Hírek"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "A letölteni kívánt maximális cikkek száma"
+
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Ha 0 van megadva, akkor korlátlan."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Fogadás mindről' ellenőrizze ezt a hozzáférést is"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Dátum fejléc mező hozzáadás"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Üzenet-azonosító generálása"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Felhasználó által definiált fejléc hozzáadása"
+
+#~ msgid " Edit... "
+#~ msgstr " Szerkesztés... "
+
+#~ msgid "Authentication"
+#~ msgstr "Azonosítás"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP Azonosítás (SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Ha ezeket a mezőket üresen hagyja, a levelek fogadásához használt "
+#~ "felhasználói azonosító és jelszó lesz használva."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Azonosítás küldés előtt POP3-mal"
+
+#~ msgid "Command output"
+#~ msgstr "Parancskimenet"
+
+#~ msgid "Cc"
+#~ msgstr "Másolat"
+
+#~ msgid "Bcc"
+#~ msgstr "Titkos másolat"
+
+#~ msgid "Reply-To"
+#~ msgstr "Válaszcím"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Üzenetet mindig írja alá digitálisan"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Üzenetet mindig titkosítsa"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "Titkosítás, ha titkosított üzenetre válaszol"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "ASCII-páncélozott formátum használata titkosításhoz"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Szöveges aláírás használata"
+
+#~ msgid "Sign key"
+#~ msgstr "Digitális aláírás kulcs"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Alapértelmezett GnuPG kulcs használata"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Kulcs választása az email címe alapján"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Kulcs kézi megadása"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Felhasználó vagy kulcs Azonosító:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Nem használ SSL-t"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "SSL használata POP3 kapcsolathoz"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "STARTTLS parancs használata SSL kapcsolat indításához"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "SSL használata IMAP4 kapcsolathoz"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "SSL használata NNTP kapcsolathoz"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Küldés (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "SSL használata SMTP kapcsolathoz"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Nem-blokkolódó SSL használata"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "Ezt kapcsolja ki, ha az SSL kapcsolattal probléma van."
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "SMTP port megadása"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "POP3 port megadása"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "IMAP4 port megadása"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "NNTP port megadása"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Tartománynév (domain) megadása"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP szerver könyvtár"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Elküldött üzenetek elhelyezése"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Vázlatok elhelyezése"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Törölt üzenetek elhelyezése"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Hozzáférés név nincs megadva."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Nincs email cím megadva."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Nincs megadott SMTP szerver."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Nincs felhasználói azonosító megadva."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Nincs megadott POP3 szerver."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Nincs megadott IMAP4 szerver."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Nincs megadott NNTP szerver."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Nem javasolt a régi tipusú ASCII-páncélozott mód\n"
+#~ "használata titkosított üzenetekhez. Nem felel meg az\n"
+#~ "RFC 3156 - MIME Security with OpenPGP-ben leírtaknak."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Általános beállítások ablak létrehozása...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Általános beállítások"
+
+#~ msgid "Quote"
+#~ msgstr "Idézet"
+
+#~ msgid "Display"
+#~ msgstr "Megjelenítés"
+
+#~ msgid "Message"
+#~ msgstr "Üzenet"
+
+#~ msgid "Junk mail"
+#~ msgstr "Levélszemét"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Külső program használata email fogadáshoz"
+
+#~ msgid "Command"
+#~ msgstr "Parancs"
+
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Fogadás helyi tárolóból"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Szűrés fogadás közben"
+
+#~ msgid "Spool path"
+#~ msgstr "Tároló elérési útja"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Automatikus levélfigyelés"
+
+#~ msgid "every"
+#~ msgstr "minden"
+
+#~ msgid "minute(s)"
+#~ msgstr "perc"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Új levelek ellenőrzése induláskor"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Fogadás után minden helyi mappa frissítése"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Parancs végrehajtása, ha új üzenet érkezett"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "`%d' lesz helyettesítve az új üzenetek számával."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Külső program használata küldéshez"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Elküldött üzenetek mentése a Kimenő postafiókba"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "Szűrőszabályok alkalmazása az elküldött üzenetekre"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Kimenők karakterkódolása"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatikus (Ajánlott)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7 bites ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Nyugat Európai (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Nyugat Európai (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Közép Európai (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltikumi (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltikumi (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Görög (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Héber (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Héber (Windows-1255)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Török (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cirill (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cirill (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cirill (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cirill (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japán (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japán (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japán (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Egyszerűsített Kínai (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Egyszerűsített Kínai (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradicionális Kínai (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradicionális Kínai (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Kínai (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Koreai (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Ha az `Automatikus' be van kapcsolva, akkor az optimális kódolást "
+#~ "használja a helyi nyelvi beállításoknak megfelelően."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Átvitel kódolása"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Határozza meg a Content-Transfer-Encoding értékét, ha az üzenet tartalmaz "
+#~ "nem-ASCII karaktereket is."
+
+#~ msgid "Signature separator"
+#~ msgstr "Aláírás elválasztó"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Automatikus beillesztés"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Külső szerkesztő automatikus indítása"
+
+#~ msgid "Undo level"
+#~ msgstr "Visszavonás mélysége"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Sortörés helye"
+
+#~ msgid "characters"
+#~ msgstr "karakter"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Idézet törése"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Bevitel tördelése"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Sortördelés küldés előtt"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Automatikus hozzáférés választás válaszkor"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Üzenet idézése a válaszban"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "A `Válasz' gomb a `Válasz levelező listára' funkciót hozza fel"
+
+#~ msgid "Reply format"
+#~ msgstr "Válasz formátuma"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Idézet jele"
+
+#~ msgid "Forward format"
+#~ msgstr "Továbbítás formátuma"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Szimbólumok leírása "
+
+#~ msgid "Font"
+#~ msgstr "Betűkészlet"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Fejléc fordítása (mint `Feladó:', `Tárgy:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Hírcsoportok rövidítése, ha hosszabb mint"
+
+#~ msgid "letters"
+#~ msgstr "levél"
+
+#~ msgid "Summary View"
+#~ msgstr "Összefoglaló nézet"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Címzett mutatása a `Feladó' oszlopban, ha önmagának küldte"
+
+#~ msgid "Expand threads"
+#~ msgstr "Folyam kifejtése"
+
+#~ msgid "Date format"
+#~ msgstr "Dátum formátuma"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Összefoglalás kijelzésének beállítása... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Színek használata az üzenetekhez"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Több byte-os karakterek és számok megjelenítése\n"
+#~ "ASCII karakterekkel (csak japán esetén)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Fejlécmező megjelenítése az üzenet fölött"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Rövid fejlécek az üzenet nézetben"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "HTML üzenet értelmezése szövegként"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Kurzor megjelenítése üzenet nézetben"
+
+#~ msgid "Line space"
+#~ msgstr "Sortávolság"
+
+#~ msgid "pixel(s)"
+#~ msgstr "Képpont"
+
+#~ msgid "Scroll"
+#~ msgstr "Görgetés"
+
+#~ msgid "Half page"
+#~ msgstr "Fél oldal"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Finom görgetés"
+
+#~ msgid "Step"
+#~ msgstr "Lépés"
+
+#~ msgid "Images"
+#~ msgstr "Képek"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "A nagy méretű csatolt képek ablakméretre igazítása"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Képek megjelenítése egyvonalban"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "Levélszemét szabályozás engedélyezése"
+
+#~ msgid "Learning command:"
+#~ msgstr "Tanítás parancs:"
+
+#~ msgid "Not Junk"
+#~ msgstr "Nem levélszemét"
+
+#~ msgid "Classifying command"
+#~ msgstr "Osztályozó parancs"
+
+#~ msgid "Junk folder"
+#~ msgstr "Levélszemét mappa"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr ""
+#~ "Azon üzenetek, melyek levélszemétként lettek beállítva törlődni fognak "
+#~ "ebből a mappából."
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "A fogadáskor megszűrt üzenetek levélszemétként osztályozva"
+
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "A megszűrt üzenetek a levélszemét mappába kerülnek át, és a törlésre "
+#~ "kerülnek a szerverről."
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Digitális aláírás automatikus ellenőrzése"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Aláírásellenőrzés eredménye felbukkanó ablakban"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Jelmondat ideiglenes tárolása a memóriában"
+
+#~ msgid "Expired after"
+#~ msgstr "Lejár ennyi után"
+
+#~ msgid "minute(s) "
+#~ msgstr "perc"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "'0'-ra állítva tárolja a jelmondatot a teljes menet alatt."
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Bevitel elkapása egy jelmondat beadásakor"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Az üzenetek mindig összefoglalva jelennek meg, ha ez kiválasztott"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Mappába lépéskor az első olvasatlan üzenet megnyitása"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Csak az új ablakban megnyitott üzeneteket jelölje olvasottként."
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Váltson a bejövő postafiókra email fogadás után"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Azonnali végrehajtás üzenet mozgatás vagy törlés esetén"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "Az üzenetek kijelölten láthatók a feldolgozás alatt, ha ez ki van "
+#~ "kapcsolva."
+
+#~ msgid "Receive dialog"
+#~ msgstr "Fogadó ablak"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Fogadó ablak mutatása"
+
+#~ msgid "Always"
+#~ msgstr "Mindig"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Csak kézi fogadáskor"
+
+#~ msgid "Never"
+#~ msgstr "Soha"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Ne dobjon fel hibaablakot fogadási hiba esetén"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Fogadó ablak bezárása ha végzett"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "A gombrendszer elkészítése a GNOME HIG szerint"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Billentyű hozzárendelések... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Külső parancsok (%s helyére a fájlnév / URI kerül)"
+
+#~ msgid "Web browser"
+#~ msgstr "Web böngésző"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Dupla-klikk esetén cím a célmezőbe"
+
+#~ msgid "On exit"
+#~ msgstr "Kilépéskor"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Kilépéskor rákérdez"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Kuka ürítése kilépéskor"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Ürítés előtt rákérdez"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Elküldetlen üzenetek esetén figyelmeztet"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Összefoglaló gyorstár sértetlenségének pontos ellenőrzése"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Kapcsolja be, ha lehetőség van arra, hogy a mappák tartalmát egy másik "
+#~ "alkalmazás módosíthatja.\n"
+#~ "Ez az opció lassítja az összefoglalás megjelenésének idejét."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Hálózati adatátvitel időtúllépés:"
+
+#~ msgid "second(s)"
+#~ msgstr "másodperc"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "rövidített nap név"
+
+#~ msgid "the full weekday name"
+#~ msgstr "teljes nap név"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "rövidített hónapnév"
+
+#~ msgid "the full month name"
+#~ msgstr "a teljes hónapnév"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "ajánlott dátum- és időformátum a jelenlegi nyelvi beállításhoz"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "évszázad (év/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "hónap napja számként"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "óra számként (24 órás kijelzés)"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "óra számként (12 órás kijelzés)"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "Az év napja számként"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "hónap számként"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "perc számként"
+
+#~ msgid "either AM or PM"
+#~ msgstr "DE vagy DU"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "másodperc számként"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "hét napja számként"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "az évszám utolsó két számjegye"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "év számként"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "időzóna vagy név vagy rövidítés"
+
+#~ msgid "Specifier"
+#~ msgstr "Vezérlőjel"
+
+#~ msgid "Description"
+#~ msgstr "Leírás"
+
+#~ msgid "Example"
+#~ msgstr "Példa"
+
+#~ msgid "Set message colors"
+#~ msgstr "Üzenetszín beállítása"
+
+#~ msgid "Colors"
+#~ msgstr "Színek"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Idézett szöveg - első szint"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Idézett szöveg - második szint"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Idézett szöveg - harmadik szint"
+
+#~ msgid "URI link"
+#~ msgstr "URI-kapocs"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Idézet színeinek újrahasznosítása"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "1. szintű idézet színe"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "2. szintű idézet színe"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "3. szintű idézet színe"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "URI színe"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Szimbólumok leírása"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Dátum\n"
+#~ "Feladó\n"
+#~ "Feladó teljes neve\n"
+#~ "Feladó keresztneve\n"
+#~ "Feladó monogramja\n"
+#~ "Tárgy\n"
+#~ "Címzett\n"
+#~ "Másolat\n"
+#~ "Hírcsoportok\n"
+#~ "Üzenet-azonosító"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Üzenet törzs\n"
+#~ "Idézett üzenet törzs\n"
+#~ "Üzenet törzs aláírás nélkül\n"
+#~ "Idézett üzenet törzs aláírás nélkül\n"
+#~ "Szó szerint %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Repjel karakterrel\n"
+#~ "Kérdőjel karakterrel\n"
+#~ "Nyitó kapcsos zárójel\n"
+#~ "Záró kapcsos zárójel"
+
+#~ msgid "Key bindings"
+#~ msgstr "Billentyű hozzárendelések"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Billentyű hozzárendelés előválasztó beállítása.\n"
+#~ "Módosíthatod minden menü gyorsbillentyűjét, ha az egérmutatóval\n"
+#~ "rámutatva megnyomod a kívánt billentyűt."
+
+#~ msgid "Default"
+#~ msgstr "Alapértelmezés"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Régi Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Betűtípus választás"
 
diff --git a/po/it.po b/po/it.po
index 6e235657..279626bc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2005-07-30 09:56+0200\n"
 "Last-Translator: danilo bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -15,13 +15,402 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Lettura della configurazione per ogni account...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "la scrittura della configurazione sul file è fallita\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "La connessione IMAP4 a %s è stata interrotta. Riconnessione...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Il server IMAP4 disabilita il LOGIN.\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Impossibile avviare la sessione TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Invio del messaggio (%d di %d byte)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Copia del messaggio %s%c%d in %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Copia del messaggio %s%c%d in %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Ricezione dei messaggi da %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "impossibile impostare i flag eliminati: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "impossibile cancellare\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Ricezione dei messaggi da %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "impossibile impostare i flag eliminati: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "impossibile chiudere la cartella\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "la cartella radice %s non esiste\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "si è verificato un errore durante la ricezione di LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Impossibile creare «%s»\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "impossibile creare la casella postale: LIST fallito\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "impossibile creare la casella postale\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "impossibile rinominare la casella postale: %s in %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "impossibile eliminare la casella postale\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "impossibile ricevere la busta\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Invio del messaggio (%d di %d byte)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "si è verificato un errore durante la ricezione della busta.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "impossibile analizzare la busta: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "impossibile ricevere il namespace\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "impossibile selezionare la cartella: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "Autenticazione IMAP4 fallita.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Login IMAP4 fallito.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "impossibile aggiungere %s a %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(spedizione del file...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "impossibile aggiungere a %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "impossibile copiare %s in %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "errore durante il comando imap: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "errore durante il comando imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "errore durante il comando imap: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv non può convertire UTF-7 in %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv non può convertire %s in UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "impossibile copiare il messaggio %s in %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "impossibile aprire il file delle segnature.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "la cartella sorgente é identica a quella di destinazione.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Copia del messaggio %s%c%d in %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Ultimo numero nella cartella %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Il file «%s» esiste già.\n"
+"Impossibile creare la cartella."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"Il nome della directory \n"
+"«%s» non è una stringa UTF-8 valida.\n"
+"Probabilmente la codifica locale è usata per il nome del file.\n"
+"Se è questo il caso, si deve impostare la seguente variabile di ambiente\n"
+"(vedere README per i dettagli):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "Creazione della connessione NNTP con %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "La connessione NNTP a %s:%d è stata interrotta. Riconnessione...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "l'articolo %d è già nella cache.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "ricezione dell'articolo %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "impossibile leggere l'articolo %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "impossibile recuperare la lista dei newsgroup\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "impossibile inviare l'articolo.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "impossibile recuperare l'articolo %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "impossibile selezionare il gruppo: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "intervallo di articoli non valido: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "non ci sono nuovi articoli.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "ricezione di xover %d - %d in %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "impossibile ricevere xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "si è verificato un errore durante la ricezione di xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "riga xover non valida: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "impossibile ricevere xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "si è verificato un errore durante la ricezione di xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "errore del protocollo: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "errore del protocollo\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Si è verificato un errore durante l'invio del comando\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Nel saluto non è stata trovata la necessaria data/ora APOP\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Errore di sintassi nella data/ora del saluto\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Errore nel protocollo POP3\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "risposta UIDL non valida: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Eliminazione del messaggio scaduto %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Salto il messaggio %d (%d byte)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "la casella postale è bloccata\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "timeout della sessione \n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "impossibile avviare la sessione TLS\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "si è verificato un errore durante l'autenticazione\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "comando non supportato\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "si è verificato un errore durante la sessione POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -31,6 +420,52 @@ msgstr "Trovato %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configurazione è stata salvata.\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "Filtro mail spazzatura"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "Impossibile aprire il file delle segnature\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "impossibile prelevare il messaggio %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Impossibile ricevere parte del testo\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "La riga di comando di stampa non è valida: «%s»\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "si è verificato un errore durante il recupero dei dati.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Impossibile scrivere sul file.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH non disponibile\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "risposta SMTP difettosa\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "si è verificato un errore durante la sessione SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 non disponibile\n"
@@ -164,78 +599,6 @@ msgstr ""
 "insieme a questo programma; in caso contrario, scrivete alla Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Lettura della configurazione per ogni account...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Alcune finestre di composizione sono aperte.\n"
-"Chiudere tutte le finestre di composizione prima di modificare gli account."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Apertura della finestra di modifica dell'account...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Creazione della finestra di modifica dell'account...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Modifica degli account"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"I nuovi messaggi saranno controllati in questo ordine. Spuntare le caselle "
-"nella\n"
-"colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi "
-"tutti»."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nome"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protocollo"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr " Modifica "
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr " _Imposta come account predefinito "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Eliminare l'account «%s»?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(Senza titolo)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Elimina account"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -335,6 +698,14 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nome"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -349,8 +720,8 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_File"
 
@@ -371,9 +742,9 @@ msgid "/_File/New _Server"
 msgstr "/_File/_Nuovo server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_File/---"
 
@@ -389,7 +760,7 @@ msgstr "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
@@ -421,8 +792,8 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
@@ -430,13 +801,13 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
@@ -453,17 +824,17 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Modifica"
 
@@ -475,7 +846,7 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -485,14 +856,14 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Elimina"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -503,11 +874,11 @@ msgid "Lookup"
 msgstr "Cerca"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -534,7 +905,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -646,7 +1017,7 @@ msgstr "Errore di conversione della rubrica"
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interfaccia"
 
@@ -666,8 +1037,7 @@ msgstr "Indirizzo email"
 msgid "Group"
 msgstr "Gruppo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Cartella"
 
@@ -691,15 +1061,15 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Errore"
 
@@ -754,8 +1124,8 @@ msgstr "/_Aggiungi..."
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
@@ -795,8 +1165,8 @@ msgstr "/_Modifica/_Annulla"
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
@@ -804,7 +1174,7 @@ msgstr "/_Modifica/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
@@ -816,7 +1186,7 @@ msgstr "/_Modifica/_Incolla"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
@@ -832,7 +1202,7 @@ msgstr "/_Modifica/A capo tutte le righe _lunghe"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Visualizza"
@@ -854,9 +1224,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
@@ -872,7 +1242,7 @@ msgstr "/_Visualizza/R_ighello"
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
@@ -883,103 +1253,103 @@ msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
@@ -987,14 +1357,14 @@ msgstr "/S_trumenti/_Rubrica"
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
@@ -1015,10 +1385,6 @@ msgstr "/_Strumenti/_Cifratura PGP"
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Impossibile ricevere parte del testo\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
@@ -1094,7 +1460,7 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
@@ -1191,8 +1557,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Invia"
 
@@ -1232,8 +1597,7 @@ msgstr "Allega"
 msgid "Attach file"
 msgstr "Allega il file"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Firma"
 
@@ -1241,7 +1605,7 @@ msgstr "Firma"
 msgid "Insert signature"
 msgstr "Inserisce la firma"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1433,7 +1797,7 @@ msgstr "Modifica"
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valore"
 
@@ -1466,7 +1830,6 @@ msgid " Check File "
 msgstr " Controllo file "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "File"
 
@@ -1523,12 +1886,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -1545,7 +1908,7 @@ msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1609,7 +1972,7 @@ msgstr "Timeout (secondi)"
 msgid "Maximum Entries"
 msgstr "Numero massimo di voci"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Essenziale"
 
@@ -1667,7 +2030,6 @@ msgid "Exporting file:"
 msgstr "File su cui esportare:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Seleziona... "
 
@@ -1691,160 +2053,160 @@ msgstr "Sovrascrivere il file esistente?"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/_Sposta cartella..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Elimina cartella"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Svuo_ta cestino"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Controllo nuovi messaggi"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/R_icostruisci l'albero cartella"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Ricerca _messaggi..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Sc_arica"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Iscrizione newsgroup..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Rimuovi newsgroup..."
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "Tot."
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1854,21 +2216,21 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1882,21 +2244,21 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1905,34 +2267,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -1993,7 +2355,7 @@ msgstr "ricevuti %d newsgroup (%s letti)"
 msgid "Newsgroups:"
 msgstr "Newsgroup:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -2017,159 +2379,6 @@ msgstr "Creazione della vista dell'immagine...\n"
 msgid "Can't load the image."
 msgstr "Impossibile caricare l'immagine."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "La connessione IMAP4 a %s è stata interrotta. Riconnessione...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Il server IMAP4 disabilita il LOGIN.\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Impossibile avviare la sessione TLS.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "impossibile impostare i flag eliminati: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "impossibile cancellare\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "impossibile impostare i flag eliminati: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "impossibile chiudere la cartella\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "la cartella radice %s non esiste\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "si è verificato un errore durante la ricezione di LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Impossibile creare «%s»\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "impossibile creare la casella postale: LIST fallito\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "impossibile creare la casella postale\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "impossibile rinominare la casella postale: %s in %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "impossibile eliminare la casella postale\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "impossibile ricevere la busta\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "si è verificato un errore durante la ricezione della busta.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "impossibile analizzare la busta: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "impossibile ricevere il namespace\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "impossibile selezionare la cartella: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "Autenticazione IMAP4 fallita.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Login IMAP4 fallito.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "impossibile aggiungere %s a %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(spedizione del file...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "impossibile aggiungere a %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "impossibile copiare %s in %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "errore durante il comando imap: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "errore durante il comando imap: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "errore durante il comando imap: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv non può convertire UTF-7 in %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv non può convertire %s in UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importa"
@@ -2267,7 +2476,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Successivo"
 
@@ -2283,143 +2492,143 @@ msgstr "Attibuti"
 msgid "Finish"
 msgstr "Fine"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Vecchio sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Fatto (non ci sono nuovi messaggi)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2428,28 +2637,28 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2458,11 +2667,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2471,15 +2680,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -2497,29 +2706,20 @@ msgstr "Inserire la password"
 msgid "Protocol log"
 msgstr "Log del protocollo"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Il file «%s» esiste già.\n"
-"Impossibile creare la cartella."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non è supportato da glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONE]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2529,23 +2729,23 @@ msgstr ""
 "                         apre la finestra di composizione con allegati\n"
 "                         i file specificati"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve i nuovi messaggi"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve i nuovi messaggi di tutti gli account"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 invia tutti i messaggi accodati"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale dei messaggi"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2553,23 +2753,23 @@ msgstr ""
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "Codifica nome file"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2593,19 +2793,19 @@ msgstr ""
 "\n"
 "Continuo?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "C'è un messaggio in composizione. Uscire?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Messaggi accodati"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2614,15 +2814,15 @@ msgstr ""
 "Il supporto per OpenPGP è disabilitato."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2630,616 +2830,616 @@ msgstr ""
 "È stata trovata una versione precedente della configurazione.\n"
 "Trasferirla?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_File/Ca_rtella"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_File/Ca_rtella/Crea _nuova cartella..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_File/Ca_rtella/_Rinomina cartella..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_File/Ca_rtella/_Sposta cartella..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_File/Ca_rtella/Eli_mina cartella"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_File/_Casella postale"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_File/_Casella postale/_Aggiungi casella postale..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_File/_Casella postale/Rimuovi ca_sella postale"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_File/_Casella postale/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_File/_Casella postale/_Controllo nuovi messaggi"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_File/_Casella postale/Controllo nuovi _messaggi in tutte le cartelle"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_File/_Casella postale/R_icostruisci l'albero cartella"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_File/_Importa file mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_File/Esp_orta file mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_File/S_vuota cestino"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_File/Stam_pa..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora offli_ne"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/Seleziona t_hread"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio attuale..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Modifica/Ricerca _messaggi..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/A_lbero cartella"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Icone _e testo"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Testo"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Niente"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per n_umero"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visualizza/_Ordina/per dim_ensione"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visualizza/_Ordina/per dest_inatario"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per colore etic_hetta"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _segno"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visualizza/_Ordina/per non le_tti"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per a_llegato"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/No_n ordinare"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visualizza/_Ordina/_Ascendente"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visualizza/_Ordina/Dis_cendente"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/Vista _thread"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/E_spandi tutti i thread"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Nascondi tutti i t_hread"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Visualizza/I_mposta voci da visualizzare..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visualizza/V_ai a/Messaggio preced_ente"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio successi_vo"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non letto p_recedente"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non _letto successivo"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo pre_cedente"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nu_ovo successivo"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio _segnato precedente"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio se_gnato successivo"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visualizza/V_ai a/Messaggio etic_hettato precedente"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Visualizza/Mostra intesta_zioni"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/S_trumenti/Filtra le _mail spazzatura nei messaggi selezionati"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/S_trumenti/Ese_gui"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cam_bia account attuale"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambio del tipo di separazione della finestra da %d a %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3249,16 +3449,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3268,149 +3468,148 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -3528,32 +3727,32 @@ msgstr "Ho raggiunto la fine del messaggio; continuo dall'inizio?"
 msgid "Search finished"
 msgstr "Ricerca terminata"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Creazione della vista del messaggio...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Testo"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Allegati"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3562,7 +3761,7 @@ msgstr ""
 "Inserire la riga di comando per la stampa:\n"
 "(«%s» verrà sostituito col nome del file)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3571,48 +3770,6 @@ msgstr ""
 "La riga di comando per la stampa non è valida:\n"
 "«%s»"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "impossibile copiare il messaggio %s in %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "impossibile aprire il file delle segnature.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "la cartella sorgente é identica a quella di destinazione.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Copia del messaggio %s%c%d in %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Ultimo numero nella cartella %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"Il nome della directory \n"
-"«%s» non è una stringa UTF-8 valida.\n"
-"Probabilmente la codifica locale è usata per il nome del file.\n"
-"Se è questo il caso, si deve impostare la seguente variabile di ambiente\n"
-"(vedere README per i dettagli):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Apri"
@@ -3696,115 +3853,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La riga di comando del visualizzatore MIME non è valida: «%s»"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "Creazione della connessione NNTP con %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "La connessione NNTP a %s:%d è stata interrotta. Riconnessione...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "l'articolo %d è già nella cache.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "ricezione dell'articolo %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "impossibile leggere l'articolo %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "impossibile recuperare la lista dei newsgroup\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "impossibile inviare l'articolo.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "impossibile recuperare l'articolo %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "impossibile selezionare il gruppo: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "intervallo di articoli non valido: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "non ci sono nuovi articoli.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "ricezione di xover %d - %d in %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "impossibile ricevere xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "si è verificato un errore durante la ricezione di xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "riga xover non valida: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "impossibile ricevere xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "si è verificato un errore durante la ricezione di xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "errore del protocollo: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "errore del protocollo\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Si è verificato un errore durante l'invio del comando\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[nessun user id]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3817,7 +3874,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3825,448 +3882,6 @@ msgstr ""
 "Passphrase sbagliata! Provare ancora...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Nel saluto non è stata trovata la necessaria data/ora APOP\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Errore di sintassi nella data/ora del saluto\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Errore nel protocollo POP3\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "risposta UIDL non valida: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Eliminazione del messaggio scaduto %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Salto il messaggio %d (%d byte)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "la casella postale è bloccata\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "timeout della sessione \n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "impossibile avviare la sessione TLS\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "si è verificato un errore durante l'autenticazione\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "comando non supportato\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "si è verificato un errore durante la sessione POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Apertura della finestra delle preferenze degli account...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Account%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Preferenze per il nuovo account"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Preferenze dell'account"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Creazione della finestra delle preferenze degli account...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Ricevi"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privacy"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avanzato"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Nome di questo account"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Imposta come predefinito"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Informazioni personali"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Nome completo"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Indirizzo di posta"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizzazione"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informazioni sui server"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-# src/prefs_account.c:634 
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Nessuno (locale)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Questo server richiede l'autenticazione"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Server delle news"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server per la ricezione"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Server SMTP (spedisce)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "User ID"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Password"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Usa l'autenticazione sicura (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Rimuovi dopo "
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr " giorni"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 giorni: rimuovi immediatamente)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Scarica tutti i messaggi sul server"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Limite della dimensione da ricevere di"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtra i messaggi in ricezione"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Inbox predefinita"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "I messaggi non filtrati saranno memorizzati in questa cartella."
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Metodo di autenticazione"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatico"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "News"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "Numero massimo di articoli da scaricare"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "Nessun limite se viene specificato 0."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "«Ricevi tutti» controlla i nuovi messaggi su questo account"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Intestazione"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Aggiungi il campo Data nell'intestazione"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Genera ID messaggio"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Aggiungi un'intestazione definita dall'utente"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Modifica... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autenticazione"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Autenticazione SMTP (SMTP AUT)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Lasciando vuote queste voci verranno usate la stessa user ID e password "
-"della ricezione."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autentica con POP3 prima dell'invio"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Output del comando"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Imposta automaticamente i seguenti indirizzi"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Rispondi a"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Firma il messaggio per predefinizione"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Cifra il messaggio per predefinizione"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "Cifra quando rispondi a un messaggio cifrato"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Usa il formato ASCII-armato per la cifratura"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Usa la firma con il testo in chiaro"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Chiave della firma"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Usa la chiave predefinita di GnuPG"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Scegli la chiave per il tuo indirizzo email"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Specifica la chiave manualmente"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "ID user o chiave:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Non usare SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Usa SSL per la connessione POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Usa SSL per la connessione IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Usa SSL per la connessione NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Invio (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Usa SSL per la connessione SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Usa SSL non bloccato"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "Disattivare se si hanno problemi nella connessione SSL."
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Specifica la porta SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Specifica la porta POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Specifica la porta IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Specifica la porta NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Specifica il nome di dominio"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Directory del server IMAP4"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Metti i messaggi spediti in"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Metti i messaggi abbozzati in"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Metti i messaggi eliminati in"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Non è stato immesso il nome dell'account."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Non è stato immesso l'indirizzo di posta."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Non è stato immesso il server SMTP."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Non è stato immesso lo user ID."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Non è stato immesso il server POP3."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Non è stato immesso il server IMAP4."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Non è stato immesso il server NNTP."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Non è raccomandato l'uso del vecchio stile ASCII-armato\n"
-"per i messaggi cifrati. Non è compatibile con\n"
-"RFC 3156 - Sicurezza MIME con OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Configurazione delle azioni"
@@ -4332,17 +3947,17 @@ msgstr " Aiuto sintassi "
 msgid "Registered actions"
 msgstr "Azioni registrate"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Su"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Giù"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nuovo)"
 
@@ -4385,823 +4000,31 @@ msgstr "Elimina l'azione"
 msgid "Do you really want to delete this action?"
 msgstr "Eliminare questa azione?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "Filtro mail spazzatura"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Creazione della finestra delle preferenze comuni...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Preferenze comuni"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Cita"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Visualizzazione"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Messaggio"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Mail spazzatura"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Altro"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Usa un programma esterno per incorporare la posta"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Comando"
-
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "Incorpora dallo spool locale"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtra quando incorpori"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Percorso dello spool"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Controllo automatico nuova posta"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "ogni"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuto(i)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Controlla se c'è nuova posta all'avvio"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Aggiorna tutte le cartelle locali dopo l'incorporazione"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr "Esegui il comando quando arrivano nuovi messaggi"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "«%d» sarà sostituito con il numero dei nuovi messaggi."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Usa il programma esterno per l'invio"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Salva i messaggi inviati nella cartella «Inviata»"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "Applica le regole del filtro nell'inviare i messaggi"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Codifica usata in uscita"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatica (Raccomandata)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "ASCII a 7 bit (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Europa Occidentale (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Europa Occidentale (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Europa Centrale (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltico (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltico (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Greco (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Ebreo (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Ebreo (Windows-1255)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turco (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirillico (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirillico (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cirillico (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirillico (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Giapponese (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Giapponese (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Giapponese (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Cinese semplificato (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Cinese semplificato (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Cinese tradizionale (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Cinese tradizionale (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Cinese (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tailandese (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tailandese (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Selezionando «Automatico» verrà usata la codifica ottimale per la località "
-"attuale."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Codifica di trasferimento"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Specificare il contenuto della codifica di trasferimento usata quando il "
-"corpo del messaggio contiene dei caratteri non-ASCII."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Separatore della firma"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Inserisci automaticamente"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Lancia automaticamente l'editor esterno"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Livello di annulla"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Vai a capo nei messaggi dopo"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "caratteri"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "A capo nella citazione"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "A capo durante l'input"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "A capo prima dell'invio"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Seleziona automaticamente l'account per le risposte"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Cita il messaggio quando rispondi"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Formato della risposta"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Simbolo di citazione"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Formato di inoltro"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Descrizione dei simboli "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Carattere"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Traduci il nome dell'intestazione (come «Da:», «Oggetto:»)"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Accorcia i newsgroup più lunghi di"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "lettere"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Vista sommario"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Mostra il destinatario nella colonna «Da» se il mittente sei tu stesso"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Espandi i thread"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Formato della data"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Imposta le voci visibili nel sommario... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Abilita la colorazione del messaggio"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Mostra l'alfabeto e il numero multy-byte come\n"
-"carattere ASCII (solo Giapponese)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "Trasforma i messaggi HTML come testo."
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Mostra il cursore nella vista messaggio"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Spazio tra le righe"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Scorrimento"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Mezza pagina"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Scorrimento uniforme"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Passo"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "Immagini"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Mostra immagini in linea"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "Abilita il controllo della mail spazzatura"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "Comando di apprendimento:"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "Normale"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "Comando di classificazione"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "Cartella spazzatura"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-"I messaggi impostati come mail spazzatura saranno spostati in questa "
-"cartella."
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtra in ricezione i messaggi classificati come spazzatura"
-
-#: src/prefs_common.c:2051
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"I messaggi filtrati saranno spostati nella cartella spazzatura ed eliminati "
-"dal server."
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Controlla automaticamente le firme"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Mostra il risultato del controllo della firma in una finestra di popup"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Conserva temporaneamente in memoria la phassphrase"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Scade dopo"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minuto(i)"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "Impostando a «0» si conserverà la passphrase per l'intera sessione"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Nascondi l'input durante l'inserimento della passphrase"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Mostra un avvertimento alla partenza se GnuPG non è attivo"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Apri sempre i messaggi nel sommario quando selezionati"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Apri il primo messaggio non letto quando entri in una cartella"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr ""
-"Segna il messaggio come letto solo quando è aperto in una nuova finestra"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Vai a «In entrata» dopo la ricezione di nuova posta"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"I messaggi verranno solo segnati fino all'esecuzione se questa è inattiva."
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Finestra di ricezione"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Mostra la finestra di ricezione"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Sempre"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Solo in ricezione manuale"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Mai"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Chiudi la finestra di ricezione quando finito"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "Disposizione dei pulsanti conforme con lo GNOME HIG"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Impostazione delle associazioni dei tasti... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr ""
-"Comandi esterni (gli %s verranno sostituiti con il nome del file / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Browser web"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "In uscita"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Chiedi la conferma all'uscita"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Svuota il cestino all'uscita"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Chiedi prima di svuotare"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Avverti se ci sono messaggi accodati"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Abilita il controllo stretto dell'integrità delle cache del sommario"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-"Da abilitare se i contenuti delle cartelle hanno la possibilità di essere "
-"modificati da altre applicazioni.\n"
-"Questa opzione degraderà le prestazioni della visualizzazione del sommario."
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Timeout del socket I/O:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "secondo(i)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "il nome abbreviato del giorno della settimana"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "il nome completo del giorno della settimana"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "il nome abbreviato del mese"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "il nome completo del mese"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "la data e l'ora preferite per la località attuale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "il numero del secolo (anno/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "il giorno del mese come numero decimale"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "l'ora come numero decimale con l'orologio di 24 ore"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "l'ora come numero decimale con l'orologio di 12 ore"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "il giorno dell'anno come numero decimale"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "il mese come numero decimale"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "i minuti come numero decimale"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM o PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "i secondi come numero decimale"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "il giorno della settimana come numero decimale"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "la data preferita per la località attuale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "le ultime due cifre dell'anno"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "l'anno come numero decimale"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "il fuso orario o l'abbreviazione"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Specificatore"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Descrizione"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Esempio"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Impostazione dei colori del messaggio"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Colori"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Testo citato - Primo livello"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Testo citato - Secondo livello"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Testo citato - Terzo livello"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Link URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Ricicla i colori di citazione"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Scelta del colore per la citazione di livello 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Scelta del colore per la citazione di livello 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Scelta del colore per la citazione di livello 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Scelta del colore per l'URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Descrizione dei simboli"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Data\n"
-"Da\n"
-"Nome completo del mittente\n"
-"Nome del mittente\n"
-"Iniziali del mittente\n"
-"Oggetto\n"
-"A\n"
-"Cc\n"
-"Newsgroups\n"
-"ID-Messaggio"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Se è impostato x, mostra expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Corpo del messaggio\n"
-"Corpo del messaggio citato\n"
-"Corpo del messaggio senza firma\n"
-"Corpo del messaggio citato senza firma\n"
-"Percentuale"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Backslash\n"
-"Punto interrogativo\n"
-"Parentesi graffa aperta\n"
-"Parentesi graffa chiusa"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Associazioni dei tasti"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Seleziona la preimpostazione delle associazioni dei tasti.\n"
-"Si può anche modificare ognuno dei tasti scorciatoia del menù premendo\n"
-"un(dei) tasto(i) quando il puntatore del mouse è sulla voce del menù."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Predefinita"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Vecchio sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Impostazione dell'intestazione personalizzata"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Intestazione"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Elimina "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Intestazioni personalizzate"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Il nome dell'intestazione non è impostato."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Elimina l'intestazione"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Eliminare questa intestazione?"
 
@@ -5249,12 +4072,20 @@ msgstr "Impostazione dei filtri"
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr " Modifica "
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Eliminare la regola «%s»?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(Senza titolo)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Elimina la regola"
 
@@ -5338,6 +4169,10 @@ msgstr "è più lungo di"
 msgid "is shorter than"
 msgstr "è più corto di"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Sposta in"
@@ -5459,6 +4294,10 @@ msgstr "Elimina [...] o (...) all'inizio dell'oggetto nella risposta"
 msgid "Apply to subfolders"
 msgstr "Applica alle sottocartelle"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Imposta automaticamente i seguenti indirizzi"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "usa anche nella risposta"
@@ -5533,64 +4372,46 @@ msgstr "Voci visualizzate"
 msgid " Revert to default "
 msgstr " Ritorna al predefinito "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Nome del modello"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr " Registra "
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Sostituisci "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Modelli registrati"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Modelli"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Modello"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Errore nel formato del modello."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Elimina il modello"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Eliminare questo modello?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "Impossibile aprire il file delle segnature\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "impossibile prelevare il messaggio %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "La riga di comando di stampa non è valida: «%s»\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Creazione della finestra di avanzamento...\n"
@@ -5599,29 +4420,21 @@ msgstr "Creazione della finestra di avanzamento...\n"
 msgid "Status"
 msgstr "Stato"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "si è verificato un errore durante il recupero dei dati.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Impossibile scrivere sul file.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Impossibile trovare lo user ID per questa chiave."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\taka \"%s\"\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Firma fatta a %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Errore verificando la firma"
 
@@ -5647,6 +4460,10 @@ msgstr "ID chiave"
 msgid "Val"
 msgstr "Valore"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Altro"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Aggiungi una chiave"
@@ -5671,84 +4488,84 @@ msgstr ""
 "saprete con sicurezza se andrà alla persona che intendete voi.\n"
 "Ritenerla sufficientemente fidata da usarla comunque?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "L'intestazione del messaggio accodato è rovinata.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Invio del messaggio usando il comando: %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Impossibile eseguire il comando: %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Si è verificato un errore durante l'esecuzione del comando: %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Connessione"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connessione al server SMTP: %s..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Invio di HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Invio del messaggio..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Invio di EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Invio di MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Invio"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Invio di RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Invio di DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Esco..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Invio del messaggio (%d di %d byte)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Invio del messaggio"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Si è verificato un errore durante l'invio del messaggio."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5848,32 +4665,20 @@ msgstr "Firma DIFETTOSA"
 msgid "No public key to verify the signature"
 msgstr "Nessuna chiave pubblica per verificare la firma"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH non disponibile\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "risposta SMTP difettosa\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "si è verificato un errore durante la sessione SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Creazione della finestra del sorgente...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Sorgente del messaggio"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Visualizzazione del sorgente di %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Sorgente"
@@ -6265,6 +5070,942 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione.URL"
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Alcune finestre di composizione sono aperte.\n"
+#~ "Chiudere tutte le finestre di composizione prima di modificare gli "
+#~ "account."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Apertura della finestra di modifica dell'account...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Creazione della finestra di modifica dell'account...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Modifica degli account"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "I nuovi messaggi saranno controllati in questo ordine. Spuntare le "
+#~ "caselle nella\n"
+#~ "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi "
+#~ "tutti»."
+
+#~ msgid "Protocol"
+#~ msgstr "Protocollo"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid " _Set as default account "
+#~ msgstr " _Imposta come account predefinito "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Eliminare l'account «%s»?"
+
+#~ msgid "Delete account"
+#~ msgstr "Elimina account"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Apertura della finestra delle preferenze degli account...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Account%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Preferenze per il nuovo account"
+
+#~ msgid "Account preferences"
+#~ msgstr "Preferenze dell'account"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Creazione della finestra delle preferenze degli account...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Ricevi"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacy"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzato"
+
+#~ msgid "Name of this account"
+#~ msgstr "Nome di questo account"
+
+#~ msgid "Set as default"
+#~ msgstr "Imposta come predefinito"
+
+#~ msgid "Personal information"
+#~ msgstr "Informazioni personali"
+
+#~ msgid "Full name"
+#~ msgstr "Nome completo"
+
+#~ msgid "Mail address"
+#~ msgstr "Indirizzo di posta"
+
+#~ msgid "Organization"
+#~ msgstr "Organizzazione"
+
+#~ msgid "Server information"
+#~ msgstr "Informazioni sui server"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+# src/prefs_account.c:634 
+#~ msgid "None (local)"
+#~ msgstr "Nessuno (locale)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Questo server richiede l'autenticazione"
+
+#~ msgid "News server"
+#~ msgstr "Server delle news"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server per la ricezione"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Server SMTP (spedisce)"
+
+#~ msgid "User ID"
+#~ msgstr "User ID"
+
+#~ msgid "Password"
+#~ msgstr "Password"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Usa l'autenticazione sicura (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
+
+#~ msgid "Remove after"
+#~ msgstr "Rimuovi dopo "
+
+#~ msgid "days"
+#~ msgstr " giorni"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 giorni: rimuovi immediatamente)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Scarica tutti i messaggi sul server"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Limite della dimensione da ricevere di"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtra i messaggi in ricezione"
+
+#~ msgid "Default inbox"
+#~ msgstr "Inbox predefinita"
+
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "I messaggi non filtrati saranno memorizzati in questa cartella."
+
+#~ msgid "Authentication method"
+#~ msgstr "Metodo di autenticazione"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatico"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "Numero massimo di articoli da scaricare"
+
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Nessun limite se viene specificato 0."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "«Ricevi tutti» controlla i nuovi messaggi su questo account"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Aggiungi il campo Data nell'intestazione"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Genera ID messaggio"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Aggiungi un'intestazione definita dall'utente"
+
+#~ msgid " Edit... "
+#~ msgstr " Modifica... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticazione"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Autenticazione SMTP (SMTP AUT)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Lasciando vuote queste voci verranno usate la stessa user ID e password "
+#~ "della ricezione."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autentica con POP3 prima dell'invio"
+
+#~ msgid "Command output"
+#~ msgstr "Output del comando"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Rispondi a"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Firma il messaggio per predefinizione"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Cifra il messaggio per predefinizione"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "Cifra quando rispondi a un messaggio cifrato"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Usa il formato ASCII-armato per la cifratura"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Usa la firma con il testo in chiaro"
+
+#~ msgid "Sign key"
+#~ msgstr "Chiave della firma"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Usa la chiave predefinita di GnuPG"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Scegli la chiave per il tuo indirizzo email"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Specifica la chiave manualmente"
+
+#~ msgid "User or key ID:"
+#~ msgstr "ID user o chiave:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Non usare SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Usa SSL per la connessione POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Usa SSL per la connessione IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Usa SSL per la connessione NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Invio (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Usa SSL per la connessione SMTP"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Usa SSL non bloccato"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "Disattivare se si hanno problemi nella connessione SSL."
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Specifica la porta SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Specifica la porta POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Specifica la porta IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Specifica la porta NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Specifica il nome di dominio"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Directory del server IMAP4"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Metti i messaggi spediti in"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Metti i messaggi abbozzati in"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Metti i messaggi eliminati in"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Non è stato immesso il nome dell'account."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Non è stato immesso l'indirizzo di posta."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Non è stato immesso il server SMTP."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Non è stato immesso lo user ID."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Non è stato immesso il server POP3."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Non è stato immesso il server IMAP4."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Non è stato immesso il server NNTP."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Non è raccomandato l'uso del vecchio stile ASCII-armato\n"
+#~ "per i messaggi cifrati. Non è compatibile con\n"
+#~ "RFC 3156 - Sicurezza MIME con OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Creazione della finestra delle preferenze comuni...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Preferenze comuni"
+
+#~ msgid "Quote"
+#~ msgstr "Cita"
+
+#~ msgid "Display"
+#~ msgstr "Visualizzazione"
+
+#~ msgid "Message"
+#~ msgstr "Messaggio"
+
+#~ msgid "Junk mail"
+#~ msgstr "Mail spazzatura"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Usa un programma esterno per incorporare la posta"
+
+#~ msgid "Command"
+#~ msgstr "Comando"
+
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Incorpora dallo spool locale"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtra quando incorpori"
+
+#~ msgid "Spool path"
+#~ msgstr "Percorso dello spool"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Controllo automatico nuova posta"
+
+#~ msgid "every"
+#~ msgstr "ogni"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto(i)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Controlla se c'è nuova posta all'avvio"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Aggiorna tutte le cartelle locali dopo l'incorporazione"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Esegui il comando quando arrivano nuovi messaggi"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "«%d» sarà sostituito con il numero dei nuovi messaggi."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Usa il programma esterno per l'invio"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Salva i messaggi inviati nella cartella «Inviata»"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "Applica le regole del filtro nell'inviare i messaggi"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Codifica usata in uscita"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatica (Raccomandata)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "ASCII a 7 bit (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Europa Occidentale (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Europa Occidentale (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Europa Centrale (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltico (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltico (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Greco (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Ebreo (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Ebreo (Windows-1255)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turco (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cirillico (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cirillico (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cirillico (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cirillico (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Giapponese (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Giapponese (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Giapponese (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Cinese semplificato (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Cinese semplificato (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Cinese tradizionale (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Cinese tradizionale (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Cinese (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Coreano (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tailandese (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tailandese (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Selezionando «Automatico» verrà usata la codifica ottimale per la "
+#~ "località attuale."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Codifica di trasferimento"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Specificare il contenuto della codifica di trasferimento usata quando il "
+#~ "corpo del messaggio contiene dei caratteri non-ASCII."
+
+#~ msgid "Signature separator"
+#~ msgstr "Separatore della firma"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Inserisci automaticamente"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Lancia automaticamente l'editor esterno"
+
+#~ msgid "Undo level"
+#~ msgstr "Livello di annulla"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Vai a capo nei messaggi dopo"
+
+#~ msgid "characters"
+#~ msgstr "caratteri"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "A capo nella citazione"
+
+#~ msgid "Wrap on input"
+#~ msgstr "A capo durante l'input"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "A capo prima dell'invio"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Seleziona automaticamente l'account per le risposte"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Cita il messaggio quando rispondi"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
+
+#~ msgid "Reply format"
+#~ msgstr "Formato della risposta"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Simbolo di citazione"
+
+#~ msgid "Forward format"
+#~ msgstr "Formato di inoltro"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Descrizione dei simboli "
+
+#~ msgid "Font"
+#~ msgstr "Carattere"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Traduci il nome dell'intestazione (come «Da:», «Oggetto:»)"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr ""
+#~ "Mostra il numero dei messaggi non letti vicino al nome della cartella"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Accorcia i newsgroup più lunghi di"
+
+#~ msgid "letters"
+#~ msgstr "lettere"
+
+#~ msgid "Summary View"
+#~ msgstr "Vista sommario"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr ""
+#~ "Mostra il destinatario nella colonna «Da» se il mittente sei tu stesso"
+
+#~ msgid "Expand threads"
+#~ msgstr "Espandi i thread"
+
+#~ msgid "Date format"
+#~ msgstr "Formato della data"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Imposta le voci visibili nel sommario... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Abilita la colorazione del messaggio"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Mostra l'alfabeto e il numero multy-byte come\n"
+#~ "carattere ASCII (solo Giapponese)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "Trasforma i messaggi HTML come testo."
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Mostra il cursore nella vista messaggio"
+
+#~ msgid "Line space"
+#~ msgstr "Spazio tra le righe"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel"
+
+#~ msgid "Scroll"
+#~ msgstr "Scorrimento"
+
+#~ msgid "Half page"
+#~ msgstr "Mezza pagina"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Scorrimento uniforme"
+
+#~ msgid "Step"
+#~ msgstr "Passo"
+
+#~ msgid "Images"
+#~ msgstr "Immagini"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Mostra immagini in linea"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "Abilita il controllo della mail spazzatura"
+
+#~ msgid "Learning command:"
+#~ msgstr "Comando di apprendimento:"
+
+#~ msgid "Not Junk"
+#~ msgstr "Normale"
+
+#~ msgid "Classifying command"
+#~ msgstr "Comando di classificazione"
+
+#~ msgid "Junk folder"
+#~ msgstr "Cartella spazzatura"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr ""
+#~ "I messaggi impostati come mail spazzatura saranno spostati in questa "
+#~ "cartella."
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtra in ricezione i messaggi classificati come spazzatura"
+
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "I messaggi filtrati saranno spostati nella cartella spazzatura ed "
+#~ "eliminati dal server."
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Controlla automaticamente le firme"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr ""
+#~ "Mostra il risultato del controllo della firma in una finestra di popup"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Conserva temporaneamente in memoria la phassphrase"
+
+#~ msgid "Expired after"
+#~ msgstr "Scade dopo"
+
+#~ msgid "minute(s) "
+#~ msgstr "minuto(i)"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "Impostando a «0» si conserverà la passphrase per l'intera sessione"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Nascondi l'input durante l'inserimento della passphrase"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Mostra un avvertimento alla partenza se GnuPG non è attivo"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Apri sempre i messaggi nel sommario quando selezionati"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Apri il primo messaggio non letto quando entri in una cartella"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr ""
+#~ "Segna il messaggio come letto solo quando è aperto in una nuova finestra"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Vai a «In entrata» dopo la ricezione di nuova posta"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "I messaggi verranno solo segnati fino all'esecuzione se questa è inattiva."
+
+#~ msgid "Receive dialog"
+#~ msgstr "Finestra di ricezione"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Mostra la finestra di ricezione"
+
+#~ msgid "Always"
+#~ msgstr "Sempre"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Solo in ricezione manuale"
+
+#~ msgid "Never"
+#~ msgstr "Mai"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Chiudi la finestra di ricezione quando finito"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "Disposizione dei pulsanti conforme con lo GNOME HIG"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Impostazione delle associazioni dei tasti... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr ""
+#~ "Comandi esterni (gli %s verranno sostituiti con il nome del file / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Browser web"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
+
+#~ msgid "On exit"
+#~ msgstr "In uscita"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Chiedi la conferma all'uscita"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Svuota il cestino all'uscita"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Chiedi prima di svuotare"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Avverti se ci sono messaggi accodati"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr ""
+#~ "Abilita il controllo stretto dell'integrità delle cache del sommario"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Da abilitare se i contenuti delle cartelle hanno la possibilità di essere "
+#~ "modificati da altre applicazioni.\n"
+#~ "Questa opzione degraderà le prestazioni della visualizzazione del "
+#~ "sommario."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Timeout del socket I/O:"
+
+#~ msgid "second(s)"
+#~ msgstr "secondo(i)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "il nome abbreviato del giorno della settimana"
+
+#~ msgid "the full weekday name"
+#~ msgstr "il nome completo del giorno della settimana"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "il nome abbreviato del mese"
+
+#~ msgid "the full month name"
+#~ msgstr "il nome completo del mese"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "la data e l'ora preferite per la località attuale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "il numero del secolo (anno/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "il giorno del mese come numero decimale"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "l'ora come numero decimale con l'orologio di 24 ore"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "l'ora come numero decimale con l'orologio di 12 ore"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "il giorno dell'anno come numero decimale"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "il mese come numero decimale"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "i minuti come numero decimale"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM o PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "i secondi come numero decimale"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "il giorno della settimana come numero decimale"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "la data preferita per la località attuale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "le ultime due cifre dell'anno"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "l'anno come numero decimale"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "il fuso orario o l'abbreviazione"
+
+#~ msgid "Specifier"
+#~ msgstr "Specificatore"
+
+#~ msgid "Description"
+#~ msgstr "Descrizione"
+
+#~ msgid "Example"
+#~ msgstr "Esempio"
+
+#~ msgid "Set message colors"
+#~ msgstr "Impostazione dei colori del messaggio"
+
+#~ msgid "Colors"
+#~ msgstr "Colori"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Testo citato - Primo livello"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Testo citato - Secondo livello"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Testo citato - Terzo livello"
+
+#~ msgid "URI link"
+#~ msgstr "Link URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Ricicla i colori di citazione"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Scelta del colore per la citazione di livello 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Scelta del colore per la citazione di livello 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Scelta del colore per la citazione di livello 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Scelta del colore per l'URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Descrizione dei simboli"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Data\n"
+#~ "Da\n"
+#~ "Nome completo del mittente\n"
+#~ "Nome del mittente\n"
+#~ "Iniziali del mittente\n"
+#~ "Oggetto\n"
+#~ "A\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "ID-Messaggio"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Se è impostato x, mostra expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Corpo del messaggio\n"
+#~ "Corpo del messaggio citato\n"
+#~ "Corpo del messaggio senza firma\n"
+#~ "Corpo del messaggio citato senza firma\n"
+#~ "Percentuale"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Backslash\n"
+#~ "Punto interrogativo\n"
+#~ "Parentesi graffa aperta\n"
+#~ "Parentesi graffa chiusa"
+
+#~ msgid "Key bindings"
+#~ msgstr "Associazioni dei tasti"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Seleziona la preimpostazione delle associazioni dei tasti.\n"
+#~ "Si può anche modificare ognuno dei tasti scorciatoia del menù premendo\n"
+#~ "un(dei) tasto(i) quando il puntatore del mouse è sulla voce del menù."
+
+#~ msgid "Default"
+#~ msgstr "Predefinita"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Vecchio sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Selezione del carattere"
 
diff --git a/po/ja.po b/po/ja.po
index 7f570b05..9d124fb0 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,402 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "すべてのアカウント毎の設定を読み込み中...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "設定のファイルへの書き込みに失敗しました\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "%s へのIMAP4の接続が切れています。再接続します...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAPサーバは LOGIN を無効にしています。\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "%s:%d へのIMAP4の接続を確立中...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "TLS セッションを開始できません。\n"
+
+#: libsylph/imap.c:1211
+#, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "メッセージを %s に追加しています (%d / %d)"
+
+#: libsylph/imap.c:1296
+#, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "メッセージ %s を %s に移動しています..."
+
+#: libsylph/imap.c:1302
+#, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "メッセージ %s を %s にコピーしています..."
+
+#: libsylph/imap.c:1449
+#, c-format
+msgid "Removing messages %s"
+msgstr "メッセージ %s を削除しています"
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "deleted フラグをセットできません: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "expunge できません\n"
+
+#: libsylph/imap.c:1546
+#, c-format
+msgid "Removing all messages in %s"
+msgstr "%s のすべてのメッセージを削除しています"
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "deleted フラグをセットできません: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "フォルダをクローズできません\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "ルートフォルダ %s が存在しません\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "LIST の取得中にエラーが発生しました。\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "'%s' を作成できません。\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "INBOX の下に '%s' を作成できません。\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "メールボックスを作成できません: LIST に失敗\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "メールボックスを作成できません\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "メールボックスを名称変更できません: %s -> %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "メールボックスを削除できません\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "エンベロープを取得できません\n"
+
+#: libsylph/imap.c:2300
+#, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "メッセージのヘッダを取得中 (%d / %d)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "エンベロープを取得中にエラーが発生しました。\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "エンベロープを解析できません: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "%s:%d との IMAP4 セッションを確立できません\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "namespace を取得できません\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "フォルダ %s を選択できません\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 の認証に失敗しました。\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4のログインに失敗しました。\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "%s を %s に追加できません\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(ファイルを送信中...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "メッセージを %s に追加できません\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "%s を %s にコピーできません\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "imap コマンド中のエラー: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "imap コマンド中のエラー: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "imap コマンド中のエラー: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv が UTF-7 を %s に変換できません\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv が %s を UTF-7 に変換できません\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "メッセージ %s を %s にコピーできません\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "マークファイルを開けません。\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "移動元フォルダが移動先と同一です。\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "メッセージ %s%c%d を %s にコピーしています...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "ディレクトリ %s 内の最後の番号 = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"ファイル `%s' がすでに存在します。\n"
+"フォルダを作成できません。"
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"ディレクトリ名\n"
+"'%s' は有効な UTF-8 文字列ではありません。\n"
+"ファイル名にロケールエンコーディングが使用されている可能性があります。\n"
+"その場合は、以下の環境変数を指定する必要があります\n"
+"(詳細は README を参照):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "%s:%d への NNTP の接続を確立中...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "%s:%d への NNTP の接続が切れています。再接続します...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "%d 番の記事はすでにキャッシュされています。\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "%d 番の記事を取得しています...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "%d 番の記事を読めません\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "ニュースグループリストを取得できません\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "記事をポストできません。\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "%d 番の記事を取得できません\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "グループを選択できません: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "無効な記事の範囲です: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "新着記事はありません。\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "xover %d - %d を取得中 (%s)...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "xover 情報を取得できません\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "xover 情報を取得中にエラーが発生しました。\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "無効な xover 行です: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "xhdr 情報を取得できません\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "xhdr 情報を取得中にエラーが発生しました。\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "NNTPサーバ: %s:%d に接続できません\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "プロトコルエラー: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "プロトコルエラー\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "ポスト中にエラーが発生しました\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "コマンドの送信中にエラーが発生しました\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "必要なAPOPタイムスタンプが応答メッセージにありません\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "応答メッセージのタイムスタンプの文法エラー\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 プロトコルエラー\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "無効な UIDL 応答です: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: 期限切れのメッセージ %d を削除します\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: メッセージ %d をスキップします (%d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "メールボックスはロックされています\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "セッションがタイムアウトしました\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "TLS セッションを開始できません\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "認証中にエラーが発生しました\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "コマンドがサポートされていません\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "POP3 セッション中にエラーが発生しました\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +419,52 @@ msgstr "%s が見つかりました\n"
 msgid "Configuration is saved.\n"
 msgstr "設定を保存しました。\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "迷惑メールフィルタ"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "マークファイルを開けません\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "メッセージ %d を取り込めません\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "テキストパートを取得できません\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "印刷のコマンドラインが無効です: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "データの取得中にエラーが発生しました。\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "ファイルに書き込めません。\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH が利用できません\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "不正な SMTP 応答です\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "SMTP セッション中にエラーが発生しました\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 は利用できません\n"
@@ -163,76 +598,6 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "すべてのアカウント毎の設定を読み込み中...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"メッセージ作成ウィンドウが開いています。\n"
-"アカウントを編集する前にすべてのメッセージ作成ウィンドウを閉じてください。"
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "アカウント編集ウィンドウを開いています...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "アカウント編集ウィンドウを作成中...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "アカウントの編集"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
-"の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "名前"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "プロトコル"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "サーバ"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "編集"
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr " 通常使用するアカウントに指定(_S) "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "本当にアカウント '%s' を削除してもいいですか?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(名称未設定)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "アカウントの削除"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -332,6 +697,14 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "名前"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -346,8 +719,8 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
@@ -368,9 +741,9 @@ msgid "/_File/New _Server"
 msgstr "/ファイル(_F)/新規サーバ(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
@@ -386,7 +759,7 @@ msgstr "/ファイル(_F)/削除(_D)"
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
@@ -418,8 +791,8 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
@@ -427,13 +800,13 @@ msgstr "/ツール(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
@@ -450,17 +823,17 @@ msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
@@ -472,7 +845,7 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -482,14 +855,14 @@ msgstr "名前:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "削除"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -500,11 +873,11 @@ msgid "Lookup"
 msgstr "検索"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -530,7 +903,7 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
@@ -640,7 +1013,7 @@ msgstr "アドレス帳変換エラー"
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "インタフェース"
 
@@ -660,8 +1033,7 @@ msgstr "電子メール アドレス"
 msgid "Group"
 msgstr "グループ"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -685,15 +1057,15 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "エラー"
 
@@ -748,8 +1120,8 @@ msgstr "/追加(_A)..."
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
@@ -789,8 +1161,8 @@ msgstr "/編集(_E)/元に戻す(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
 
@@ -798,7 +1170,7 @@ msgstr "/編集(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
@@ -810,7 +1182,7 @@ msgstr "/編集(_E)/ペースト(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
@@ -826,7 +1198,7 @@ msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/表示(_V)"
@@ -848,9 +1220,9 @@ msgid "/_View/_Reply to"
 msgstr "/表示(_V)/返信先を指定(_R)"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
@@ -866,7 +1238,7 @@ msgstr "/表示(_V)/ルーラ(_U)"
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
@@ -877,103 +1249,103 @@ msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
@@ -981,14 +1353,14 @@ msgstr "/ツール(_T)/アドレス帳(_A)"
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
@@ -1009,10 +1381,6 @@ msgstr "/ツール(_T)/PGP暗号化(_E)"
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "テキストパートを取得できません\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
@@ -1088,7 +1456,7 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
@@ -1181,8 +1549,7 @@ msgstr "MIME タイプ"
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "送信"
 
@@ -1222,8 +1589,7 @@ msgstr "添付"
 msgid "Attach file"
 msgstr "ファイルを添付"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "署名"
 
@@ -1231,7 +1597,7 @@ msgstr "署名"
 msgid "Insert signature"
 msgstr "署名を挿入"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "エディタ"
 
@@ -1423,7 +1789,7 @@ msgstr "変更"
 msgid "Clear"
 msgstr "クリア"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "内容"
 
@@ -1456,7 +1822,6 @@ msgid " Check File "
 msgstr " ファイルをチェック "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "ファイル"
 
@@ -1512,12 +1877,12 @@ msgstr "フォルダの編集"
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -1534,7 +1899,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1598,7 +1963,7 @@ msgstr "タイムアウト(秒)"
 msgid "Maximum Entries"
 msgstr "最大エントリ数"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "基本"
 
@@ -1655,7 +2020,6 @@ msgid "Exporting file:"
 msgstr "エクスポートファイル:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " 選択... "
 
@@ -1679,160 +2043,160 @@ msgstr "既存のファイルを上書きしますか?"
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/新規フォルダを作成(_N)..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/フォルダ名を変更(_R)..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/フォルダを移動(_M)..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/フォルダを削除(_D)"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/ごみ箱を空にする(_T)"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/新着メッセージをチェック(_C)"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/フォルダツリーを再構築(_E)"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/メッセージを検索(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/ダウンロード(_L)"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/ニュースグループを購読(_B)..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/ニュースグループを削除(_R)"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "フォルダビューを作成中...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "新着"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未読"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "総数"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "フォルダ情報を設定中...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "フォルダツリーの再構築"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "フォルダツリーを再構築します。続けますか?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "フォルダツリーを再構築中..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "フォルダツリーの再構築に失敗しました。"
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1842,21 +2206,21 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1869,20 +2233,20 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "フォルダ `%s' を削除できません。"
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1891,34 +2255,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -1979,7 +2343,7 @@ msgstr "%d ニュースグループを受信 (%s 受信)"
 msgid "Newsgroups:"
 msgstr "ニュースグループ:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "件名:"
 
@@ -2003,159 +2367,6 @@ msgstr "イメージビューを作成中...\n"
 msgid "Can't load the image."
 msgstr "画像を読み込めません。"
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "%s へのIMAP4の接続が切れています。再接続します...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAPサーバは LOGIN を無効にしています。\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "%s:%d へのIMAP4の接続を確立中...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "TLS セッションを開始できません。\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "deleted フラグをセットできません: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "expunge できません\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "deleted フラグをセットできません: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "フォルダをクローズできません\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "ルートフォルダ %s が存在しません\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "LIST の取得中にエラーが発生しました。\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "'%s' を作成できません。\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "INBOX の下に '%s' を作成できません。\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "メールボックスを作成できません: LIST に失敗\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "メールボックスを作成できません\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "メールボックスを名称変更できません: %s -> %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "メールボックスを削除できません\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "エンベロープを取得できません\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "エンベロープを取得中にエラーが発生しました。\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "エンベロープを解析できません: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "%s:%d との IMAP4 セッションを確立できません\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "namespace を取得できません\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "フォルダ %s を選択できません\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 の認証に失敗しました。\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4のログインに失敗しました。\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "%s を %s に追加できません\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(ファイルを送信中...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "メッセージを %s に追加できません\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "%s を %s にコピーできません\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "imap コマンド中のエラー: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "imap コマンド中のエラー: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "imap コマンド中のエラー: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv が UTF-7 を %s に変換できません\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv が %s を UTF-7 に変換できません\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "インポート"
@@ -2253,7 +2464,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "次へ"
 
@@ -2269,142 +2480,142 @@ msgstr "属性"
 msgid "Finish"
 msgstr "完了"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 通の新着メッセージ"
 
-#: src/inc.c:162
+#: src/inc.c:161
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "新着メッセージを受信中"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "待機中"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "キャンセル"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "受信中"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完了 (%d 通 (%s) 受信)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "認証失敗"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "ロック中"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完了 (%d 通の新着メッセージ)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "メールの取得中にエラーが発生しました。"
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "アカウント %s の新着メッセージを取り込んでいます...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 新着メッセージを受信中"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3サーバ: %s に接続中..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s からメッセージを受信中..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "新着メッセージの数を取得中 (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "新着メッセージの数を取得中 (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "新着メッセージの数を取得中 (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "メッセージのサイズを取得中 (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "切断中"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "受信中 (%d 通 (%s) 受信)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2413,28 +2624,28 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2443,11 +2654,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2456,15 +2667,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -2482,29 +2693,20 @@ msgstr "パスワードの入力"
 msgid "Protocol log"
 msgstr "プロトコルログ"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"ファイル `%s' がすでに存在します。\n"
-"フォルダを作成できません。"
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread は glib によってサポートされていません。\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用法: %s [オプション]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    メッセージ作成ウィンドウを開く"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2514,23 +2716,23 @@ msgstr ""
 "                         指定したファイルを添付してメッセージ作成\n"
 "                         ウィンドウを開く"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              新着メッセージを受信する"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          全アカウントの新着メッセージを受信する"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送信待機中のメッセージをすべて送信する"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   メッセージの総数を表示する"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2538,23 +2740,23 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         各フォルダの状態を表示する"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                デバッグモード"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 このヘルプを表示して終了する"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              バージョン情報を出力して終了する"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "ファイル名エンコーディング"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2577,19 +2779,19 @@ msgstr ""
 "\n"
 "続行しますか?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "作成中のメッセージが存在します。本当に終了しますか?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "送信待機中のメッセージ"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "送信待機中の未送信メッセージがあります。終了しますか?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2598,15 +2800,15 @@ msgstr ""
 "OpenPGP サポートは無効です。"
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2614,617 +2816,617 @@ msgstr ""
 "以前のバージョンの設定が見つかりました。\n"
 "移行しますか?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/ファイル(_F)/フォルダ(_F)"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/新規フォルダを作成(_N)..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダ名を変更(_R)..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを移動(_M)..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを削除(_D)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを追加(_M)..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを削除(_R)"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/ファイル(_F)/メールボックス(_M)/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/ファイル(_F)/メールボックス(_M)/新着メッセージをチェック(_C)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/ファイル(_F)/メールボックス(_M)/すべてのメールボックスの新着メッセージを"
 "チェック(_A)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//ファイル(_F)/メールボックス(_M)/フォルダツリーを再構築(_E)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/ファイル(_F)/mboxファイルをインポート(_I)..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/ファイル(_F)/mboxファイルにエクスポート(_E)..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/ファイル(_F)/すべてのごみ箱を空にする(_T)"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/ファイル(_F)/名前を付けて保存(_S)..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/ファイル(_F)/印刷(_P)..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/ファイル(_F)/オフラインにする(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/ファイル(_F)/終了(_X)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/編集(_E)/スレッドを選択(_T)"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/編集(_E)/現在のメッセージ内を検索(_F)..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/編集(_E)/メッセージを検索(_S)..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/表示(_V)/表示・非表示(_D)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/表示(_V)/表示・非表示(_D)/フォルダツリー(_F)"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/表示(_V)/表示・非表示(_D)/メッセージビュー(_M)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコンと文字(_A)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコン(_I)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/文字(_T)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/非表示(_N)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/表示(_V)/表示・非表示(_D)/ステータスバー(_B)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/表示(_V)/フォルダツリーを分離(_O)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/表示(_V)/メッセージビューを分離(_M)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/表示(_V)/ソート(_S)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/表示(_V)/ソート(_S)/番号順(_N)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/表示(_V)/ソート(_S)/サイズ順(_I)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/表示(_V)/ソート(_S)/日付順(_D)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/表示(_V)/ソート(_S)/差出人順(_F)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/表示(_V)/ソート(_S)/宛先順(_R)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/表示(_V)/ソート(_S)/件名順(_S)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/表示(_V)/ソート(_S)/カラーラベル順(_C)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/表示(_V)/ソート(_S)/マーク(_M)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/表示(_V)/ソート(_S)/未読(_U)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/表示(_V)/ソート(_S)/添付(_T)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/表示(_V)/ソート(_S)/ソートしない(_O)"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/表示(_V)/ソート(_S)/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/表示(_V)/ソート(_S)/昇順"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/表示(_V)/ソート(_S)/降順"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/表示(_V)/ソート(_S)/件名でまとめる(_A)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/表示(_V)/スレッド表示(_R)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/表示(_V)/すべてのスレッドを展開(_X)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/表示(_V)/すべてのスレッドを閉じる(_L)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/表示(_V)/表示項目の設定(_I)..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/表示(_V)/移動(_G)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/表示(_V)/移動(_G)/前のメッセージ(_P)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/表示(_V)/移動(_G)/次のメッセージ(_N)"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/表示(_V)/移動(_G)/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/表示(_V)/移動(_G)/前の未読メッセージ(_R)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/表示(_V)/移動(_G)/次の未読メッセージ(_E)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/表示(_V)/移動(_G)/前の新着メッセージ(_W)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/表示(_V)/移動(_G)/次の新着メッセージ(_X)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/表示(_V)/移動(_G)/前のマーク付きメッセージ(_M)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/表示(_V)/移動(_G)/次のマーク付きメッセージ(_A)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/表示(_V)/移動(_G)/前のラベル付きメッセージ(_L)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/表示(_V)/移動(_G)/次のラベル付きメッセージ(_B)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/表示(_V)/移動(_G)/別のフォルダ(_F)..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動検出(_A)"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/表示(_V)/すべてのヘッダを表示(_H)"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/メッセージ(_M)/受信(_V)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/メッセージ(_M)/受信(_V)/現在のアカウントから受信(_C)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/メッセージ(_M)/受信(_V)/全アカウントから受信(_A)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/メッセージ(_M)/受信(_V)/受信を中止(_G)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/メッセージ(_M)/受信(_V)/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/メッセージ(_M)/移動(_O)..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/メッセージ(_M)/コピー(_C)..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/メッセージ(_M)/削除(_D)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク(_M)"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク解除(_U)"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/メッセージ(_M)/マーク(_M)/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/メッセージ(_M)/マーク(_M)/未読としてマーク(_E)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/メッセージ(_M)/マーク(_M)/読んだことにする(_D)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/メッセージ(_M)/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/メッセージ(_M)/迷惑メールに指定(_J)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/メッセージ(_M)/迷惑メールではない(_U)"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)..."
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分け(_F)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_S)"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/ツール(_T)/フォルダ中の迷惑メールを振り分け(_J)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/ツール(_T)/選択メッセージ中の迷惑メールを振り分け(_M)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/メッセージ(_M)/重複メッセージを削除(_P)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/ツール(_T)/実行(_X)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/ツール(_T)/ログウィンドウ(_L)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/全般の設定(_C)..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/振り分けの設定(_F)..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/テンプレート(_T)..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/アクション(_A)..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/現在のアカウントの設定(_P)..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新規アカウントの作成(_N)..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/アカウントの編集(_E)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/現在のアカウントを変更(_H)"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/ヘルプ(_H)/マニュアル(_M)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/英語(_E)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/日本語(_J)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/ヘルプ(_H)/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/ヘルプ(_H)/_FAQ/英語(_E)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/ヘルプ(_H)/_FAQ/ドイツ語(_G)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/ヘルプ(_H)/_FAQ/スペイン語(_S)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/ヘルプ(_H)/_FAQ/フランス語(_F)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/ヘルプ(_H)/_FAQ/イタリア語(_I)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/ヘルプ(_H)/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 msgid "Delete all messages in trash folders?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3233,16 +3435,16 @@ msgstr ""
 "メールボックスの位置を入力してください。\n"
 "既存のメールボックスを指定すると自動的にスキャンします。"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3251,149 +3453,148 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "新規メッセージを作成"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "迷惑メールに指定"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
@@ -3511,32 +3712,32 @@ msgstr "メッセージの終わりまで検索しました。始めから検索
 msgid "Search finished"
 msgstr "検索完了"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "メッセージビューを作成中...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "テキスト"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "添付"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3545,7 +3746,7 @@ msgstr ""
 "印刷コマンドを入力してください:\n"
 "(`%s' はファイル名で置き換えられます)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3554,48 +3755,6 @@ msgstr ""
 "印刷のコマンドラインが無効です:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "メッセージ %s を %s にコピーできません\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "マークファイルを開けません。\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "移動元フォルダが移動先と同一です。\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "メッセージ %s%c%d を %s にコピーしています...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "ディレクトリ %s 内の最後の番号 = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"ディレクトリ名\n"
-"'%s' は有効な UTF-8 文字列ではありません。\n"
-"ファイル名にロケールエンコーディングが使用されている可能性があります。\n"
-"その場合は、以下の環境変数を指定する必要があります\n"
-"(詳細は README を参照):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/開く(_O)"
@@ -3679,115 +3838,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME ビューアのコマンドラインが無効です: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "%s:%d への NNTP の接続を確立中...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "%s:%d への NNTP の接続が切れています。再接続します...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "%d 番の記事はすでにキャッシュされています。\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "%d 番の記事を取得しています...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "%d 番の記事を読めません\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "ニュースグループリストを取得できません\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "記事をポストできません。\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "%d 番の記事を取得できません\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "グループを選択できません: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "無効な記事の範囲です: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "新着記事はありません。\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "xover %d - %d を取得中 (%s)...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "xover 情報を取得できません\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "xover 情報を取得中にエラーが発生しました。\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "無効な xover 行です: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "xhdr 情報を取得できません\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "xhdr 情報を取得中にエラーが発生しました。\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "NNTPサーバ: %s:%d に接続できません\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "プロトコルエラー: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "プロトコルエラー\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "ポスト中にエラーが発生しました\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "コマンドの送信中にエラーが発生しました\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[ユーザIDなし]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3800,7 +3859,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3808,446 +3867,6 @@ msgstr ""
 "不正なパスフレーズです! 再入力して下さい...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "必要なAPOPタイムスタンプが応答メッセージにありません\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "応答メッセージのタイムスタンプの文法エラー\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 プロトコルエラー\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "無効な UIDL 応答です: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: 期限切れのメッセージ %d を削除します\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: メッセージ %d をスキップします (%d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "メールボックスはロックされています\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "セッションがタイムアウトしました\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "TLS セッションを開始できません\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "認証中にエラーが発生しました\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "コマンドがサポートされていません\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "POP3 セッション中にエラーが発生しました\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "アカウントプリファレンスウィンドウを開いています...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Account%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "新規アカウントの設定"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "アカウントの設定"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "アカウントプリファレンスウィンドウを作成中...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "受信"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "個人情報"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "高度な設定"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "このアカウントの名称"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "通常使用"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "個人情報"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "名前"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "メールアドレス"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "組織"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "サーバ情報"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "ニュース (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "なし (ローカル)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "このサーバは認証が必要"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "ニュースサーバ"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "受信用サーバ"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTPサーバ (送信)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "ユーザID"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "パスワード"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "安全な認証方式を使用する (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "受信時にサーバ上のメッセージを削除する"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "メッセージを"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "日後に削除"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0日: 即座に削除)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "サーバ上のすべてのメッセージを受信する"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "受信サイズ制限"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "受信時にメッセージを振り分ける"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "標準の受信箱"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "振り分けられなかったメッセージはこのフォルダに格納されます。"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "認証方式"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "自動"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "ニュース"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "ダウンロードする記事数の上限"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "0を指定すると無制限になります。"
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "「全受信」でこのアカウントの新着メッセージをチェックする"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "ヘッダ"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Dateヘッダフィールドを付ける"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "メッセージIDを生成する"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "ユーザ定義のヘッダを追加する"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " 編集... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "認証"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP認証 (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"このエントリが空のときは、受信時と同じユーザIDとパスワードが使用されます。"
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "送信前にPOP3認証を行う"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "コマンドの出力"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "以下のアドレスを自動指定"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "標準でメッセージに署名する"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "標準でメッセージを暗号化する"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "暗号化されたメッセージに返信した場合は暗号化する"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "暗号化にASCII包装形式を使用する"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "クリアテキスト署名を使用する"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "署名鍵"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "標準のGnuPG鍵を使用する"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "自分の電子メールアドレスで鍵を選択する"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "鍵を手動で指定する"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "ユーザまたは鍵ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "SSLを使用しない"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "POP3の接続にSSLを使用"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "SSLセッションの開始にSTARTTLSコマンドを使用"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "IMAP4の接続にSSLを使用"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "NNTPの接続にSSLを使用"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "送信 (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "SMTPの接続にSSLを使用"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "非ブロッキングSSLを使用する"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "SSLの接続に問題が生じる場合はオフにしてください。"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "SMTPポートを指定"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "POP3ポートを指定"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "IMAP4ポートを指定"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "NNTPポートを指定"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "ドメイン名を指定"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAPサーバディレクトリ"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "送信控フォルダの場所"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "草稿フォルダの場所"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "ごみ箱フォルダの場所"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "アカウント名が入力されていません。"
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "メールアドレスが入力されていません。"
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTPサーバが入力されていません。"
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "ユーザIDが入力されていません。"
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3サーバが入力されていません。"
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4サーバが入力されていません。"
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTPサーバが入力されていません。"
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"暗号化メッセージに旧形式の ASCII 包装方式を使用することは推奨されて\n"
-"いません。この形式は RFC 3156 - MIME Security with OpenPGP\n"
-"に準拠していません。"
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "アクションの設定"
@@ -4312,17 +3931,17 @@ msgstr " 文法のヘルプ "
 msgid "Registered actions"
 msgstr "登録済みアクション"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "  ↑  "
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "  ↓  "
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(新規)"
 
@@ -4365,816 +3984,31 @@ msgstr "アクションの削除"
 msgid "Do you really want to delete this action?"
 msgstr "本当にこのアクションを削除してもいいですか?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "迷惑メールフィルタ"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "全般プリファレンスウィンドウを作成中...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "全般の設定"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "引用"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "表示"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "メッセージ"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "迷惑メール"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "その他"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "メールの受信に外部プログラムを使用する"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "コマンド"
-
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "ローカルスプールから取り込む"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "取込時に振り分ける"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "スプールのパス"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "新着メールを自動チェックする"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr " "
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "分ごと"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "起動時に新着メールをチェックする"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "受信後にすべてのローカルフォルダを更新する"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr "新着メッセージが到着したらコマンドを実行する"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "`%d' は新着メッセージ数で置き換えられます。"
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "メールの送信に外部プログラムを使用する"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "送信したメッセージを送信控に保存する"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "送信したメッセージにフィルタルールを適用する"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "送信エンコーディング"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "自動設定 (推奨)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "欧米 (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "欧米 (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "中欧 (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "バルト諸国 (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "バルト諸国 (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "ギリシャ語 (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "ヘブライ語 (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "ヘブライ語 (Windows-1255)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "トルコ語 (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "キリル文字 (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "キリル文字 (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "キリル文字 (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "キリル文字 (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "日本語 (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "日本語 (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "日本語 (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "簡体字中国語 (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "簡体字中国語 (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "繁体字中国語 (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "繁体字中国語 (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "中国語 (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "韓国語 (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "タイ語 (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "タイ語 (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"「自動設定」を選択した場合は、現在の言語設定に最適なエンコーディングが使用さ"
-"れます。"
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "転送符号化方式"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"メッセージ本文が ASCII 文字以外を含む場合に使用する Content-Transfer-"
-"Encoding を指定してください。"
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "署名の区切り"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "自動的に挿入する"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "外部エディタを自動的に起動する"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "アンドゥの回数"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "メッセージを半角"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "文字で改行"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "引用部を自動整形する"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "入力時に自動整形する"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "送信時に自動整形する"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "返信時に自動的にアカウントを選択する"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "返信時にメッセージを引用する"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "返信ボタンでメーリングリストに返信する"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "返信の書式"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "引用符"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "転送の書式"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " 記号の説明 "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "フォント"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "ヘッダの項目を翻訳する (例えば `From:', `Subject:' 等)"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "フォルダ名の横に未読数を表示する"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "文字数が"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "字より長いニュースグループ名を簡略表示"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "サマリビュー"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示する"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "スレッドを展開する"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "日付の書式"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " サマリの表示項目を設定... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "メッセージの色を有効にする"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "マルチバイト英数字を ASCII 文字で表示する (日本語のみ)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "メッセージビューの上部にヘッダペインを表示する"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "メッセージビューに簡略ヘッダを表示する"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "HTML メッセージを解釈してテキスト表示する"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "メッセージビューにカーソルを表示する"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "行間を空ける"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "ピクセル"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "スクロール"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "半ページ単位"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "スムーズスクロール"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "間隔"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "画像"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "大きな添付画像をウィンドウにあわせてリサイズする"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "画像をインラインで表示する"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "迷惑メール対策を有効にする"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "学習コマンド:"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "非迷惑メール"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "判定コマンド"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "迷惑メールフォルダ"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr "迷惑メールに指定したメッセージをこのフォルダに移動します。"
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr "受信時に迷惑メールと判定されたメッセージを振り分ける"
-
-#: src/prefs_common.c:2051
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"振り分けられたメッセージを迷惑メールフォルダに移動し、サーバから削除します。"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "署名を自動的に検証する"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "署名の検証結果をポップアップウィンドウで表示する"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "パスフレーズをメモリ上に一時的に記憶する"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "有効期間"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "分"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "'0' に設定するとセッションの間中パスフレーズを記憶します。"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "パスフレーズの入力時に入力を捕捉する"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "GnuPG が動作しない場合起動時に警告を表示する"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "サマリでメッセージを選択したとき常に開く"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "フォルダに入ったときに最初の未読メッセージを開く"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "新規ウィンドウで開いたときのみメッセージを既読としてマーク"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "新着メールを受信した後受信箱に移動する"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "メッセージを移動または削除したら即座に実行する"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"これを無効にすると、メッセージは実行されるまでマークされた状態になります。"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "受信ダイアログ"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "受信ダイアログを"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "常に表示"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "手動で受信した場合のみ表示"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "表示しない"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "受信エラー時にエラーダイアログをポップアップしない"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "完了時に受信ダイアログを閉じる"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "ボタンの配置をGNOME HIGに準拠"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " キーバインドを設定... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "外部コマンド (%s はファイル名・URIで置き換えられます)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Webブラウザ"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "ダブルクリックしたときにアドレスを宛先に追加する"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "終了時"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "終了時に確認する"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "終了時にごみ箱を空にする"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "空にする前に尋ねる"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "送信待機中のメッセージがあれば警告する"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "サマリキャッシュの整合性を厳密にチェックする"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-"フォルダの内容が他のアプリケーションによって変更される可能性がある場合は有効"
-"にしてください。\n"
-"このオプションはサマリ表示の性能を低下させます。"
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "ソケット I/O のタイムアウト:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "秒"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "曜日の省略名"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "曜日の完全な名前"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "月の省略名"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "月の完全な名前"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "現在の地域における一般的な日付と時刻の表記"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "世紀(西暦年の上2桁)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "日(10進数表記)"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "24時間時計での時"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "12時間時計での時"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "年の初めから通算の日数(10進数表記)"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "月(10進数表記)"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "分(10進数表記)"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "午前または午後"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "秒(10進数表記)"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "週の何番目の日か(10進数表記)"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "現在の地域における一般的な日付表記"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "西暦の下2桁(世紀部分を含まない年)"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "(4桁の)西暦年"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "タイムゾーンまたはゾーン名または省略名"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "指定子"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "説明"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "例"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "メッセージの色を指定"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "色"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "引用文 - 1段階"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "引用文 - 2段階"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "引用文 - 3段階"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI リンク"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "引用色を循環"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "引用レベル1の色を選択"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "引用レベル2の色を選択"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "引用レベル3の色を選択"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "URI の色を選択"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "記号の説明"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"日付\n"
-"差出人\n"
-"差出人の氏名\n"
-"差出人の名前\n"
-"差出人のイニシャル\n"
-"件名\n"
-"宛先\n"
-"Cc\n"
-"ニュースグループ\n"
-"メッセージID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "xが指定されていればexprを表示"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"メッセージ本文\n"
-"引用符付きメッセージ本文\n"
-"メッセージ本文(署名なし)\n"
-"引用符付きメッセージ本文(署名なし)\n"
-"文字 %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"文字 バックスラッシュ(円記号)\n"
-"文字 疑問符\n"
-"文字 開き中括弧\n"
-"文字 閉じ中括弧"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "キーバインド"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"キーバインドのプリセットを選択してください。\n"
-"また、マウスポインタをメニューの項目の上に置きキーを押す\n"
-"ことで各メニューのショートカットを変更することもできます。"
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "標準"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "旧Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "カスタムヘッダの設定"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "ヘッダ"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr "  削除  "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "カスタムヘッダ"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "ヘッダ名が指定されていません。"
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "ヘッダの削除"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "本当にこのヘッダを削除してもいいですか?"
 
@@ -5222,12 +4056,20 @@ msgstr "振り分けの設定"
 msgid "Enabled"
 msgstr "有効"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "編集"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "本当にルール '%s' を削除してもいいですか?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(名称未設定)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "ルールの削除"
 
@@ -5311,6 +4153,10 @@ msgstr "が次より長い"
 msgid "is shorter than"
 msgstr "が次より短い"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "移動"
@@ -5432,6 +4278,10 @@ msgstr "返信時に件名の先頭の[...]または(...)の部分を削除す�
 msgid "Apply to subfolders"
 msgstr "サブフォルダにも適用する"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "以下のアドレスを自動指定"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "返信時にも使用"
@@ -5505,64 +4355,46 @@ msgstr "表示する項目"
 msgid " Revert to default "
 msgstr " 初期設定に戻す "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "テンプレート名"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "登録"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr "  置換  "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " 記号 "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "登録済みテンプレート"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "テンプレート"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "テンプレート"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "テンプレートの書式が不正です。"
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "テンプレートの削除"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "本当にこのテンプレートを削除してもいいですか?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "マークファイルを開けません\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "メッセージ %d を取り込めません\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "印刷のコマンドラインが無効です: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "進行状況ダイアログを作成中...\n"
@@ -5571,29 +4403,21 @@ msgstr "進行状況ダイアログを作成中...\n"
 msgid "Status"
 msgstr "状態"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "データの取得中にエラーが発生しました。\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "ファイルに書き込めません。\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "この鍵に対応するユーザIDが見つかりません。"
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\tまたは \"%s\"\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "署名の作成時刻 %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "署名検証エラー"
 
@@ -5619,6 +4443,10 @@ msgstr "鍵ID"
 msgid "Val"
 msgstr "正当性"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "その他"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "鍵の追加"
@@ -5643,84 +4471,84 @@ msgstr ""
 "それが目的の相手に届くかどうかは保証できません。\n"
 "とにかくこの鍵を信用して使用しますか?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "送信待機中のメッセージのヘッダが壊れています。\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "コマンドを使用してメッセージを送信中: %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "コマンドを実行できません: %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "コマンドの実行中にエラーが発生しました: %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "接続中"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTPサーバ: %s に接続中..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "HELO を送信中..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "メッセージを送信中..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "EHLO を送信中..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM を送信中..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "送信中"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO を送信中..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "DATA を送信中..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "切断中..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "メッセージを送信中 (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "メッセージの送信中にエラーが発生しました。"
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5820,32 +4648,20 @@ msgstr "不正な署名"
 msgid "No public key to verify the signature"
 msgstr "署名を検証するための公開鍵がありません"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH が利用できません\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "不正な SMTP 応答です\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "SMTP セッション中にエラーが発生しました\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "ソースウィンドウを作成中...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "メッセージのソース"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "%s のソースを表示しています...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - ソース"
@@ -6234,3 +5050,923 @@ msgstr ""
 #: src/textview.c:2084
 msgid "Fake URL warning"
 msgstr "偽装URLの警告"
+
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "メッセージ作成ウィンドウが開いています。\n"
+#~ "アカウントを編集する前にすべてのメッセージ作成ウィンドウを閉じてください。"
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "アカウント編集ウィンドウを開いています...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "アカウント編集ウィンドウを作成中...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "アカウントの編集"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
+#~ "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
+
+#~ msgid "Protocol"
+#~ msgstr "プロトコル"
+
+#~ msgid "Server"
+#~ msgstr "サーバ"
+
+#~ msgid " _Set as default account "
+#~ msgstr " 通常使用するアカウントに指定(_S) "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "本当にアカウント '%s' を削除してもいいですか?"
+
+#~ msgid "Delete account"
+#~ msgstr "アカウントの削除"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "アカウントプリファレンスウィンドウを開いています...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Account%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "新規アカウントの設定"
+
+#~ msgid "Account preferences"
+#~ msgstr "アカウントの設定"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "アカウントプリファレンスウィンドウを作成中...\n"
+
+#~ msgid "Receive"
+#~ msgstr "受信"
+
+#~ msgid "Privacy"
+#~ msgstr "個人情報"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "高度な設定"
+
+#~ msgid "Name of this account"
+#~ msgstr "このアカウントの名称"
+
+#~ msgid "Set as default"
+#~ msgstr "通常使用"
+
+#~ msgid "Personal information"
+#~ msgstr "個人情報"
+
+#~ msgid "Full name"
+#~ msgstr "名前"
+
+#~ msgid "Mail address"
+#~ msgstr "メールアドレス"
+
+#~ msgid "Organization"
+#~ msgstr "組織"
+
+#~ msgid "Server information"
+#~ msgstr "サーバ情報"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "ニュース (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "なし (ローカル)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "このサーバは認証が必要"
+
+#~ msgid "News server"
+#~ msgstr "ニュースサーバ"
+
+#~ msgid "Server for receiving"
+#~ msgstr "受信用サーバ"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTPサーバ (送信)"
+
+#~ msgid "User ID"
+#~ msgstr "ユーザID"
+
+#~ msgid "Password"
+#~ msgstr "パスワード"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "安全な認証方式を使用する (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "受信時にサーバ上のメッセージを削除する"
+
+#~ msgid "Remove after"
+#~ msgstr "メッセージを"
+
+#~ msgid "days"
+#~ msgstr "日後に削除"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0日: 即座に削除)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "サーバ上のすべてのメッセージを受信する"
+
+#~ msgid "Receive size limit"
+#~ msgstr "受信サイズ制限"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "受信時にメッセージを振り分ける"
+
+#~ msgid "Default inbox"
+#~ msgstr "標準の受信箱"
+
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "振り分けられなかったメッセージはこのフォルダに格納されます。"
+
+#~ msgid "Authentication method"
+#~ msgstr "認証方式"
+
+#~ msgid "Automatic"
+#~ msgstr "自動"
+
+#~ msgid "News"
+#~ msgstr "ニュース"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "ダウンロードする記事数の上限"
+
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "0を指定すると無制限になります。"
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "「全受信」でこのアカウントの新着メッセージをチェックする"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Dateヘッダフィールドを付ける"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "メッセージIDを生成する"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "ユーザ定義のヘッダを追加する"
+
+#~ msgid " Edit... "
+#~ msgstr " 編集... "
+
+#~ msgid "Authentication"
+#~ msgstr "認証"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP認証 (SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "このエントリが空のときは、受信時と同じユーザIDとパスワードが使用されます。"
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "送信前にPOP3認証を行う"
+
+#~ msgid "Command output"
+#~ msgstr "コマンドの出力"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Reply-To"
+
+#~ msgid "Sign message by default"
+#~ msgstr "標準でメッセージに署名する"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "標準でメッセージを暗号化する"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "暗号化されたメッセージに返信した場合は暗号化する"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "暗号化にASCII包装形式を使用する"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "クリアテキスト署名を使用する"
+
+#~ msgid "Sign key"
+#~ msgstr "署名鍵"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "標準のGnuPG鍵を使用する"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "自分の電子メールアドレスで鍵を選択する"
+
+#~ msgid "Specify key manually"
+#~ msgstr "鍵を手動で指定する"
+
+#~ msgid "User or key ID:"
+#~ msgstr "ユーザまたは鍵ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "SSLを使用しない"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "POP3の接続にSSLを使用"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "SSLセッションの開始にSTARTTLSコマンドを使用"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "IMAP4の接続にSSLを使用"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "NNTPの接続にSSLを使用"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "送信 (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "SMTPの接続にSSLを使用"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "非ブロッキングSSLを使用する"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "SSLの接続に問題が生じる場合はオフにしてください。"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "SMTPポートを指定"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "POP3ポートを指定"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "IMAP4ポートを指定"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "NNTPポートを指定"
+
+#~ msgid "Specify domain name"
+#~ msgstr "ドメイン名を指定"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAPサーバディレクトリ"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "送信控フォルダの場所"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "草稿フォルダの場所"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "ごみ箱フォルダの場所"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "アカウント名が入力されていません。"
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "メールアドレスが入力されていません。"
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTPサーバが入力されていません。"
+
+#~ msgid "User ID is not entered."
+#~ msgstr "ユーザIDが入力されていません。"
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3サーバが入力されていません。"
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4サーバが入力されていません。"
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTPサーバが入力されていません。"
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "暗号化メッセージに旧形式の ASCII 包装方式を使用することは推奨されて\n"
+#~ "いません。この形式は RFC 3156 - MIME Security with OpenPGP\n"
+#~ "に準拠していません。"
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "全般プリファレンスウィンドウを作成中...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "全般の設定"
+
+#~ msgid "Quote"
+#~ msgstr "引用"
+
+#~ msgid "Display"
+#~ msgstr "表示"
+
+#~ msgid "Message"
+#~ msgstr "メッセージ"
+
+#~ msgid "Junk mail"
+#~ msgstr "迷惑メール"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "メールの受信に外部プログラムを使用する"
+
+#~ msgid "Command"
+#~ msgstr "コマンド"
+
+#~ msgid "Incorporate from local spool"
+#~ msgstr "ローカルスプールから取り込む"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "取込時に振り分ける"
+
+#~ msgid "Spool path"
+#~ msgstr "スプールのパス"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "新着メールを自動チェックする"
+
+#~ msgid "every"
+#~ msgstr " "
+
+#~ msgid "minute(s)"
+#~ msgstr "分ごと"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "起動時に新着メールをチェックする"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "受信後にすべてのローカルフォルダを更新する"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "新着メッセージが到着したらコマンドを実行する"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "`%d' は新着メッセージ数で置き換えられます。"
+
+#~ msgid "Use external program for sending"
+#~ msgstr "メールの送信に外部プログラムを使用する"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "送信したメッセージを送信控に保存する"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "送信したメッセージにフィルタルールを適用する"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "送信エンコーディング"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "自動設定 (推奨)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "欧米 (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "欧米 (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "中欧 (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "バルト諸国 (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "バルト諸国 (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "ギリシャ語 (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "ヘブライ語 (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "ヘブライ語 (Windows-1255)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "トルコ語 (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "キリル文字 (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "キリル文字 (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "キリル文字 (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "キリル文字 (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "日本語 (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "日本語 (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "日本語 (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "簡体字中国語 (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "簡体字中国語 (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "繁体字中国語 (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "繁体字中国語 (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "中国語 (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "韓国語 (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "タイ語 (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "タイ語 (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "「自動設定」を選択した場合は、現在の言語設定に最適なエンコーディングが使用"
+#~ "されます。"
+
+#~ msgid "Transfer encoding"
+#~ msgstr "転送符号化方式"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "メッセージ本文が ASCII 文字以外を含む場合に使用する Content-Transfer-"
+#~ "Encoding を指定してください。"
+
+#~ msgid "Signature separator"
+#~ msgstr "署名の区切り"
+
+#~ msgid "Insert automatically"
+#~ msgstr "自動的に挿入する"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "外部エディタを自動的に起動する"
+
+#~ msgid "Undo level"
+#~ msgstr "アンドゥの回数"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "メッセージを半角"
+
+#~ msgid "characters"
+#~ msgstr "文字で改行"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "引用部を自動整形する"
+
+#~ msgid "Wrap on input"
+#~ msgstr "入力時に自動整形する"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "送信時に自動整形する"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "返信時に自動的にアカウントを選択する"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "返信時にメッセージを引用する"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "返信ボタンでメーリングリストに返信する"
+
+#~ msgid "Reply format"
+#~ msgstr "返信の書式"
+
+#~ msgid "Quotation mark"
+#~ msgstr "引用符"
+
+#~ msgid "Forward format"
+#~ msgstr "転送の書式"
+
+#~ msgid " Description of symbols "
+#~ msgstr " 記号の説明 "
+
+#~ msgid "Font"
+#~ msgstr "フォント"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "ヘッダの項目を翻訳する (例えば `From:', `Subject:' 等)"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "フォルダ名の横に未読数を表示する"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "文字数が"
+
+#~ msgid "letters"
+#~ msgstr "字より長いニュースグループ名を簡略表示"
+
+#~ msgid "Summary View"
+#~ msgstr "サマリビュー"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示する"
+
+#~ msgid "Expand threads"
+#~ msgstr "スレッドを展開する"
+
+#~ msgid "Date format"
+#~ msgstr "日付の書式"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " サマリの表示項目を設定... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "メッセージの色を有効にする"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "マルチバイト英数字を ASCII 文字で表示する (日本語のみ)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "メッセージビューの上部にヘッダペインを表示する"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "メッセージビューに簡略ヘッダを表示する"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "HTML メッセージを解釈してテキスト表示する"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "メッセージビューにカーソルを表示する"
+
+#~ msgid "Line space"
+#~ msgstr "行間を空ける"
+
+#~ msgid "pixel(s)"
+#~ msgstr "ピクセル"
+
+#~ msgid "Scroll"
+#~ msgstr "スクロール"
+
+#~ msgid "Half page"
+#~ msgstr "半ページ単位"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "スムーズスクロール"
+
+#~ msgid "Step"
+#~ msgstr "間隔"
+
+#~ msgid "Images"
+#~ msgstr "画像"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "大きな添付画像をウィンドウにあわせてリサイズする"
+
+#~ msgid "Display images as inline"
+#~ msgstr "画像をインラインで表示する"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "迷惑メール対策を有効にする"
+
+#~ msgid "Learning command:"
+#~ msgstr "学習コマンド:"
+
+#~ msgid "Not Junk"
+#~ msgstr "非迷惑メール"
+
+#~ msgid "Classifying command"
+#~ msgstr "判定コマンド"
+
+#~ msgid "Junk folder"
+#~ msgstr "迷惑メールフォルダ"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr "迷惑メールに指定したメッセージをこのフォルダに移動します。"
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "受信時に迷惑メールと判定されたメッセージを振り分ける"
+
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "振り分けられたメッセージを迷惑メールフォルダに移動し、サーバから削除しま"
+#~ "す。"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "署名を自動的に検証する"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "署名の検証結果をポップアップウィンドウで表示する"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "パスフレーズをメモリ上に一時的に記憶する"
+
+#~ msgid "Expired after"
+#~ msgstr "有効期間"
+
+#~ msgid "minute(s) "
+#~ msgstr "分"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "'0' に設定するとセッションの間中パスフレーズを記憶します。"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "パスフレーズの入力時に入力を捕捉する"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "GnuPG が動作しない場合起動時に警告を表示する"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "サマリでメッセージを選択したとき常に開く"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "フォルダに入ったときに最初の未読メッセージを開く"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "新規ウィンドウで開いたときのみメッセージを既読としてマーク"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "新着メールを受信した後受信箱に移動する"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "メッセージを移動または削除したら即座に実行する"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "これを無効にすると、メッセージは実行されるまでマークされた状態になります。"
+
+#~ msgid "Receive dialog"
+#~ msgstr "受信ダイアログ"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "受信ダイアログを"
+
+#~ msgid "Always"
+#~ msgstr "常に表示"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "手動で受信した場合のみ表示"
+
+#~ msgid "Never"
+#~ msgstr "表示しない"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "受信エラー時にエラーダイアログをポップアップしない"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "完了時に受信ダイアログを閉じる"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "ボタンの配置をGNOME HIGに準拠"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " キーバインドを設定... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "外部コマンド (%s はファイル名・URIで置き換えられます)"
+
+#~ msgid "Web browser"
+#~ msgstr "Webブラウザ"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "ダブルクリックしたときにアドレスを宛先に追加する"
+
+#~ msgid "On exit"
+#~ msgstr "終了時"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "終了時に確認する"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "終了時にごみ箱を空にする"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "空にする前に尋ねる"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "送信待機中のメッセージがあれば警告する"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "サマリキャッシュの整合性を厳密にチェックする"
+
+#~ msgid ""
+#~ "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 ""
+#~ "フォルダの内容が他のアプリケーションによって変更される可能性がある場合は有"
+#~ "効にしてください。\n"
+#~ "このオプションはサマリ表示の性能を低下させます。"
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "ソケット I/O のタイムアウト:"
+
+#~ msgid "second(s)"
+#~ msgstr "秒"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "曜日の省略名"
+
+#~ msgid "the full weekday name"
+#~ msgstr "曜日の完全な名前"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "月の省略名"
+
+#~ msgid "the full month name"
+#~ msgstr "月の完全な名前"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "現在の地域における一般的な日付と時刻の表記"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "世紀(西暦年の上2桁)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "日(10進数表記)"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "24時間時計での時"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "12時間時計での時"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "年の初めから通算の日数(10進数表記)"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "月(10進数表記)"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "分(10進数表記)"
+
+#~ msgid "either AM or PM"
+#~ msgstr "午前または午後"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "秒(10進数表記)"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "週の何番目の日か(10進数表記)"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "現在の地域における一般的な日付表記"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "西暦の下2桁(世紀部分を含まない年)"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "(4桁の)西暦年"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "タイムゾーンまたはゾーン名または省略名"
+
+#~ msgid "Specifier"
+#~ msgstr "指定子"
+
+#~ msgid "Description"
+#~ msgstr "説明"
+
+#~ msgid "Example"
+#~ msgstr "例"
+
+#~ msgid "Set message colors"
+#~ msgstr "メッセージの色を指定"
+
+#~ msgid "Colors"
+#~ msgstr "色"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "引用文 - 1段階"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "引用文 - 2段階"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "引用文 - 3段階"
+
+#~ msgid "URI link"
+#~ msgstr "URI リンク"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "引用色を循環"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "引用レベル1の色を選択"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "引用レベル2の色を選択"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "引用レベル3の色を選択"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "URI の色を選択"
+
+#~ msgid "Description of symbols"
+#~ msgstr "記号の説明"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "日付\n"
+#~ "差出人\n"
+#~ "差出人の氏名\n"
+#~ "差出人の名前\n"
+#~ "差出人のイニシャル\n"
+#~ "件名\n"
+#~ "宛先\n"
+#~ "Cc\n"
+#~ "ニュースグループ\n"
+#~ "メッセージID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "xが指定されていればexprを表示"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "メッセージ本文\n"
+#~ "引用符付きメッセージ本文\n"
+#~ "メッセージ本文(署名なし)\n"
+#~ "引用符付きメッセージ本文(署名なし)\n"
+#~ "文字 %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "文字 バックスラッシュ(円記号)\n"
+#~ "文字 疑問符\n"
+#~ "文字 開き中括弧\n"
+#~ "文字 閉じ中括弧"
+
+#~ msgid "Key bindings"
+#~ msgstr "キーバインド"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "キーバインドのプリセットを選択してください。\n"
+#~ "また、マウスポインタをメニューの項目の上に置きキーを押す\n"
+#~ "ことで各メニューのショートカットを変更することもできます。"
+
+#~ msgid "Default"
+#~ msgstr "標準"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "旧Sylpheed"
diff --git a/po/ko.po b/po/ko.po
index 1fa68b35..5d31d1fc 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,404 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "파일에 설정을 쓰기가 실패했습니다\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "%s:%d에대한 IMAP4 접속이 끊어졌습니다. 다시 접속...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP 서버 디렉토리"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "%s:%d에대한 IMAP4 접속을 만듭니다 ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "TLS 세션을 시작할 수 없습니다.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "메시지를 보내는 중 (%d / %d 바이트)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "메시지 %s%c%d를 %s로 이동합니다...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "지울 수가 없습니다\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "폴더를 선택할 수가 없습니다: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "표시 파일이 발견되지않음.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "LIST를 얻는 도중 에러가 발생.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "'%s'를 생성할 수가 없습니다\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "우편함을 생성할 수 없습니다\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "우편함을 삭제할 수 없습니다\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "envelope를 얻을 수가 없습니다\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "메시지를 보내는 중 (%d / %d 바이트)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "envelope를 얻는 중 에러 발생.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "envelope를 파싱할 수가 없습니다: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "namespace를 얻을 수 없습니다\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "폴더를 선택할 수가 없습니다: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "인증 방법"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 로그인을 실패했습니다.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "%s를 %s에 붙일 수 없습니다\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(파일을 보냅니다...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "%s 메시지를 추가할 수가 없습니다\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "%d를 %s로 복사할 수가 없습니다\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "표시 파일을 열 수가 없습니다.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "디렉토리 %s에서 마지막 숫자 = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"파일 `%s'가 이미 존재합니다.\n"
+"폴더를 생성할 수가 없습니다."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "%s:%d로 NNTP 접속을 생성합니다...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "%s:%d로의 NNTP 연결이 끊어졌습니다. 다시 연결합니다...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "기사 %d는 이미 캐쉬되었습니다.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "기사 %d를 얻습니다...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "기사 %d를 읽을 수가 없습니다\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "뉴스그룹 목록을 받을 수가 없습니다\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "기사를 올릴 수가 없습니다.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "기사 %d를 가져올 수가 없습니다\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "%s 그룹을 선택할 수가 없습니다\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "올바르지않은 기사 범위: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "새 기사가 없습니다.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "%3$s에서 %1$d - %2$d xover를 가져옴...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "xover를 가져올 수가 없습니다\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "xover를 얻는 도중 에러가 발생.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "올바르지않은 xover line: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "xhdr을 가져올 수가 없습니다\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "xhdr을 얻는 도중 에러가 발생.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "%s:%d NNTP 서버에 연결할 수가 없습니다\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "프로토콜 에러: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "프로토콜 에러\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "글을 올리는 도중 에러 발생\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "메일을 처리하는 도중 에러"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "greeting에서 발견되지않은 APOP 타임 스탬프가 요구됨\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "greeting에서 타임 스탬프에 문법 오류\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 프로토콜 에러\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "올바르지않은 xover line: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: 만료된 메시지 %d를 삭제합니다\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: 메시지 %d를 건너뜁니다 (%d 바이트)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "우편함이 잠겨있습니다\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "TLS 세션을 시작할 수 없습니다\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "인증 도중 에러 발생\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "명령어"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "인증 도중 에러 발생\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +421,54 @@ msgstr "%s을 발견\n"
 msgid "Configuration is saved.\n"
 msgstr "설정이 저장되었습니다.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "폴더"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "표시 파일을 열수가 없습니다\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "메시지 %d를 가져올 수가 없습니다\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "텍스트 부분을 얻을 수가 없습니다\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "데이타를 가져오는 중 에러가 발생했습니다.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "파일에 쓸 수가 없습니다.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP 인증을 사용할 수 없습니다\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "인증 도중 에러 발생\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23을 사용할 수 없습니다\n"
@@ -150,78 +589,6 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"다른 편집 창이 열려있습니다.\n"
-"계정을 편집하기전에 모든 편집창들을 닫아주세요."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "계정 편집창을 엽니다...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "계정 편집창을 생성합니다...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "계정 편집"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
-"받으려면 `G' 컬럼 상자를 선택하세요."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "이름"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "프로토콜"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "서버"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "편집"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " 기본 계정으로 설정 "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "정말로 이 계정을 삭제하시겠습니까?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "제목 없슴"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "계정 삭제"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -319,6 +686,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "이름"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -333,8 +708,8 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/파일(_F)"
 
@@ -355,9 +730,9 @@ msgid "/_File/New _Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
@@ -373,7 +748,7 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
@@ -405,8 +780,8 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
@@ -414,13 +789,13 @@ msgstr "/도구(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
@@ -437,17 +812,17 @@ msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
@@ -459,7 +834,7 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "주소록"
 
@@ -469,14 +844,14 @@ msgstr "이름:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "삭제"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -487,11 +862,11 @@ msgid "Lookup"
 msgstr "찾기"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "참조:"
 
@@ -517,7 +892,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -624,7 +999,7 @@ msgstr "주소록 변환 에러"
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "인터페이스"
 
@@ -644,8 +1019,7 @@ msgstr "이메일 주소"
 msgid "Group"
 msgstr "그룹"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "폴더"
 
@@ -669,15 +1043,15 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "알림"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "에러"
 
@@ -732,8 +1106,8 @@ msgstr "/추가(_A)..."
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
@@ -778,8 +1152,8 @@ msgstr "/편집(_E)/실행취소(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
@@ -787,7 +1161,7 @@ msgstr "/편집(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
@@ -799,7 +1173,7 @@ msgstr "/편집(_E)/붙여넣기(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
@@ -816,7 +1190,7 @@ msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/보기(_V)"
@@ -838,9 +1212,9 @@ msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
@@ -856,7 +1230,7 @@ msgstr "/보기(_V)/Ruler(_u)"
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
@@ -868,127 +1242,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
@@ -996,14 +1370,14 @@ msgstr "/도구(_T)/주소록(_A)"
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
@@ -1027,10 +1401,6 @@ msgstr "/메시지(_M)/암호화(_E)"
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "텍스트 부분을 얻을 수가 없습니다\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
@@ -1107,7 +1477,7 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
@@ -1198,8 +1568,7 @@ msgstr "마임 타입"
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "메일 발송"
 
@@ -1239,8 +1608,7 @@ msgstr "첨부"
 msgid "Attach file"
 msgstr "파일 첨부"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "서명"
 
@@ -1248,7 +1616,7 @@ msgstr "서명"
 msgid "Insert signature"
 msgstr "서명 파일을 끼워넣습니다"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "편집기"
 
@@ -1446,7 +1814,7 @@ msgstr "수정"
 msgid "Clear"
 msgstr "지움"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "값"
 
@@ -1479,7 +1847,6 @@ msgid " Check File "
 msgstr " 파일 확인 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "파일"
 
@@ -1535,12 +1902,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -1557,7 +1924,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1621,7 +1988,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "기본"
 
@@ -1678,7 +2045,6 @@ msgid "Exporting file:"
 msgstr ""
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "고르기..."
 
@@ -1702,164 +2068,164 @@ msgstr "기존 파일을 덮어쓰시겠습니까?"
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/새 폴더 만들기(_n)..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/폴더 지우기(_D)"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/메시지 찾기(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/뉴스그룹 구독(_b)..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/뉴스그룹 삭제(_R)"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "폴더 뷰를 생성합니다...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "새것"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "안읽음"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "전체"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "폴더 정보를 설정합니다...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1869,21 +2235,21 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1894,21 +2260,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1917,34 +2283,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2005,7 +2371,7 @@ msgstr ""
 msgid "Newsgroups:"
 msgstr "뉴스그룹:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "제목:"
 
@@ -2029,165 +2395,6 @@ msgstr "이미지 뷰를 생성합니다...\n"
 msgid "Can't load the image."
 msgstr "이미지를 불러올 수가 없습니다."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "%s:%d에대한 IMAP4 접속이 끊어졌습니다. 다시 접속...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP 서버 디렉토리"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "%s:%d에대한 IMAP4 접속을 만듭니다 ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "TLS 세션을 시작할 수 없습니다.\n"
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "지울 수가 없습니다\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "폴더를 선택할 수가 없습니다: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "표시 파일이 발견되지않음.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "LIST를 얻는 도중 에러가 발생.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "'%s'를 생성할 수가 없습니다\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "우편함을 생성할 수 없습니다\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "우편함을 삭제할 수 없습니다\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "envelope를 얻을 수가 없습니다\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "envelope를 얻는 중 에러 발생.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "envelope를 파싱할 수가 없습니다: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "namespace를 얻을 수 없습니다\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "폴더를 선택할 수가 없습니다: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "인증 방법"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 로그인을 실패했습니다.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "%s를 %s에 붙일 수 없습니다\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(파일을 보냅니다...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "%s 메시지를 추가할 수가 없습니다\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "%d를 %s로 복사할 수가 없습니다\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "가져오기"
@@ -2285,7 +2492,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "다음"
 
@@ -2301,199 +2508,199 @@ msgstr "속성"
 msgid "Finish"
 msgstr ""
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "예전 Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "완료 (새 메시지 없음)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -2511,29 +2718,20 @@ msgstr "암호 입력"
 msgid "Protocol log"
 msgstr "프로토콜 로그"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"파일 `%s'가 이미 존재합니다.\n"
-"폴더를 생성할 수가 없습니다."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread가 glib에의해 지원되지않습니다.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [주소]       편집 창을 엽니다"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2543,48 +2741,48 @@ msgstr ""
 "                         지정된 파일을 첨부해서 편지 작성 창\n"
 "                         attached"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              새 메시지를 받습니다"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          모든 계정에서 새 메시지를 받습니다"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 큐에 있는 모든 메시지를 보냅니다"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 이 도움말을 표시하고 끝마침니다"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              버번 정보 출력하고 종료"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "보내는 메일의 문자셋"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2598,19 +2796,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "메시지를 편집하는 창이 있습니다. 정말 끝내시겠습니까?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2619,662 +2817,662 @@ msgstr ""
 "OpenPGP 지원기능을 끕니다."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/파일(_F)/폴더(_F)/새 폴더(_n)"
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/파일(_F)/폴더(_F)/폴더 삭제(_D)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/메일박스를 지우기(_m)"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/파일(_F)/모든 폴더의 새 메시지 확인(_C)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/파일(_F)/mbox 파일 가져오기(_I)..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/파일(_F)/mbox 파일로 저장(_E)..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/파일(_F)/지운 편지함 비우기(_t)"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/파일(_F)/인쇄(_P)..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/파일(_F)/끝내기(_x)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/편집(_E)/쓰레드 선택(_t)"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/편집(_E)/현재 메시지 찾기(_F)..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/편집(_E)/메시지 찾기(_S)..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/보기(_V)/보이거나 감추기(_d)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/보기(_V)/보이거나 감추기(d)/폴더 트리(_F)"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/보기(_V)/보이거나 감추기(_d)/메시지 보기(_M)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘과 텍스트(_a)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/텍스트(_T)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/없음(_N)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/보기(_V)/정렬(_S)/번호(_n)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/보기(_V)/정렬(_S)/제목(_s)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/보기(_V)/정렬(_S)/색 라벨(_c)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/보기(_V)/정렬(_S)/표시(_m)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/보기(_V)/정렬(_S)/않읽음(_u)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/보기(_V)/정렬(_S)/첨부(_t)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/보기(_V)/정렬(_S)/않함(_o)"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/보기(_V)/정렬(_S)/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/보기(_V)/정렬(_S)/오름차순"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/명령(_S)/정렬(_S)/제목(_A)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/보기(_V)/쓰레드 보기(_r)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/보기(_V)/모든 쓰레드 펴기(_x)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/보기(_V)/모든 쓰레드 접기(_l)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/보기(_V)/표시 항목 설정(_i)..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/보기(_V)/가기(_G)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/명령(_S)/가기(_G)/이전 메시지(_P)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/보기(_V)/가기(_G)/다음 메시지(_N)"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/보기(_V)/가기(_G)/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/보기(_V)/가기(_G)/이전 새 메시지(_w)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/보기(_V)/가기(_G)/다음 새 메시지(_x)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/보기(_V)/가기(_G)/표시된 이전 메시지(_m)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/보기(_V)/가기(_G)/표시된 다음 메시지(_a)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 이전 메시지(_l)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/보기(_V)/모든 헤더보기(_h)"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3284,16 +3482,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3302,153 +3500,152 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
@@ -3566,32 +3763,32 @@ msgstr "메시지의 끝에 도달했습니다; 시작부분에서 계속할까�
 msgid "Search finished"
 msgstr "찾기가 완료"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "메시지 뷰를 생성합니다...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "텍스트"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "첨부"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3600,7 +3797,7 @@ msgstr ""
 "인쇄 명령어서 입력하세요:\n"
 "(`%s'는 파일이름으로 대체될 것입니다)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3609,41 +3806,6 @@ msgstr ""
 "인쇄 명령어가 올바르지않습니다:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "표시 파일을 열 수가 없습니다.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "디렉토리 %s에서 마지막 숫자 = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/열기(_O)"
@@ -3729,116 +3891,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "마임 뷰어의 명령행이 부적절합니다: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "%s:%d로 NNTP 접속을 생성합니다...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "%s:%d로의 NNTP 연결이 끊어졌습니다. 다시 연결합니다...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "기사 %d는 이미 캐쉬되었습니다.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "기사 %d를 얻습니다...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "기사 %d를 읽을 수가 없습니다\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "뉴스그룹 목록을 받을 수가 없습니다\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "기사를 올릴 수가 없습니다.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "기사 %d를 가져올 수가 없습니다\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "%s 그룹을 선택할 수가 없습니다\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "올바르지않은 기사 범위: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "새 기사가 없습니다.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "%3$s에서 %1$d - %2$d xover를 가져옴...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "xover를 가져올 수가 없습니다\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "xover를 얻는 도중 에러가 발생.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "올바르지않은 xover line: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "xhdr을 가져올 수가 없습니다\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "xhdr을 얻는 도중 에러가 발생.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "%s:%d NNTP 서버에 연결할 수가 없습니다\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "프로토콜 에러: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "프로토콜 에러\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "글을 올리는 도중 에러 발생\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "메일을 처리하는 도중 에러"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[사용자 아이디 없음]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3851,7 +3912,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3859,451 +3920,6 @@ msgstr ""
 "Bad passphrase! 다시 시도하세요...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "greeting에서 발견되지않은 APOP 타임 스탬프가 요구됨\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "greeting에서 타임 스탬프에 문법 오류\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 프로토콜 에러\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "올바르지않은 xover line: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: 만료된 메시지 %d를 삭제합니다\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: 메시지 %d를 건너뜁니다 (%d 바이트)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "우편함이 잠겨있습니다\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "TLS 세션을 시작할 수 없습니다\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "인증 도중 에러 발생\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "명령어"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "인증 도중 에러 발생\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "계정 설정 창을 엽니다...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "계정%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "새 계정에대한 설정"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "계정 기본 설정"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "계정 설정 창을 생성합니다...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "받기"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "프라이버시"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "고급"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "이 계정의 이름"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "기본 계정으로 설정"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "신상 정보"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "정식 이름"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "메일 주소"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "기관"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "서버 정보"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "뉴스(NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "로컬"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "이 서버는 인증을 필요로 합니다"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "뉴스 서버"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "받는 서버"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP 서버(발송용)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "사용자 계정"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "암호"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "이 서버는 인증을 필요로 합니다"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "받은 후 서버에서 메시지를 지움"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr ""
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr ""
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 일: 즉시 삭제)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "서버에서 모든 메시지를 받음"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "받을 크기 한도"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "받을때 메시지를 필터링"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "기본 우편함"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "인증 방법"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "자동"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "뉴스"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"내려받을 최대 기사 수\n"
-"(0인 경우 제한 없음)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "받는 사람이 지정되지않았습니다"
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr ""
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "헤더"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Date 헤더 항목을 추가"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Message-ID 생성"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "사용자 정의된 헤더 추가"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " 편집..."
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "인증"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP 인증(SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "보내기전 POP3와 인증"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "명령어"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "다음 주소를 자동적으로 정함"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "참조"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "숨은 참조"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "회신주소"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "기본으로 메시지에 사인을 함"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "기본으로 메시지를 암호화"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr ""
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "순수한 텍스트 서명 사용"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr ""
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "기본 GnuPG 키 사용"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "당신의 전자우편 주소로 키 선택"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "수동으로 키 지정"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "사용자 혹은 키 ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "SSL을 사용하지 않습니다"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "POP3 연결에 SSL을 사용합니다"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "SSL 세션을 시작하기 위해 STARTTLS 명령을 사용합니다"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "IMAP4 연결에 SSL을 사용합니다"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "NNTP 연결에 SSL을 사용합니다"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr ""
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "SMTP 연결에 SSL을 사용합니다"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "SMTP 포트 번호"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "POP3 포트 번호"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "IMAP4 포트 지정"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "NNTP 포트 지정"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "도메인 이름 지정"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP 서버 디렉토리"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "보낸 메시지 저장"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "임시 메시지 저장"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "삭제된 메시지 저장"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "계정 이름이 입력되지 않았습니다."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "메일 주소가 지정되지않았습니다."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP 서버가 지정되지않았습니다."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "사용자 아이디가 지정되지않았습니다."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3 서버가 지정되지않았습니다."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4 서버가 지정되지않았습니다."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP 서버가 지정되지않았습니다."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4352,17 +3968,17 @@ msgstr ""
 msgid "Registered actions"
 msgstr "등록된 동작"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "위로"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "아래로"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(새 규칙)"
 
@@ -4405,821 +4021,31 @@ msgstr "동작 삭제"
 msgid "Do you really want to delete this action?"
 msgstr "정말로 이 동작을 삭제하시겠습니까?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "폴더"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "일반 설정 창을 생성합니다...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "일반 설정"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "인용"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "보기"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "본문"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "기타"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "합체을 위해 외부 프로그램을 사용"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "명령어"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "spool로부터 합체"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "합체시 필터링"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "새 편지를 자동 검사"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr ""
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "분"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "시작할 때 새 편지를 검사"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "병합 후에 모든 지역 폴더 갱신"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "메시지를 이동하거나 지울때 즉시 실행"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "발송을 위해 외부 프로그램을 사용"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "보낸 메시지를 '보낸 편지함'에 저장"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "보내는 메일의 문자셋"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "자동 (추천)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit 아스키 (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "유니코드 (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "서부 유럽(ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "서부 유럽(ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "중부 유럽(ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltic (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltic (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "그리스 (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "그리스 (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "터키 (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrillic (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrillic (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cyrillic (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillic (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "일본 (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "일본 (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "일본 (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Simplified Chinese (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Simplified Chinese (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Traditional Chinese (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Traditional Chinese (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "중국 (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "한국 (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"`자동'이 선택되면, 현재 로케일에 맞는 최적의\n"
-"인코딩 방식이 사용됩니다."
-
-#: src/prefs_common.c:1287
-#, fuzzy
-msgid "Transfer encoding"
-msgstr "보내기 전에 줄 바꿈"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "서명 분리자"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "지동으로 삽입"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "자동으로 외부 편집기 사용"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr ""
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "줄 바꿈 at"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "글자"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "인용도 줄 바꿈"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr ""
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "보내기 전에 줄 바꿈"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "자동으로 회신할 계정 선택"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "회신할 때 메시지를 인용"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "회신 버튼이 메일링리스트에 대한 회신으로 동작"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "회신 형식"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "인용 부호"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "전달 형식"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " 부호 설명 "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "글꼴"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "헤더 이름을 번역(`From:', `Subject:' 등등)"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr ""
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr ""
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "요약 보기"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을 표시"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "쓰레드 펴기"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "날짜 형식"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr "요약에 표시될 항목 설정... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "메시지에 색을 이용하여 보여주기"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"다중바이트 알파벳과 숫자를 ASCII 문자로\n"
-"표시 (일본어인 경우에만)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "메시지 보기 위에 헤더 창 표시"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "메시지를 볼때 간단한 헤더만 표시"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "메시지를 볼때 간단한 헤더만 표시"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "줄 간격"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "픽셀"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "스크롤"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "반 페이지"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "부드러운 스크롤"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr ""
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "첨부된 이미지 크기 조정"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "표시될 헤더 설정"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "실행"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "실행"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "폴더"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "받을때 메시지를 필터링"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "자동으로 서명 확인"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "팝업 창에 서명 확인 결과 보이기"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "비밀번호를 메모리에 임시 보관"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr ""
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "분 "
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "passphrase를 입력할때 Grab input"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "GnuPG가 동작하지 않을 경우 시작시 경고 표시"
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "어떤 메시지 파일도 선택되지 않았습니다."
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "폴더에 들어가면 첫번째 안읽은 메시지 열기"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "새 창에서 열렸을 경우에만 메시지를 읽은 것으로 표시"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "새 편지를 받은 후 받은 편지함으로 가기"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "메시지를 이동하거나 지울때 즉시 실행"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(이것이 꺼져있는 경우 메시지는 실행때까지\n"
-"단지 표시만 될 것입니다)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "받기 대화상자"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "받기 대화상자 보기"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "항상"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "보이지 않음"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "받기 에러 발생시 에러 상자 보이지 않음"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "끝났을 때 받기 대화상자 닫기"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " 키 바인딩 설정... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "웹 탐색기"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "더블클릭시에 대상에 주소 추가"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "끝낼때"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "끝냈때 확인"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "끝낼때 지운 편지함 비우기"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "지운 편지함 비울때 확인하기"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "큐에 메시지가 있을 때 경고"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "요약 캐쉬 (%s)를 씁니다..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr ""
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr ""
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr ""
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr ""
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "현재 로케일에 적당한 날짜와 시간"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "년도 (년/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr ""
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr ""
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr ""
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr ""
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr ""
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr ""
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr ""
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "설명"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "예제"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "메시지 색 설정"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "색"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "인용문 - 첫번째 단계"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "인용문 - 두번째 단계"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "인용문 - 세번째 단계"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI 링크"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "인용 색 반복"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "첫번째 단계 인용문 색 선택"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "두번째 단계 인용문 색 선택"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "세번째 단계 인용문 색 선택"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "URI 색 선택"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "부호 설명"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"날짜\n"
-"보낸 사람\n"
-"보낸 사람의 이름\n"
-"보낸 사람의 성\n"
-"보낸 사람의 이니셜\n"
-"제목\n"
-"받는 사람\n"
-"참조\n"
-"뉴스그룹\n"
-"메시지-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr ""
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "키 바인딩"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "기본"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "예전 Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "사용자 헤더 설정"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "헤더"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr "삭제"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "사용자 헤더"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "헤더 이름이 지정되지않음"
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "헤더 삭제"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "정말로 이 헤더를 삭제하시겠습니까?"
 
@@ -5267,12 +4093,21 @@ msgstr "거르개 설정"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "편집"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "정말로 이 규칙을 삭제하시겠습니까?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "제목 없슴"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "규칙 삭제"
 
@@ -5361,6 +4196,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5502,6 +4341,10 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr "하위 폴더에 적용"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "다음 주소를 자동적으로 정함"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "회신시에도 사용"
@@ -5573,64 +4416,46 @@ msgstr "표시될 항목"
 msgid " Revert to default "
 msgstr " 기본값으로 원상복구 "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "템플릿 이름"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "등록"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " 치환"
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " 심볼 "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "등록된 템플릿"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "템플릿"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "템플릿"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "템플릿 형식 에러."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "템플릿을 지웁니다"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "정말로 이 템플릿을 삭제하시겠습니까?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "표시 파일을 열수가 없습니다\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "메시지 %d를 가져올 수가 없습니다\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "진행 다이얼로그를 생성합니다...\n"
@@ -5639,29 +4464,21 @@ msgstr "진행 다이얼로그를 생성합니다...\n"
 msgid "Status"
 msgstr "상태"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "데이타를 가져오는 중 에러가 발생했습니다.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "파일에 쓸 수가 없습니다.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "이 키에 대한 사용자 ID를 찾을 수 없습니다."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr ""
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "서명을 검증하는 도중 에러"
 
@@ -5687,6 +4504,10 @@ msgstr "키 ID"
 msgid "Val"
 msgstr "값"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "기타"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "키 추가"
@@ -5707,85 +4528,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "보낼 메시지의 헤더가 깨졌습니다.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "외부 명령을 실행할 수가 없습니다: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "연결 중입니다"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP 서버에 연결하고 있습니다: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "HELO를 보냅니다..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "인증"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "EHLO를 보냅니다..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM을 보냅니다..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "보냅니다"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO를 보냅니다..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "DATA를 보냅니다..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "끝마치는 중..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "메시지을 보내는 중"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "메시지를 보내는데 에러 발생"
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5884,33 +4705,20 @@ msgstr "BAD signature"
 msgid "No public key to verify the signature"
 msgstr "서명을 검증할 공개키가 없습니다"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP 인증을 사용할 수 없습니다\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "인증 도중 에러 발생\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "소스 창을 만듭니다...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "메시지의 소스"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "%s의 소스를 보여줍니다...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - 소스"
@@ -6307,6 +5115,747 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "다른 편집 창이 열려있습니다.\n"
+#~ "계정을 편집하기전에 모든 편집창들을 닫아주세요."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "계정 편집창을 엽니다...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "계정 편집창을 생성합니다...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "계정 편집"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
+#~ "받으려면 `G' 컬럼 상자를 선택하세요."
+
+#~ msgid "Protocol"
+#~ msgstr "프로토콜"
+
+#~ msgid "Server"
+#~ msgstr "서버"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " 기본 계정으로 설정 "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "정말로 이 계정을 삭제하시겠습니까?"
+
+#~ msgid "Delete account"
+#~ msgstr "계정 삭제"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "계정 설정 창을 엽니다...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "계정%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "새 계정에대한 설정"
+
+#~ msgid "Account preferences"
+#~ msgstr "계정 기본 설정"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "계정 설정 창을 생성합니다...\n"
+
+#~ msgid "Receive"
+#~ msgstr "받기"
+
+#~ msgid "Privacy"
+#~ msgstr "프라이버시"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "고급"
+
+#~ msgid "Name of this account"
+#~ msgstr "이 계정의 이름"
+
+#~ msgid "Set as default"
+#~ msgstr "기본 계정으로 설정"
+
+#~ msgid "Personal information"
+#~ msgstr "신상 정보"
+
+#~ msgid "Full name"
+#~ msgstr "정식 이름"
+
+#~ msgid "Mail address"
+#~ msgstr "메일 주소"
+
+#~ msgid "Organization"
+#~ msgstr "기관"
+
+#~ msgid "Server information"
+#~ msgstr "서버 정보"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "뉴스(NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "로컬"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "이 서버는 인증을 필요로 합니다"
+
+#~ msgid "News server"
+#~ msgstr "뉴스 서버"
+
+#~ msgid "Server for receiving"
+#~ msgstr "받는 서버"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP 서버(발송용)"
+
+#~ msgid "User ID"
+#~ msgstr "사용자 계정"
+
+#~ msgid "Password"
+#~ msgstr "암호"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "이 서버는 인증을 필요로 합니다"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "받은 후 서버에서 메시지를 지움"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 일: 즉시 삭제)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "서버에서 모든 메시지를 받음"
+
+#~ msgid "Receive size limit"
+#~ msgstr "받을 크기 한도"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "받을때 메시지를 필터링"
+
+#~ msgid "Default inbox"
+#~ msgstr "기본 우편함"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
+
+#~ msgid "Authentication method"
+#~ msgstr "인증 방법"
+
+#~ msgid "Automatic"
+#~ msgstr "자동"
+
+#~ msgid "News"
+#~ msgstr "뉴스"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "내려받을 최대 기사 수\n"
+#~ "(0인 경우 제한 없음)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "받는 사람이 지정되지않았습니다"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Date 헤더 항목을 추가"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Message-ID 생성"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "사용자 정의된 헤더 추가"
+
+#~ msgid " Edit... "
+#~ msgstr " 편집..."
+
+#~ msgid "Authentication"
+#~ msgstr "인증"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP 인증(SMTP AUTH)"
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "보내기전 POP3와 인증"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "명령어"
+
+#~ msgid "Cc"
+#~ msgstr "참조"
+
+#~ msgid "Bcc"
+#~ msgstr "숨은 참조"
+
+#~ msgid "Reply-To"
+#~ msgstr "회신주소"
+
+#~ msgid "Sign message by default"
+#~ msgstr "기본으로 메시지에 사인을 함"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "기본으로 메시지를 암호화"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "순수한 텍스트 서명 사용"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "기본 GnuPG 키 사용"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "당신의 전자우편 주소로 키 선택"
+
+#~ msgid "Specify key manually"
+#~ msgstr "수동으로 키 지정"
+
+#~ msgid "User or key ID:"
+#~ msgstr "사용자 혹은 키 ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "SSL을 사용하지 않습니다"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "POP3 연결에 SSL을 사용합니다"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "SSL 세션을 시작하기 위해 STARTTLS 명령을 사용합니다"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "IMAP4 연결에 SSL을 사용합니다"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "NNTP 연결에 SSL을 사용합니다"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "SMTP 연결에 SSL을 사용합니다"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "SMTP 포트 번호"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "POP3 포트 번호"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "IMAP4 포트 지정"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "NNTP 포트 지정"
+
+#~ msgid "Specify domain name"
+#~ msgstr "도메인 이름 지정"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP 서버 디렉토리"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "보낸 메시지 저장"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "임시 메시지 저장"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "삭제된 메시지 저장"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "계정 이름이 입력되지 않았습니다."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "메일 주소가 지정되지않았습니다."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP 서버가 지정되지않았습니다."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "사용자 아이디가 지정되지않았습니다."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3 서버가 지정되지않았습니다."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4 서버가 지정되지않았습니다."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP 서버가 지정되지않았습니다."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "일반 설정 창을 생성합니다...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "일반 설정"
+
+#~ msgid "Quote"
+#~ msgstr "인용"
+
+#~ msgid "Display"
+#~ msgstr "보기"
+
+#~ msgid "Message"
+#~ msgstr "본문"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "합체을 위해 외부 프로그램을 사용"
+
+#~ msgid "Command"
+#~ msgstr "명령어"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "spool로부터 합체"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "합체시 필터링"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "새 편지를 자동 검사"
+
+#~ msgid "minute(s)"
+#~ msgstr "분"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "시작할 때 새 편지를 검사"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "병합 후에 모든 지역 폴더 갱신"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "메시지를 이동하거나 지울때 즉시 실행"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "발송을 위해 외부 프로그램을 사용"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "보낸 메시지를 '보낸 편지함'에 저장"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "보내는 메일의 문자셋"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "자동 (추천)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit 아스키 (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "유니코드 (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "서부 유럽(ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "서부 유럽(ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "중부 유럽(ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltic (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltic (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "그리스 (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "그리스 (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Cyrillic (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "터키 (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cyrillic (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cyrillic (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cyrillic (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cyrillic (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "일본 (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "일본 (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "일본 (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Simplified Chinese (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Simplified Chinese (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Traditional Chinese (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Traditional Chinese (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "중국 (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "한국 (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "`자동'이 선택되면, 현재 로케일에 맞는 최적의\n"
+#~ "인코딩 방식이 사용됩니다."
+
+#, fuzzy
+#~ msgid "Transfer encoding"
+#~ msgstr "보내기 전에 줄 바꿈"
+
+#~ msgid "Signature separator"
+#~ msgstr "서명 분리자"
+
+#~ msgid "Insert automatically"
+#~ msgstr "지동으로 삽입"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "자동으로 외부 편집기 사용"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "줄 바꿈 at"
+
+#~ msgid "characters"
+#~ msgstr "글자"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "인용도 줄 바꿈"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "보내기 전에 줄 바꿈"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "자동으로 회신할 계정 선택"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "회신할 때 메시지를 인용"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "회신 버튼이 메일링리스트에 대한 회신으로 동작"
+
+#~ msgid "Reply format"
+#~ msgstr "회신 형식"
+
+#~ msgid "Quotation mark"
+#~ msgstr "인용 부호"
+
+#~ msgid "Forward format"
+#~ msgstr "전달 형식"
+
+#~ msgid " Description of symbols "
+#~ msgstr " 부호 설명 "
+
+#~ msgid "Font"
+#~ msgstr "글꼴"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "헤더 이름을 번역(`From:', `Subject:' 등등)"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
+
+#~ msgid "Summary View"
+#~ msgstr "요약 보기"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을 표시"
+
+#~ msgid "Expand threads"
+#~ msgstr "쓰레드 펴기"
+
+#~ msgid "Date format"
+#~ msgstr "날짜 형식"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr "요약에 표시될 항목 설정... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "메시지에 색을 이용하여 보여주기"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "다중바이트 알파벳과 숫자를 ASCII 문자로\n"
+#~ "표시 (일본어인 경우에만)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "메시지 보기 위에 헤더 창 표시"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "메시지를 볼때 간단한 헤더만 표시"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "메시지를 볼때 간단한 헤더만 표시"
+
+#~ msgid "Line space"
+#~ msgstr "줄 간격"
+
+#~ msgid "pixel(s)"
+#~ msgstr "픽셀"
+
+#~ msgid "Scroll"
+#~ msgstr "스크롤"
+
+#~ msgid "Half page"
+#~ msgstr "반 페이지"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "부드러운 스크롤"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "첨부된 이미지 크기 조정"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "표시될 헤더 설정"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "실행"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "실행"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "폴더"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "받을때 메시지를 필터링"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "자동으로 서명 확인"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "팝업 창에 서명 확인 결과 보이기"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "비밀번호를 메모리에 임시 보관"
+
+#~ msgid "minute(s) "
+#~ msgstr "분 "
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "passphrase를 입력할때 Grab input"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "GnuPG가 동작하지 않을 경우 시작시 경고 표시"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "어떤 메시지 파일도 선택되지 않았습니다."
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "폴더에 들어가면 첫번째 안읽은 메시지 열기"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "새 창에서 열렸을 경우에만 메시지를 읽은 것으로 표시"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "새 편지를 받은 후 받은 편지함으로 가기"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "메시지를 이동하거나 지울때 즉시 실행"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(이것이 꺼져있는 경우 메시지는 실행때까지\n"
+#~ "단지 표시만 될 것입니다)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "받기 대화상자"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "받기 대화상자 보기"
+
+#~ msgid "Always"
+#~ msgstr "항상"
+
+#~ msgid "Never"
+#~ msgstr "보이지 않음"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "받기 에러 발생시 에러 상자 보이지 않음"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "끝났을 때 받기 대화상자 닫기"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " 키 바인딩 설정... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
+
+#~ msgid "Web browser"
+#~ msgstr "웹 탐색기"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "더블클릭시에 대상에 주소 추가"
+
+#~ msgid "On exit"
+#~ msgstr "끝낼때"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "끝냈때 확인"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "끝낼때 지운 편지함 비우기"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "지운 편지함 비울때 확인하기"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "큐에 메시지가 있을 때 경고"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "요약 캐쉬 (%s)를 씁니다..."
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "현재 로케일에 적당한 날짜와 시간"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "년도 (년/100)"
+
+#~ msgid "Description"
+#~ msgstr "설명"
+
+#~ msgid "Example"
+#~ msgstr "예제"
+
+#~ msgid "Set message colors"
+#~ msgstr "메시지 색 설정"
+
+#~ msgid "Colors"
+#~ msgstr "색"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "인용문 - 첫번째 단계"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "인용문 - 두번째 단계"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "인용문 - 세번째 단계"
+
+#~ msgid "URI link"
+#~ msgstr "URI 링크"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "인용 색 반복"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "첫번째 단계 인용문 색 선택"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "두번째 단계 인용문 색 선택"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "세번째 단계 인용문 색 선택"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "URI 색 선택"
+
+#~ msgid "Description of symbols"
+#~ msgstr "부호 설명"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "날짜\n"
+#~ "보낸 사람\n"
+#~ "보낸 사람의 이름\n"
+#~ "보낸 사람의 성\n"
+#~ "보낸 사람의 이니셜\n"
+#~ "제목\n"
+#~ "받는 사람\n"
+#~ "참조\n"
+#~ "뉴스그룹\n"
+#~ "메시지-ID"
+
+#~ msgid "Key bindings"
+#~ msgstr "키 바인딩"
+
+#~ msgid "Default"
+#~ msgstr "기본"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "예전 Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "글꼴 선택"
 
@@ -6612,9 +6161,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "위젯들을 설정합니다..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "메시지 %s%c%d를 %s로 이동합니다...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\t메시지들을 표시합니다..."
 
diff --git a/po/lt.po b/po/lt.po
index 99805b34..ed51a64a 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,402 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Skaitoma kiekvienos sąskaitos konfigūracija...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "nepavyko įrašyti į bylą\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 prisijungimas prie %s buvo nutrauktas. Jungiamasi...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP4 serveris panaikina LOGIN.\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Negaliu sukurti TLS sesijos.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Siunčiu laišką (%d / %d baitai)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Gaunamos žinutės iš %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "negaliu išbraukti\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Gaunamos žinutės iš %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "negaliu uždaryti katalogo\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "šakninis katalogas %s neegzistuoja\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "klaida gaunant LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Negaliu sukurti „%s“\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "negaliu sukurti „%s“ po INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "negaliu sukurti dėžutės\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "negaliu pervadinti dėžutės: %s į %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "negaliu ištrinti dėžutės\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "nagaliu gauti voko\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Siunčiu laišką (%d / %d baitai)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "klaida gaunant voką.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "negaliu išanalizuoti voko: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "negalių gauti vardų zonos\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "negaliu pasirinkti katalogo: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "nepavyko prisijungti prie IMAP4\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "negaliu prirašyti %s į %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(siunčiama byla...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "negaliu prirašyti žinutės į %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "negaliu nukopijuoti %s į %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "klaida vykdant imap komandą: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "klaida vykdant imap komandą: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "klaida vykdant imap komandą: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv negali konvertuoti UTF-7 į %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv negali konvertuoti %s į UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "negaliu nukopijuoti žinutės %s į %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Negaliu atidaryti žymų bylos.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Paskutinis numeris kataloge %s - %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Byla „%s“ jau egzistuoja.\n"
+"Negaliu sukurti katalogo."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"Katalogo pavadinimas\n"
+"'%s' nėra teisingas UTF-8 tekstas.\n"
+"Galbūt bylų pavadinimams naudojama lokalės koduotė.\n"
+"Tokiu atveju jūs turite nustatyti aplinkos kintamąjį\n"
+"(detalesnės instrukcijos byloje „README“):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "sukuriu NNTP prisijungimą prie %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP prisijungimas prie %s:%d buvo nutrauktas. Jungiuosi iš naujo...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "žinutė %d jau buvo įkelta.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "gaunama žinutė %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "negaliu perskaityti žinutės %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "negaliu gauti naujienų grupės sąrašo\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "negaliu paskelbti žinutės.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "negaliu gauti žinutės %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "negaliu pažymėti grupės: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "neteisingas žinučių intervalas: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "nėra naujų žinučių.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "gaunamas xover %d - %d, %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "negaliu gauti xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "klaida gaunant xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "bloga xover eilutė: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "negaliu gauti xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "klaida gaunant xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protokolo klaida: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protokolo klaida\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Klaida skelbiant žinutę\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Klaida siunčiant komandą\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Reikalinga APOP žyma nerasta pasisveikinime\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Sintaksės klaida pasisveikinime\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 protokolo klaida\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "blogas UIDL atsakymas: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Trinama sena žinutė %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: praleidžiama žinutė %d (%d B)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "dėžutė užrakinta\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "baigėsi sesijai skirtas laikas\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "negaliu pradėti TLS sesijos\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "klaida tikrinant autentiškumą\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "komanda nepalaikoma\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "klaida POP3 sesijoje\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +419,52 @@ msgstr "Rasta %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nustatymai išsaugoti.\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "Nereikalingo pašto filtras"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "negali atidaryti žymų bylos\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "negaliu gauti žinutės %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Negaliu gauti dalies teksto\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Bloga spausdinimo komanda: „%s“\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "kalaida gaunant duomenis.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Negaliu rašyti į bylą.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH neprieinamas\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "blogas SMTP atsakymas\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "klaida SMTP sesijoje\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 neprieinamas\n"
@@ -162,76 +597,6 @@ msgstr ""
 "adresu „Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA“."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Skaitoma kiekvienos sąskaitos konfigūracija...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Yra atidarytų laiško kūrimo langų.\n"
-"Užverkite juos prieš redaguodami sąskaitas."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Atveriamas sąskaitos redagavimo langas...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Sukuriamas sąskaitos redagavimo langas...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Redaguoti sąskaitas"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Naujos žinutės bus tikrinamos šia tvarka. Pažymėkite laukelį\n"
-"skulpelyje „G“ jei norite gauti žinutes pasirinkę „Gauti visus“."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Vardas"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokolas"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Serveris"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Taisyti"
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr " Pažymėti kaip pagrindinę _sąskaitą "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Ar tikrai norite pašalinti sąskaitą „%s“?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(Bevardis)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Pašalinti sąskaitą"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -331,6 +696,14 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Vardas"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -345,8 +718,8 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Byla"
 
@@ -367,9 +740,9 @@ msgid "/_File/New _Server"
 msgstr "/_Byla/Naujas _serveris"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Byla/---"
 
@@ -385,7 +758,7 @@ msgstr "/_Byla/Išt_rinti"
 msgid "/_File/_Save"
 msgstr "/_Byla/Iš_saugoti"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Byla/_Užverti"
 
@@ -417,8 +790,8 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
@@ -426,13 +799,13 @@ msgstr "/Į_rankiai"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF bylą"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
@@ -449,17 +822,17 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Taisyti"
 
@@ -471,7 +844,7 @@ msgstr "/_Ištrinti"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -481,14 +854,14 @@ msgstr "Vardas:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Ištrinti"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -499,11 +872,11 @@ msgid "Lookup"
 msgstr "Ieškoti"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Kopija:"
 
@@ -529,7 +902,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -636,7 +1009,7 @@ msgstr "Adresų knygos konvertavimo klaida"
 msgid "Addressbook Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Sąsaja"
 
@@ -656,8 +1029,7 @@ msgstr "El. pašto adresas"
 msgid "Group"
 msgstr "Grupė"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Katalogas"
 
@@ -681,15 +1053,15 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Pranešimas"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Klaida"
 
@@ -744,8 +1116,8 @@ msgstr "/Pri_dėti..."
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
@@ -785,8 +1157,8 @@ msgstr "/_Taisyti/_Atšaukti"
 msgid "/_Edit/_Redo"
 msgstr "/_Taisyti/Pa_kartoti"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Taisyti/---"
 
@@ -794,7 +1166,7 @@ msgstr "/_Taisyti/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisyti/Iškirp_ti"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Taisyti/Kopi_juoti"
 
@@ -806,7 +1178,7 @@ msgstr "/_Taisyti/Į_dėti"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisyti/Įdėti kaip _citatą"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Taisyti/Žymėti _viską"
 
@@ -822,7 +1194,7 @@ msgstr "/_Taisyti/Laužyti _visas ilgas eilutes"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisyti/_Automatiškai laužyti"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Rodyti"
@@ -844,9 +1216,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Rodyti/Kam _atsakyti"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Rodyti/---"
 
@@ -862,7 +1234,7 @@ msgstr "/_Rodyti/_Liniuotė"
 msgid "/_View/_Attachment"
 msgstr "/_Rodyti/Prise_gtos bylos"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Rodyti/Simbolių ko_duotė"
 
@@ -873,103 +1245,103 @@ msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Rodyti/Simbolių ko_duotė/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Rodyti/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
@@ -977,14 +1349,14 @@ msgstr "/Į_rankiai/_Adresų knyga"
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
@@ -1005,10 +1377,6 @@ msgstr "/Į_rankiai/PGP ši_fravimas"
 msgid "%s: file not exist\n"
 msgstr "%s: byla neegzistuoja\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Negaliu gauti dalies teksto\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Formato klaida."
@@ -1084,7 +1452,7 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant žinutę %s ."
@@ -1177,8 +1545,7 @@ msgstr "MIME tipas"
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Siųsti"
 
@@ -1218,8 +1585,7 @@ msgstr "Prisegti"
 msgid "Attach file"
 msgstr "Prisegti bylą"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Parašas"
 
@@ -1227,7 +1593,7 @@ msgstr "Parašas"
 msgid "Insert signature"
 msgstr "Įterpti parašą"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Redaktorius"
 
@@ -1419,7 +1785,7 @@ msgstr "Taisyti"
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Reikšmė"
 
@@ -1452,7 +1818,6 @@ msgid " Check File "
 msgstr " Patikrinti bylą "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Byla"
 
@@ -1508,12 +1873,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -1530,7 +1895,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1594,7 +1959,7 @@ msgstr "Skirtasis laikas (sek.)"
 msgid "Maximum Entries"
 msgstr "Įrašų maksimumas"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Pagrindinis"
 
@@ -1651,7 +2016,6 @@ msgid "Exporting file:"
 msgstr "Eksportuojama byla:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Pasirinti... "
 
@@ -1675,160 +2039,160 @@ msgstr "Perrašyti egzistuojančią bylą?"
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Gaunami"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NaujasKatalodas"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Sukurti _naują katalogą..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Pe_rvadinti katalogą..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/Per_kelti katalogą..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Iš_trinti katalogą"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Išvaly_ti šiukšlinę"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Patikrinti paštą"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/P_erkurti katalogų medį"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/I_eškoti žinučių"
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/_Atsisiųsti"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Prisijungti prie naujienų grupės"
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Paša_linti naujienų grupę"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Sukuriama katalogų peržiūra...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nesk."
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Nustatoma katalogo informacija...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalogų medį"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalogų medis. Tęsti?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalogų medis..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinamos naujos žinutės visuose kataloguose..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Siunčiamos žinutės („%s“)..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida siunčiant žinutes („%s“)."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1838,21 +2202,21 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1865,21 +2229,21 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1888,34 +2252,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -1976,7 +2340,7 @@ msgstr "Gauta naujienų grupių: %d (%s skaityta)"
 msgid "Newsgroups:"
 msgstr "Naujienų grupės"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -2000,159 +2364,6 @@ msgstr "Sukuriama paveikslėlio peržiūra...\n"
 msgid "Can't load the image."
 msgstr "Negaliu įkelti paveikslėlio."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 prisijungimas prie %s buvo nutrauktas. Jungiamasi...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP4 serveris panaikina LOGIN.\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Negaliu sukurti TLS sesijos.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "negaliu išbraukti\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "negaliu uždaryti katalogo\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "šakninis katalogas %s neegzistuoja\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "klaida gaunant LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Negaliu sukurti „%s“\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "negaliu sukurti „%s“ po INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "negaliu sukurti dėžutės\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "negaliu pervadinti dėžutės: %s į %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "negaliu ištrinti dėžutės\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "nagaliu gauti voko\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "klaida gaunant voką.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "negaliu išanalizuoti voko: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "negalių gauti vardų zonos\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "negaliu pasirinkti katalogo: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "nepavyko prisijungti prie IMAP4\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "negaliu prirašyti %s į %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(siunčiama byla...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "negaliu prirašyti žinutės į %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "negaliu nukopijuoti %s į %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "klaida vykdant imap komandą: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "klaida vykdant imap komandą: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "klaida vykdant imap komandą: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv negali konvertuoti UTF-7 į %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv negali konvertuoti %s į UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importuoti"
@@ -2250,7 +2461,7 @@ msgstr "Importuioti LDIF bylą į adresų knygą"
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Kitas"
 
@@ -2266,143 +2477,143 @@ msgstr "Atributai"
 msgid "Finish"
 msgstr "Baigti"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Baigta (Naujos žinutės: %d)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Senas „Sylpheed“"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Gaunamos naujos žinutės"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Atlikta (gauta žinučių: %d (%s))"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Atlikta (naujų žinučių negauta)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autentiškumo"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Baigėsi skirtasis laikas"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Naujos žinutės: %d)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Baigta (Nėra naujų žinučių: %d)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant paštą."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami „%s“ sąskaitos laiškai...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunamos naujos žinutės"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunamos žinutės iš %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų žinučių skaičius (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų žinučių skaičius (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų žinučių skaičius (UILD)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų žinučių dydis (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinama žinutė %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunama žinutė (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gaunama (Gautos žinutės: %d (%s))"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2411,28 +2622,28 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į bylą."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2441,11 +2652,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2454,15 +2665,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunamos naujos žinutės iš %s į %s...\n"
@@ -2480,29 +2691,20 @@ msgstr "Įveskite slaptažodį"
 msgid "Protocol log"
 msgstr "Protokolo logas"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Byla „%s“ jau egzistuoja.\n"
-"Negaliu sukurti katalogo."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepalaiko g_thread.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Naudojimas: %s [PARAMETRAI]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    atverti rašymo langą"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2512,23 +2714,23 @@ msgstr ""
 "                         atverti rašymo langą su prisegtomis\n"
 "                         nurodytomis bylomis"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              gauti naujas žinutes"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          gauti naujas žinutes iš visų sąskaitų"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 siųsti žinutes eilėje"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalogas]... rodyti bendrą žinučių skaičių"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2536,23 +2738,23 @@ msgstr ""
 "  --status-full [katalogas]...\n"
 "                         rodyti kiekvieno katalogo būseną"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                derinimo rėžimas"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 rodyti šią pagalbą ir baigti"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              išvesti versiją ir baigti"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "Bylų vardų koduotė"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2576,19 +2778,19 @@ msgstr ""
 "\n"
 "Tęsti?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Rašoma žinutė. Tikrai išeiti?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Žinutės eilėje"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Eilėje yra neišsiųstų žinučių. Išeiti dabar?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2597,15 +2799,15 @@ msgstr ""
 "OpenPGP palaikymas išjungtas."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2613,616 +2815,616 @@ msgstr ""
 "Rasta senos versijos konfigūracija.\n"
 "Ar norite ją atnaujinti?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Byla/_Katalogas"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Byla/_Katalogas/Sukurti _naują..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Byla/_Katalogas/Pe_rvadinti..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Byla/_Katalogas/Per_kelti..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Byla/_Katalogas/_Ištrinti"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Byla/_Dėžutė"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Byla/_Dėžutė/Pridėti _naują"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Byla/_Dėžutė/_Pašalinti"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Byla/_Dėžutė/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Byla/_Dėžutė/Patikrinti naujas ž_inutes"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Byla/_Dėžutė/Patikrinti naujas žinu_tes visose dėžutėse"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Byla/_Dėžutė/P_erkurti katalogų medį"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Byla/_Importuoti „mbox“ bylą..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Byla/_Eksportuoti į „mbox“ bylą..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Byla/Išvaly_ti šiukšlinę"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Byla/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Byla/_Spausdinti..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Byla/_Dirbti atsijungus"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Byla/Iš_eiti"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Taisyti/Pažymė_ti giją"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Taisyti/_Rasti žinutėje"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Taisyti/_Ieškoti žinučių..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Katalogų medis"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Žinutės peržiūra"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/Piktogr_amos ir tekstas"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Tekstas"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Nieko"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Rodyti/Atskirti _katalogų medį"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/_Rodyti/Atskirti žin_utės peržiūrą"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Rodyti/_Rikiuoti"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Rodyti/_Rikiuoti/pagal _numerį"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Rodyti/_Rikiuoti/pagal _dydį"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Rodyti/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Rodyti/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Rodyti/_Rikiuoti/pagal _gavėją"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Rodyti/_Rikiuoti/pagal _temą"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Rodyti/_Rikiuoti/pagal _spalvos etiketę"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Rodyti/_Rikiuoti/pagal ž_ymę"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Rodyti/_Rikiuoti/pagal ne_skaitytus"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Rodyti/_Rikiuoti/pagal _priedą"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Rodyti/_Rikiuoti/Ne_rikiuoti"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Rodyti/_Rikiuoti/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Rodyti/_Rikiuoti/_Didėjimo tvarka"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Rodyti/_Rikiuoti/_Mažėjimo tvarka"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Rodyti/_Rikiuoti/P_agal temą"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Rodyti/_Gijų peržiūra"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Rodyti/Iš_skleisti visas gijas"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Rodyti/Su_traukti visas gijas"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Rodyti/Nustatyt_i rodomus laukus"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Rodyti/_Eiti į"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Rodyti/_Eiti į/_Ankstesnė žinutė"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Rodyti/_Eiti į/_Kita žinutė"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Rodyti/_Eiti į/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė neskaityta žinutė"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Rodyti/_Eiti į/Kita neskaityta žinutė"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė nauja žinutė"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Rodyti/_Eiti į/Kita nauja žinutė"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė pažymėta žinutė"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Rodyti/_Eiti į/Kita pažymėta žinutė"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė žinutė su etikete"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Rodyti/_Eiti į/Kita žinutė su etikete"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Rodyti/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Rodyti/Atverti naujame _lange"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Rodyti/Žinutės pr_adinis tekstas"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Rodyti/Rodyti _visas antraštes"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Rodyti/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/Ži_nutė"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/Ži_nutė/_Gauti"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _esamos sąskaitos"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Ži_nutė/_Gauti/_Nutraukti gavimą"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/Ži_nutė/_Gauti/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/Ži_nutė/_Siųsti žinutes eilėje"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/Ži_nutė/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/Ži_nutė/Rašyti _naują"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/Ži_nutė/_Atsakyti"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/Ži_nutė/Atsak_yti kam"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Ži_nutė/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Ži_nutė/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Ži_nutė/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Ži_nutė/_Persiųsti"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/Ži_nutė/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/Ži_nutė/Nukreip_ti"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/Ži_nutė/Per_kelti..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/Ži_nutė/K_opijuoti..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/Ži_nutė/_Trinti"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/Ži_nutė/Žy_ma"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Ži_nutė/Žy_ma/Pažy_mėti"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Ži_nutė/Žy_ma/_Nežymėti"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/Ži_nutė/Žy_ma/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Ži_nutė/Žy_ma/Ne_skaityta"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Ži_nutė/Žy_ma/Skai_tyta"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Ži_nutė/Žy_ma/_Visos kaip skaitytos"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/Ži_nutė/Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Ži_nutė/Pažymėti kaip reikalingą"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Į_rankiai/_Filtruoti žinutes kataloge"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktas žinutes"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Į_rankiai/_Filtruoti nereikalingas žinutes kataloge"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Į_rankiai/Filtruoti nereikalingas tarp pa_sirinktų žinučių"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodas žinutes"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/Į_rankiai/Vykdyti"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/Į_rankiai/„_Log“ langas"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Nustatymai"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Nustatymai/Bendri _nustatymai..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Nustatymai/_Filtro nustatymai..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Nustatymai/Veiksm_ai..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Nustatymai/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Nustatymai/_Esamos sąskaitos nustatymai"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Nustatymai/Sukurti _naują sąskaitą..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Nustatymai/R_edaguoti sąskaitas..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Nustatymai/Keisti esamą sąskaitą"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Pagalba/_Instrukcija"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pagalba/_Instrukcija/_English"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pagalba/_Instrukcija/_Japanese"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Pagalba/_DUK"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pagalba/_DUK/_English"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pagalba/_DUK/_German"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pagalba/_DUK/_Spanish"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pagalba/_DUK/_French"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pagalba/_DUK/_Italian"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Pagalba/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Keičiamas lango dalijimo tipas iš %d į %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3232,16 +3434,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskanuota automatiškai."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3250,149 +3452,148 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurios bylos jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Žinutės peržiūra"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Gauti"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Prijungti naują paštą"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Gauti visus"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijungti naują visų sąskaitų paštą"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Rašyti naują laišką"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Atsakyti į laišką"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Atsakyti visus"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Persiųsti laišką"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Ištrinti laišką"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Sąskaitos nustatymai"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
@@ -3510,32 +3711,32 @@ msgstr "Pasiekta žinutės pabaiga; tęsti nuo pradžios?"
 msgid "Search finished"
 msgstr "Paieška baigta"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Sukuriama žinutės peržiūra...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Tekstas"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Priedai"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti bylos „%s“."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3544,7 +3745,7 @@ msgstr ""
 "Įveskite spausdinimo komandą:\n"
 "(„%s“ bus pakeista bylos vardu)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3553,48 +3754,6 @@ msgstr ""
 "Neteisinga spausdinimo komanda:\n"
 "„%s“"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "negaliu nukopijuoti žinutės %s į %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Negaliu atidaryti žymų bylos.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Paskutinis numeris kataloge %s - %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"Katalogo pavadinimas\n"
-"'%s' nėra teisingas UTF-8 tekstas.\n"
-"Galbūt bylų pavadinimams naudojama lokalės koduotė.\n"
-"Tokiu atveju jūs turite nustatyti aplinkos kintamąjį\n"
-"(detalesnės instrukcijos byloje „README“):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Atverti"
@@ -3678,115 +3837,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Bloga MIME žiūryklės komanda: „%s“"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "sukuriu NNTP prisijungimą prie %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP prisijungimas prie %s:%d buvo nutrauktas. Jungiuosi iš naujo...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "žinutė %d jau buvo įkelta.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "gaunama žinutė %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "negaliu perskaityti žinutės %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "negaliu gauti naujienų grupės sąrašo\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "negaliu paskelbti žinutės.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "negaliu gauti žinutės %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "negaliu pažymėti grupės: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "neteisingas žinučių intervalas: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "nėra naujų žinučių.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "gaunamas xover %d - %d, %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "negaliu gauti xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "klaida gaunant xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "bloga xover eilutė: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "negaliu gauti xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "klaida gaunant xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protokolo klaida: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protokolo klaida\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Klaida skelbiant žinutę\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Klaida siunčiant komandą\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Slapta frazė"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[nėra vartotojo id]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3799,7 +3858,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3807,447 +3866,6 @@ msgstr ""
 "Bloga slapta frazė! Bandykite dar kartą...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Reikalinga APOP žyma nerasta pasisveikinime\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Sintaksės klaida pasisveikinime\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 protokolo klaida\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "blogas UIDL atsakymas: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Trinama sena žinutė %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: praleidžiama žinutė %d (%d B)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "dėžutė užrakinta\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "baigėsi sesijai skirtas laikas\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "negaliu pradėti TLS sesijos\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "klaida tikrinant autentiškumą\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "komanda nepalaikoma\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "klaida POP3 sesijoje\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Atveriamas sąskaitos nustatymų langas...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Sąskaita%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Naujos sąskaitos nustatymai"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Sąskaitos nustatymai"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Gauti"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privatumas"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Papildomi"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Sąskaitos vardas"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Pažymėti kaip įprastą"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Asmeninė informacija"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Pilnas vardas"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "El. pašto adresas"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizacija"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Severio informacija"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Naujienos (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Vietinis"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Serveris reikalauja patvirtinti autentiškumą"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Naujienų serveris"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Serveris pašto gavimui"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP serveris (siuntimui)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Vartotojo ID"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Slaptažodis"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Naudoti saugų autentiškumo tikrinimą (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Po gavimo pašalinti žinutes iš serverio"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Pašalinti po"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dienų"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dienų: pašalinti iš karto)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Atsisiųsti visas žinutes serveryje"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Dydžio limitas"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtruoti žinutes gaunant"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Gaunamų laiškų dėžutė"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "Nefiltruotos žinutės bus laikomos šiame kataloge."
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Autentiškumo patikrinimo metodas"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatinis"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Naujienos"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "Maksimalus parsiunčiamų žinučių skaičius"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "Nelimituojama, jei nurodyta „0“."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "„Gauti visus“ tinkrina žinutes šioje sąskaitoje"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Antraštė"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Pridėti „Date“ antraštės lauką"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generuoti „Message-ID“"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Pridėti vartotojo nustatytas antraštes"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Redaguoti... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autentiškumo patikrinimas"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP autentiškumo patikrinimas (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Jei paliksite šiuos laukus tuščius, bus naudojamas tas pats vartotojo ID ir "
-"slaptažodis kaip ir gaunant."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Komandos išvestis"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Automatiškai nustatyti sekančius adresus"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Pasirašyti žinutes"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Koduoti žinutes"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "Koduoti kai atsakoma į koduotą žinutę"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Naudoti „ASCII-armored“ formatą kodavimui"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Naudoti „clear text“ parašą"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Parašo raktas"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Naudoti numatytąjį GnuPG raktą"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Parinkti raktą pagal jūsų el. pašto adresą"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Nurodyti raktą"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Vartotojo arba rakto ID"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Nenaudoti SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Naudoti SSL POP3 prisijungimui"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Naudoti STARTTLS komandą SSL sesijos pradžiai"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Naudoti SSL IMAP4 prisijungimui"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Naudoti SSL NNTP prisijungimui"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Siuntimas (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Naudoti SSL SMTP prisijungimui"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Naudoti „non-blocking SSL“"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "Išjunkite, jei turite problemų su SSL prisijungimais."
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Nurodykite SMTP prievadą"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Nurodykite POP3 prievadą"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Nurodykite IMAP4 prievadą"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Nurodykite NNTP prievadą"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Nurodykite domeno vardą"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP serverio katalogas"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Siųstas žinutes dėti į"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Juodraščius dėti į"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Ištrintas žinutes dėti į"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Neįvestas sąskaitos pavadinimas."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Neįvestas pašto adresas."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Neįvestas SMTP serveris."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Neįvestas vartotojo ID."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Neįvestas POP3 serveris."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Neįvestas IMAP4 serveris."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Neįvestas NNTP serveris."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Nerekomenduojama naudoti senamadiško „ASCII-armored“\n"
-"kodavomo rėžimo. Jis nėra suderinamas su RFC 3156 -\n"
-"„MIME Security with OpenPGP“."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Veiksmų derinimas"
@@ -4312,17 +3930,17 @@ msgstr " Sintaksė "
 msgid "Registered actions"
 msgstr "Registruoti veiksmai"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Aukštyn"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Žemyn"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Naujas)"
 
@@ -4365,817 +3983,31 @@ msgstr "Ištrinti veiksmą"
 msgid "Do you really want to delete this action?"
 msgstr "Ar tikrai norite ištrinti šį veiksmą?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "Nereikalingo pašto filtras"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Sukuriamas bendrų nustatymų langas...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Bendri nustatymai"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Cituoti"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Vaizdas"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Žinutė"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Nereikalingas paštas"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Kiti"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Naudoti išorinę programą sujungimui"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Komanda"
-
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "Prijungti iš vietinio kaupo"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtruoti prijungiant"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Kelias iki kaupo"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Automatiškai tikrinti paštą"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "kas"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minutė(s)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Tikrinti paštą paleidžiant"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Atnaujinti visus vietinius katalogus po prijungimo"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr "Vykdyti komandą kai gautos naujos žinutės"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "„%d“ bus pakeistas naujų žinučių skaičiumi."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Naudoti išorinę programą siuntimui"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Išsaugoti išsiųstas žinutes"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "Filtruoti išsiųstas žinutes"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Siunčiamų laiškų koduotė"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatiškai (Rekomenduojama)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unikodas (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Vakarų Europos (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Vakarų Europos (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Centrinės Europos (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltų (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltų (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Graikų (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Hebrajų (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebrajų (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turkų (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Kirilica (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Kirilica (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Kirilica (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kirilica (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonų (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonų (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonų (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Supaprastinta Kinų (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Supaprastinta Kinų (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradicinė Kinų (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradicinė Kinų (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Kinų (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korėjiečių (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tailandiečių (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tailandiečių (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Jei pažymėta „Automatiškai“, bus naudojama optimali koduotė pagal esamą "
-"lokalę."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Siuntimo kodavimas"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Nurodykite siuntimo kodavimą („Content-Transfer-Encoding“) naudojamą jei "
-"laiške yra ne „ASCII“ simbolių."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Parašo skirtukas"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Įterpti automatiškai"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Automatiškai paleisti išorinį redaktorių"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Atšaukimo lygis"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Laužyti eilutes kas"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "simboliai"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Laužyti citatas"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Laužyti įvedant"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Laužyti prieš išsiunčiant"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Automatiškai pažymėti sąskaitą atsakymams"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Cituoti žinutes atsakant"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Mygtukas „Atsakyti“ atsako pašto konferencijai"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Atsakymo formatas"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Citavimo simbolis"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Persiuntimo formatas"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Simbolių paaiškinimas "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Šriftas"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Versti antraščių pavadinimus (tokius kaip „From:“, „Subject:“)"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Rodyti neskaitytų žinučių skaičių šalia katalogo pavadinimo"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Sutrumpinti naujienų grupes ilgesnes nei"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "raidės"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Santrauka"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Rodyti gavėją lauke „Siuntėjas“, jei siuntėjas esate Jūs"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Išskleisti gijas"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Datos formatas"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Nustatyti santraukoje rodomus laukus... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Spalvinti žinutes"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Rodyti kelių baitų abėcėlę kaip ASCII simbolius\n"
-"(tik Japonų)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Rodyti antraščių langelį virš žinutės"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Rodyti sutrumpintas antraštes"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "Rodyti HTML žinutes kaip tekstą"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Rodyti kursorių žinutėje"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Tarpas tarp eilučių:"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "taškas(-ai)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Slinkti"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Pusė puslapio"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Lygus slinkimas"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Žingsnis"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "Paveikslėliai"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Keisti prisegtų paveikslėlių dydį, kad tilptų į langą"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Rodyti paveikslėlius žinutėje"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "Įjungti nereikalingo pašto kontrolę"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "Mokymosi komanda"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "Reikalingas"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "Klasifikavimo komanda"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "Nereikalingi"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr "Žinutės, pažymėtos nereikalingomis, bus perkeltos į šį katalogą."
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr "Gaunant filtruoti žinutes klasifikuotas kaip nereikalingas"
-
-#: src/prefs_common.c:2051
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr ""
-"Filtruotos žinutės bus perkeltos į nereikalingų žinučių katalogą ir "
-"ištrintos iš serverio."
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automatiškai tikrinti parašą"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Rodyti parašo tikrinimo rezultatą naujame lange"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Laikinai saugoti slaptą frazę atmintyje"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Galiojimas"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minutė(s)"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "Nustatymas „0“ saugos slaptą frazę atmintyje visos sesijos metu."
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Perimti įvesti, kai įvedama slapta frazė"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Rodyti perspėjimą startuojant, jei GnuPG neveikia"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Visuomet atidaryti santraukoje pasirinktas žinutes"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Atidaryti pirmą neskaitytą žinutę įeinant į katalogą"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Pažymėti žinutę skaityta tik jei ji atidaroma naujame lange"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Eiti į gaunamų laiškų katalogą po pašto gavimo"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Nedelsiant vykdyti žinučių perkėlimą ar trinimą"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr "Jei išjungta, žinutės bus pažymėtos iki vykdymo"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Gavimo langas"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Rodyti gavimo langą"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Visuomet"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Tik kai gaunama rankiniu būdu"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Niekada"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Nerodyti klaidos lango po nesėkmingo gavimo"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Užverti langą baigus gavimą"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "Išdėstyti mygtukus pagal GNOME HIG"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Klavišų susiejimai... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Išorinė komanda (%s bus pakeista bylos vardu / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Naršyklė"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Įdėti adresus į paskirties katalogą dukart spragtelėjus"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Išeinant"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Patvirtinti išėjimą"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Išvalyti šiukšlinę išeinant"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Paklausti prieš išvalant"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Perspėti jei yra žinučių eilėje"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Įjungti griežtą santraukos laikinosios atminties vientisumo tikrinimą"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-"Įjunkite, jei katalogų turinys gali būti modifikuotas kitų programų.\n"
-"Šis pasirinkimas sumažins santraukos rodymo greitį."
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Prisijungimo skirtasis laikas"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "sekundė(s)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "sutrumpinta savaitės diena"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "pilna savaitės diena"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "sutrumpintas mėnuo"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "pilnas mėnuo"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "pageidaujama data ir laikas esamai lokalei"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "amžius (metai/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "mėnesio diena"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "valanda (24)"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "valanda (12)"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "metų diena"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "mėnesio numeris"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minutės"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM / PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekundės"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "savaitės dienos numeris"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "pageidaujama data esamai lokalei"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "paskutiniai du metų skaitmenys"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "metai"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "laiko zona"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Simbolis"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Aprašymas"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Pavyzdys"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Nustatyti žinutės spalvas"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Spalvos"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Cituojams tekstas - Pirmas lygis"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Cituojams tekstas - Antras lygis"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Cituojams tekstas - Trečias lygis"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Nuoroda"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Atkurti citatos spalvas"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Pasirinkite spalvą pirmam citatos lygiui"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Pasirinkite spalvą antram citatos lygiui"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Pasirinkite spalvą trečiam citatos lygiui"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Pasirinkite nuorodos spalvą"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Simbolių apibūdinimas"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Data\n"
-"Siuntėjas\n"
-"Sintėjo pilnas vardas\n"
-"Siuntėjo vardas\n"
-"Siuntėjo inicialai\n"
-"Tema\n"
-"Gavėjas\n"
-"Kopija\n"
-"Naujienų grupė\n"
-"Žinutės-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Jei egzistuoja „x“, rodo „expr“"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Žinutės tekstas\n"
-"Cituojamas tekstas\n"
-"Žinutės tekstas be parašo\n"
-"Cituojamas tekstas be parašo\n"
-"Simbolis %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"„Backslash“\n"
-"Llaustukas\n"
-"Atidarantys riestiniai skliaustai\n"
-"Uždarantys riestiniai skliaustai"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Klavišų susiejimai"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Pasirinkite klavišų susiejimų nustatymų profilį.\n"
-"Taip pat galite keisti kiekvieno meniu punkto nuorodas\n"
-"spausdami klavišus kada pelės kursorius yra ant objekto."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Įprastas"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Senas „Sylpheed“"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Pasirinktų antraščių nustatymai"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Antraštė"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Ištrinti "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Pasirinktos antraštės"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Antraštės pavadinimas nenustatytas"
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Ištrinti antraštę"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Ar tikrai norite ištrinti šią antraštę?"
 
@@ -5223,12 +4055,20 @@ msgstr "Filtro nustatymai"
 msgid "Enabled"
 msgstr "Aktyvus"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Taisyti"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Ar tikrai norite ištrinti taisyklę „%s“?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(Bevardis)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Ištrinti taisyklę"
 
@@ -5312,6 +4152,10 @@ msgstr "yra ilgesnis už"
 msgid "is shorter than"
 msgstr "yra trumpesnis už"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Perkelti"
@@ -5433,6 +4277,10 @@ msgstr "Atsakant ištrinti [...] arba (...) temos pradžioje"
 msgid "Apply to subfolders"
 msgstr "Pritaikyti ir pakatalogiams"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Automatiškai nustatyti sekančius adresus"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "naudoti ir atsakant"
@@ -5506,64 +4354,46 @@ msgstr "Rodomi laukai"
 msgid " Revert to default "
 msgstr " Atkurti į įprastą "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Šablono pavadinimas"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registruoti"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Pakeisti "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Simboliai "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registruoti šablonai"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Šablonai"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Šablonas"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Šablono formato klaida."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Ištrinti šabloną"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Ar tikrai norite ištrinti šį šabloną?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "negali atidaryti žymų bylos\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "negaliu gauti žinutės %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Bloga spausdinimo komanda: „%s“\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Sukuriamas progreso dialogas...\n"
@@ -5572,29 +4402,21 @@ msgstr "Sukuriamas progreso dialogas...\n"
 msgid "Status"
 msgstr "Būsena"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "kalaida gaunant duomenis.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Negaliu rašyti į bylą.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Negaliu rasti vartotojo ID šiam raktui."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\taka „%s“\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Pasirašyta %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Klaida tikrinant parašą"
 
@@ -5620,6 +4442,10 @@ msgstr "Rakto ID"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Kiti"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Pridėti raktą"
@@ -5644,84 +4470,84 @@ msgstr ""
 "įsitikines, kad ji pasieks jūsų norimą adresatą.\n"
 "Ar jus pakankamai pasitikite šiuo raktu?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Neteisinga eilėje esančios žinutės antraštė.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Žinutė siunčiama komanda: %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Negaliu įvykdyti komandos: %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Klaida vykdant komandą: %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Jungiuosi prie SMTP serverio: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Siunčiu HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Tikrinamas autentiškumas"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Siunčiu laišką..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Siunčiu EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Siunčiu MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Siunčiu"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Siunčiu RCTP TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Siunčiu DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Išeinu..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Siunčiu laišką"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Klaida siunčiant laišką."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5821,32 +4647,20 @@ msgstr "BLOGAS parašas"
 msgid "No public key to verify the signature"
 msgstr "Nėra viešo rakto parašui patikrinti"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH neprieinamas\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "blogas SMTP atsakymas\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "klaida SMTP sesijoje\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Sukuriamas pradinio teksto langas...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Žinutės pradinis tekstas"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Rodomas „%s“ pradinis tekstas...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Pradinis tekstas"
@@ -6236,6 +5050,928 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Yra atidarytų laiško kūrimo langų.\n"
+#~ "Užverkite juos prieš redaguodami sąskaitas."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Atveriamas sąskaitos redagavimo langas...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Sukuriamas sąskaitos redagavimo langas...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Redaguoti sąskaitas"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Naujos žinutės bus tikrinamos šia tvarka. Pažymėkite laukelį\n"
+#~ "skulpelyje „G“ jei norite gauti žinutes pasirinkę „Gauti visus“."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokolas"
+
+#~ msgid "Server"
+#~ msgstr "Serveris"
+
+#~ msgid " _Set as default account "
+#~ msgstr " Pažymėti kaip pagrindinę _sąskaitą "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Ar tikrai norite pašalinti sąskaitą „%s“?"
+
+#~ msgid "Delete account"
+#~ msgstr "Pašalinti sąskaitą"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Atveriamas sąskaitos nustatymų langas...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Sąskaita%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Naujos sąskaitos nustatymai"
+
+#~ msgid "Account preferences"
+#~ msgstr "Sąskaitos nustatymai"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Gauti"
+
+#~ msgid "Privacy"
+#~ msgstr "Privatumas"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Papildomi"
+
+#~ msgid "Name of this account"
+#~ msgstr "Sąskaitos vardas"
+
+#~ msgid "Set as default"
+#~ msgstr "Pažymėti kaip įprastą"
+
+#~ msgid "Personal information"
+#~ msgstr "Asmeninė informacija"
+
+#~ msgid "Full name"
+#~ msgstr "Pilnas vardas"
+
+#~ msgid "Mail address"
+#~ msgstr "El. pašto adresas"
+
+#~ msgid "Organization"
+#~ msgstr "Organizacija"
+
+#~ msgid "Server information"
+#~ msgstr "Severio informacija"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Naujienos (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Vietinis"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Serveris reikalauja patvirtinti autentiškumą"
+
+#~ msgid "News server"
+#~ msgstr "Naujienų serveris"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Serveris pašto gavimui"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP serveris (siuntimui)"
+
+#~ msgid "User ID"
+#~ msgstr "Vartotojo ID"
+
+#~ msgid "Password"
+#~ msgstr "Slaptažodis"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Naudoti saugų autentiškumo tikrinimą (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Po gavimo pašalinti žinutes iš serverio"
+
+#~ msgid "Remove after"
+#~ msgstr "Pašalinti po"
+
+#~ msgid "days"
+#~ msgstr "dienų"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dienų: pašalinti iš karto)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Atsisiųsti visas žinutes serveryje"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Dydžio limitas"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtruoti žinutes gaunant"
+
+#~ msgid "Default inbox"
+#~ msgstr "Gaunamų laiškų dėžutė"
+
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "Nefiltruotos žinutės bus laikomos šiame kataloge."
+
+#~ msgid "Authentication method"
+#~ msgstr "Autentiškumo patikrinimo metodas"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatinis"
+
+#~ msgid "News"
+#~ msgstr "Naujienos"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "Maksimalus parsiunčiamų žinučių skaičius"
+
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Nelimituojama, jei nurodyta „0“."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "„Gauti visus“ tinkrina žinutes šioje sąskaitoje"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Pridėti „Date“ antraštės lauką"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generuoti „Message-ID“"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Pridėti vartotojo nustatytas antraštes"
+
+#~ msgid " Edit... "
+#~ msgstr " Redaguoti... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autentiškumo patikrinimas"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP autentiškumo patikrinimas (SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Jei paliksite šiuos laukus tuščius, bus naudojamas tas pats vartotojo ID "
+#~ "ir slaptažodis kaip ir gaunant."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
+
+#~ msgid "Command output"
+#~ msgstr "Komandos išvestis"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Reply-To"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Pasirašyti žinutes"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Koduoti žinutes"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "Koduoti kai atsakoma į koduotą žinutę"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Naudoti „ASCII-armored“ formatą kodavimui"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Naudoti „clear text“ parašą"
+
+#~ msgid "Sign key"
+#~ msgstr "Parašo raktas"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Naudoti numatytąjį GnuPG raktą"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Parinkti raktą pagal jūsų el. pašto adresą"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Nurodyti raktą"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Vartotojo arba rakto ID"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Nenaudoti SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Naudoti SSL POP3 prisijungimui"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Naudoti STARTTLS komandą SSL sesijos pradžiai"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Naudoti SSL IMAP4 prisijungimui"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Naudoti SSL NNTP prisijungimui"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Siuntimas (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Naudoti SSL SMTP prisijungimui"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Naudoti „non-blocking SSL“"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "Išjunkite, jei turite problemų su SSL prisijungimais."
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Nurodykite SMTP prievadą"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Nurodykite POP3 prievadą"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Nurodykite IMAP4 prievadą"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Nurodykite NNTP prievadą"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Nurodykite domeno vardą"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP serverio katalogas"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Siųstas žinutes dėti į"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Juodraščius dėti į"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Ištrintas žinutes dėti į"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Neįvestas sąskaitos pavadinimas."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Neįvestas pašto adresas."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Neįvestas SMTP serveris."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Neįvestas vartotojo ID."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Neįvestas POP3 serveris."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Neįvestas IMAP4 serveris."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Neįvestas NNTP serveris."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Nerekomenduojama naudoti senamadiško „ASCII-armored“\n"
+#~ "kodavomo rėžimo. Jis nėra suderinamas su RFC 3156 -\n"
+#~ "„MIME Security with OpenPGP“."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Sukuriamas bendrų nustatymų langas...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Bendri nustatymai"
+
+#~ msgid "Quote"
+#~ msgstr "Cituoti"
+
+#~ msgid "Display"
+#~ msgstr "Vaizdas"
+
+#~ msgid "Message"
+#~ msgstr "Žinutė"
+
+#~ msgid "Junk mail"
+#~ msgstr "Nereikalingas paštas"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Naudoti išorinę programą sujungimui"
+
+#~ msgid "Command"
+#~ msgstr "Komanda"
+
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Prijungti iš vietinio kaupo"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtruoti prijungiant"
+
+#~ msgid "Spool path"
+#~ msgstr "Kelias iki kaupo"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Automatiškai tikrinti paštą"
+
+#~ msgid "every"
+#~ msgstr "kas"
+
+#~ msgid "minute(s)"
+#~ msgstr "minutė(s)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Tikrinti paštą paleidžiant"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Atnaujinti visus vietinius katalogus po prijungimo"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Vykdyti komandą kai gautos naujos žinutės"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "„%d“ bus pakeistas naujų žinučių skaičiumi."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Naudoti išorinę programą siuntimui"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Išsaugoti išsiųstas žinutes"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "Filtruoti išsiųstas žinutes"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Siunčiamų laiškų koduotė"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatiškai (Rekomenduojama)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unikodas (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Vakarų Europos (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Vakarų Europos (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Centrinės Europos (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltų (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltų (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Graikų (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Hebrajų (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Hebrajų (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turkų (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Kirilica (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Kirilica (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Kirilica (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Kirilica (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonų (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonų (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonų (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Supaprastinta Kinų (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Supaprastinta Kinų (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradicinė Kinų (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradicinė Kinų (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Kinų (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korėjiečių (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tailandiečių (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tailandiečių (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Jei pažymėta „Automatiškai“, bus naudojama optimali koduotė pagal esamą "
+#~ "lokalę."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Siuntimo kodavimas"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Nurodykite siuntimo kodavimą („Content-Transfer-Encoding“) naudojamą jei "
+#~ "laiške yra ne „ASCII“ simbolių."
+
+#~ msgid "Signature separator"
+#~ msgstr "Parašo skirtukas"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Įterpti automatiškai"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Automatiškai paleisti išorinį redaktorių"
+
+#~ msgid "Undo level"
+#~ msgstr "Atšaukimo lygis"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Laužyti eilutes kas"
+
+#~ msgid "characters"
+#~ msgstr "simboliai"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Laužyti citatas"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Laužyti įvedant"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Laužyti prieš išsiunčiant"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Automatiškai pažymėti sąskaitą atsakymams"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Cituoti žinutes atsakant"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Mygtukas „Atsakyti“ atsako pašto konferencijai"
+
+#~ msgid "Reply format"
+#~ msgstr "Atsakymo formatas"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Citavimo simbolis"
+
+#~ msgid "Forward format"
+#~ msgstr "Persiuntimo formatas"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Simbolių paaiškinimas "
+
+#~ msgid "Font"
+#~ msgstr "Šriftas"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Versti antraščių pavadinimus (tokius kaip „From:“, „Subject:“)"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Rodyti neskaitytų žinučių skaičių šalia katalogo pavadinimo"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Sutrumpinti naujienų grupes ilgesnes nei"
+
+#~ msgid "letters"
+#~ msgstr "raidės"
+
+#~ msgid "Summary View"
+#~ msgstr "Santrauka"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Rodyti gavėją lauke „Siuntėjas“, jei siuntėjas esate Jūs"
+
+#~ msgid "Expand threads"
+#~ msgstr "Išskleisti gijas"
+
+#~ msgid "Date format"
+#~ msgstr "Datos formatas"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Nustatyti santraukoje rodomus laukus... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Spalvinti žinutes"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Rodyti kelių baitų abėcėlę kaip ASCII simbolius\n"
+#~ "(tik Japonų)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Rodyti antraščių langelį virš žinutės"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Rodyti sutrumpintas antraštes"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "Rodyti HTML žinutes kaip tekstą"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Rodyti kursorių žinutėje"
+
+#~ msgid "Line space"
+#~ msgstr "Tarpas tarp eilučių:"
+
+#~ msgid "pixel(s)"
+#~ msgstr "taškas(-ai)"
+
+#~ msgid "Scroll"
+#~ msgstr "Slinkti"
+
+#~ msgid "Half page"
+#~ msgstr "Pusė puslapio"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Lygus slinkimas"
+
+#~ msgid "Step"
+#~ msgstr "Žingsnis"
+
+#~ msgid "Images"
+#~ msgstr "Paveikslėliai"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Keisti prisegtų paveikslėlių dydį, kad tilptų į langą"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Rodyti paveikslėlius žinutėje"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "Įjungti nereikalingo pašto kontrolę"
+
+#~ msgid "Learning command:"
+#~ msgstr "Mokymosi komanda"
+
+#~ msgid "Not Junk"
+#~ msgstr "Reikalingas"
+
+#~ msgid "Classifying command"
+#~ msgstr "Klasifikavimo komanda"
+
+#~ msgid "Junk folder"
+#~ msgstr "Nereikalingi"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr "Žinutės, pažymėtos nereikalingomis, bus perkeltos į šį katalogą."
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Gaunant filtruoti žinutes klasifikuotas kaip nereikalingas"
+
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr ""
+#~ "Filtruotos žinutės bus perkeltos į nereikalingų žinučių katalogą ir "
+#~ "ištrintos iš serverio."
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Automatiškai tikrinti parašą"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Rodyti parašo tikrinimo rezultatą naujame lange"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Laikinai saugoti slaptą frazę atmintyje"
+
+#~ msgid "Expired after"
+#~ msgstr "Galiojimas"
+
+#~ msgid "minute(s) "
+#~ msgstr "minutė(s)"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "Nustatymas „0“ saugos slaptą frazę atmintyje visos sesijos metu."
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Perimti įvesti, kai įvedama slapta frazė"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Rodyti perspėjimą startuojant, jei GnuPG neveikia"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Visuomet atidaryti santraukoje pasirinktas žinutes"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Atidaryti pirmą neskaitytą žinutę įeinant į katalogą"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Pažymėti žinutę skaityta tik jei ji atidaroma naujame lange"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Eiti į gaunamų laiškų katalogą po pašto gavimo"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Nedelsiant vykdyti žinučių perkėlimą ar trinimą"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr "Jei išjungta, žinutės bus pažymėtos iki vykdymo"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Gavimo langas"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Rodyti gavimo langą"
+
+#~ msgid "Always"
+#~ msgstr "Visuomet"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Tik kai gaunama rankiniu būdu"
+
+#~ msgid "Never"
+#~ msgstr "Niekada"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Nerodyti klaidos lango po nesėkmingo gavimo"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Užverti langą baigus gavimą"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "Išdėstyti mygtukus pagal GNOME HIG"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Klavišų susiejimai... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Išorinė komanda (%s bus pakeista bylos vardu / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Naršyklė"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Įdėti adresus į paskirties katalogą dukart spragtelėjus"
+
+#~ msgid "On exit"
+#~ msgstr "Išeinant"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Patvirtinti išėjimą"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Išvalyti šiukšlinę išeinant"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Paklausti prieš išvalant"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Perspėti jei yra žinučių eilėje"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr ""
+#~ "Įjungti griežtą santraukos laikinosios atminties vientisumo tikrinimą"
+
+#~ msgid ""
+#~ "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 ""
+#~ "Įjunkite, jei katalogų turinys gali būti modifikuotas kitų programų.\n"
+#~ "Šis pasirinkimas sumažins santraukos rodymo greitį."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Prisijungimo skirtasis laikas"
+
+#~ msgid "second(s)"
+#~ msgstr "sekundė(s)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "sutrumpinta savaitės diena"
+
+#~ msgid "the full weekday name"
+#~ msgstr "pilna savaitės diena"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "sutrumpintas mėnuo"
+
+#~ msgid "the full month name"
+#~ msgstr "pilnas mėnuo"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "pageidaujama data ir laikas esamai lokalei"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "amžius (metai/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "mėnesio diena"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "valanda (24)"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "valanda (12)"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "metų diena"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "mėnesio numeris"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minutės"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM / PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekundės"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "savaitės dienos numeris"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "pageidaujama data esamai lokalei"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "paskutiniai du metų skaitmenys"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "metai"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "laiko zona"
+
+#~ msgid "Specifier"
+#~ msgstr "Simbolis"
+
+#~ msgid "Description"
+#~ msgstr "Aprašymas"
+
+#~ msgid "Example"
+#~ msgstr "Pavyzdys"
+
+#~ msgid "Set message colors"
+#~ msgstr "Nustatyti žinutės spalvas"
+
+#~ msgid "Colors"
+#~ msgstr "Spalvos"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Cituojams tekstas - Pirmas lygis"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Cituojams tekstas - Antras lygis"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Cituojams tekstas - Trečias lygis"
+
+#~ msgid "URI link"
+#~ msgstr "Nuoroda"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Atkurti citatos spalvas"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Pasirinkite spalvą pirmam citatos lygiui"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Pasirinkite spalvą antram citatos lygiui"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Pasirinkite spalvą trečiam citatos lygiui"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Pasirinkite nuorodos spalvą"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Simbolių apibūdinimas"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Data\n"
+#~ "Siuntėjas\n"
+#~ "Sintėjo pilnas vardas\n"
+#~ "Siuntėjo vardas\n"
+#~ "Siuntėjo inicialai\n"
+#~ "Tema\n"
+#~ "Gavėjas\n"
+#~ "Kopija\n"
+#~ "Naujienų grupė\n"
+#~ "Žinutės-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Jei egzistuoja „x“, rodo „expr“"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Žinutės tekstas\n"
+#~ "Cituojamas tekstas\n"
+#~ "Žinutės tekstas be parašo\n"
+#~ "Cituojamas tekstas be parašo\n"
+#~ "Simbolis %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "„Backslash“\n"
+#~ "Llaustukas\n"
+#~ "Atidarantys riestiniai skliaustai\n"
+#~ "Uždarantys riestiniai skliaustai"
+
+#~ msgid "Key bindings"
+#~ msgstr "Klavišų susiejimai"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Pasirinkite klavišų susiejimų nustatymų profilį.\n"
+#~ "Taip pat galite keisti kiekvieno meniu punkto nuorodas\n"
+#~ "spausdami klavišus kada pelės kursorius yra ant objekto."
+
+#~ msgid "Default"
+#~ msgstr "Įprastas"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Senas „Sylpheed“"
+
 #~ msgid "Font selection"
 #~ msgstr "Šrifto pasirinkimas"
 
diff --git a/po/nl.po b/po/nl.po
index 820483b5..ecaeee47 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,409 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Accountinstellingen worden ingelezen...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr ""
+"IMAP4 verbinding naar %s:%d is verbroken. Contact wordt opnieuw gelegd...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP server-map"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Kan geen TLS sessie starten.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Bericht %s%c%d wordt verplaatst naar %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Berichten worden van %s naar %s opgehaald...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "kan verwijderde vlaggen: %d niet instellen\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "kan niet wissen\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Berichten worden van %s naar %s opgehaald...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "kan de vlaggen \"verwijderd\" : 1.%d niet instellen\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "kan map niet selecteren: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Markeerbestand is niet gevonden\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "er is een fout opgetreden tijdens het ophalen van de LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr ""
+"kan %s niet aanmaken\n"
+"\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "kan %s niet aanmaken onder INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "Ik kan geen mailbox maken: LIST mislukt\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "Ik kan geen mailbox maken\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "kan de mailbox niet hernoemen van %s naar %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "Ik kan de mailbox niet verwijderen\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "Ik kan de envelope niet verkrijgen\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "Er is een fout opgetreden bij het verkrijgen van de envelope.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "Ik kan de envelope niet verwerken: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Kan niet verbinden met de IMAP4 server: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "kan de NAMESPACE niet vinden\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "kan map niet selecteren: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Identificatiemethode"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 login mislukt.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "kan %s niet toevoegen aan %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(bestand wordt verzonden...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "kan bericht %s niet toevoegen\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "kan %d niet naar %s kopiëren\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "Fout tijdens IMAP opdracht: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "kan bericht niet kopiëren van %s naar %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "kan het bestand met markeringen niet openen\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "de bronmap is hetzelfde als de doelmap.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Laatste nummer in map %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Bestand '%s' bestaat al.\n"
+"Kan geen map aanmaken."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "verbinding met nieuwsserver (NNTP) %s%d wordt opgezet...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr ""
+"De NNTP-verbinding met %s:%d is verbroken. Opnieuw contact aan het "
+"leggen...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "artikel %d is al gebufferd.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "artikel %d wordt opgehaald...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "kan artikel %d niet lezen\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "kan nieuwgroepenlijst niet ophalen\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "kan het ertikel niet versturen.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "kan het artikel %d niet ophalen\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "kan groep %s niet selecteren\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "ongeldig artikelbereik: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "geen nieuwe artikelen.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "xover %d - %d uit %s wordt opgehaald...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "Kan xover niet ophalen\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "Ongeldige xover regel: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "Kan xhdr niet ophalen\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "er is een fout opgetreden tijdens het ophalen van de xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protocolfout: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protocolfout\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Er is een fout opgetreden bij het versturen\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Fout bij het verwerken van de e-mail"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Er is geen APOP timestamp gevonden in de begroeting\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "APOP Timestamp in de begroeting is ongeldig\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 protocolfout\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "Ongeldige xover regel: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Bezig met verwijderen van verlopen bericht %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Bericht %d wordt overgeslagen (%d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "e-mailpostbux is vergrendeld\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "Kan TLS sessie niet starten\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "er is een fout opgetreden tijdens de identificatie\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Opdracht"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "er is een fout opgetreden tijdens de identificatie\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +426,54 @@ msgstr "%s gevonden\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuratie is opgeslagen.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Accounts"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "kan het bestand met markeringen niet openen\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "kan bericht %d niet ophalen\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Kan tekstgedeelte niet ophalen\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Opdracht voor het afdrukken in onjuist: '%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "er is een fout opgetreden bij het ontvangen van de gegevens.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Het bestand is niet beschrijfbaar.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH niet beschikbaar\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "er is een fout opgetreden tijdens de identificatie\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 niet beschikbaar\n"
@@ -164,79 +608,6 @@ msgstr ""
 "bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Accountinstellingen worden ingelezen...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Er zijn nog schermen open om een nieuw bericht op te stellen.\n"
-"Deze moeten gesloten worden om de postvakken te kunnen bewerken."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Accountvoorkeuren worden geopend...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Postvakeigenschappen venster word gemaakt...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Accountbeheer"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nieuwe berichten zullen gecontroleerd worden in deze volgorde.\n"
-"Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
-"u op de knop 'Alles ophalen' klikt."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Naam"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protocol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Bewerken"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Instellen als hoofdaccount"
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Wilt u dit account werkelijk verwijderen?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Geen titel"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Account verwijderen"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -334,6 +705,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Naam"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -348,8 +727,8 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Bestand"
 
@@ -370,9 +749,9 @@ msgid "/_File/New _Server"
 msgstr "/_Bestand/Nieuwe _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
@@ -388,7 +767,7 @@ msgstr "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
@@ -420,8 +799,8 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
@@ -429,13 +808,13 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
@@ -452,17 +831,17 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Be_werken"
 
@@ -474,7 +853,7 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -484,14 +863,14 @@ msgstr "Naam:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Verwijderen"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -502,11 +881,11 @@ msgid "Lookup"
 msgstr "Zoeken"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -533,7 +912,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -645,7 +1024,7 @@ msgstr "Adresboek omzetprobleem"
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interface"
 
@@ -665,8 +1044,7 @@ msgstr "E-mail adres"
 msgid "Group"
 msgstr "Groep"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Accounts"
 
@@ -690,15 +1068,15 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Fout"
 
@@ -753,8 +1131,8 @@ msgstr "/_Toevoegen..."
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
@@ -798,8 +1176,8 @@ msgstr "/B_ewerken/_Ongedaan maken"
 msgid "/_Edit/_Redo"
 msgstr "/B_ewerken/O_pnieuw toepassen"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/B_ewerken/---"
 
@@ -807,7 +1185,7 @@ msgstr "/B_ewerken/---"
 msgid "/_Edit/Cu_t"
 msgstr "/B_ewerken/Knippen"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/B_ewerken/_Kopiëren"
 
@@ -819,7 +1197,7 @@ msgstr "/B_ewerken/_Plakken"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/B_ewerken/Plakken als _citaat"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/B_ewerken/_Alles selecteren"
 
@@ -836,7 +1214,7 @@ msgstr "/B_ewerken/Regelterugloop in hele bericht"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/B_eeld"
@@ -858,9 +1236,9 @@ msgid "/_View/_Reply to"
 msgstr "/B_eeld/Ant_woord naar"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/B_eeld/---"
 
@@ -876,7 +1254,7 @@ msgstr "/B_eeld/_Lineaal"
 msgid "/_View/_Attachment"
 msgstr "/B_eeld/_Bijvoeging"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/B_eeld/_Sorteren/Aflopend"
@@ -888,127 +1266,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/B_eeld/Codering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/B_eeld/Codering/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/B_eeld/Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/B_eeld/_Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/B_eeld/_Codering/Centraaleuropees (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/B_eeld/_Codering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/B_eeld/_Codering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/B_eeld/_Codering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/B_eeld/_Codering/Thais (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/B_eeld/_Codering/Thais (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
@@ -1016,14 +1394,14 @@ msgstr "/_Gereedschap/_Adresboek"
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
@@ -1047,10 +1425,6 @@ msgstr "/Be_richt/Codeer"
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Kan tekstgedeelte niet ophalen\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
@@ -1127,7 +1501,7 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
@@ -1219,8 +1593,7 @@ msgstr "MIME type"
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Verzenden"
 
@@ -1260,8 +1633,7 @@ msgstr "Bijvoegen"
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Tekenen"
 
@@ -1269,7 +1641,7 @@ msgstr "Tekenen"
 msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1466,7 +1838,7 @@ msgstr "Bewerken"
 msgid "Clear"
 msgstr "Legen"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Waarde"
 
@@ -1499,7 +1871,6 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Bestand"
 
@@ -1556,12 +1927,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -1578,7 +1949,7 @@ msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr "Bladeren..."
 
@@ -1642,7 +2013,7 @@ msgstr "Timeout (sec)"
 msgid "Maximum Entries"
 msgstr "Maximum aantal velden"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -1700,7 +2071,6 @@ msgid "Exporting file:"
 msgstr "Doelbestand:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "Selecteer..."
 
@@ -1724,164 +2094,164 @@ msgstr "Bestaand bestand overschrijven?"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/_Nieuwe map maken..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Map ver_wijderen"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Berichten _doorzoeken..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Geen ongelezen berichten."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/A_bonneren op een nieuwsgroep..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Nieuws_groep verwijderen"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1891,21 +2261,21 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1916,21 +2286,21 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1939,34 +2309,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2027,7 +2397,7 @@ msgstr "%d nieuwsgroepen ontvangen (%s ingelezen)"
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Onderwerp:"
 
@@ -2051,168 +2421,6 @@ msgstr "Plaatje wordt weergegeven...\n"
 msgid "Can't load the image."
 msgstr "Kan plaatje niet weergeven."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr ""
-"IMAP4 verbinding naar %s:%d is verbroken. Contact wordt opnieuw gelegd...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP server-map"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Kan geen TLS sessie starten.\n"
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "kan verwijderde vlaggen: %d niet instellen\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "kan niet wissen\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "kan de vlaggen \"verwijderd\" : 1.%d niet instellen\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "kan map niet selecteren: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Markeerbestand is niet gevonden\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "er is een fout opgetreden tijdens het ophalen van de LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr ""
-"kan %s niet aanmaken\n"
-"\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "kan %s niet aanmaken onder INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "Ik kan geen mailbox maken: LIST mislukt\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "Ik kan geen mailbox maken\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "kan de mailbox niet hernoemen van %s naar %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "Ik kan de mailbox niet verwijderen\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "Ik kan de envelope niet verkrijgen\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "Er is een fout opgetreden bij het verkrijgen van de envelope.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "Ik kan de envelope niet verwerken: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Kan niet verbinden met de IMAP4 server: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "kan de NAMESPACE niet vinden\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "kan map niet selecteren: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Identificatiemethode"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 login mislukt.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "kan %s niet toevoegen aan %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(bestand wordt verzonden...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "kan bericht %s niet toevoegen\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "kan %d niet naar %s kopiëren\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "Fout tijdens IMAP opdracht: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importeren"
@@ -2311,7 +2519,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Volgende"
 
@@ -2327,200 +2535,200 @@ msgstr "Attributen"
 msgid "Finish"
 msgstr "Afronden"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Oude Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe bercihten)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sec)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3 server: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -2538,29 +2746,20 @@ msgstr "Geef wachtwoord"
 msgid "Protocol log"
 msgstr "Protocol-logboek"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Bestand '%s' bestaat al.\n"
-"Kan geen map aanmaken."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread is niet ondersteunt door glib\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2570,48 +2769,48 @@ msgstr ""
 "                         venster 'bericht opstellen' openen met de\n"
 "                         gespacificeerde bestanden als bijvoegingen"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          Berichten ophalen van alle accounts"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verstuur alle berichten uit de wachtrij"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status\t\t\ttotaal aantal berichten weergeven"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status\t\t\ttotaal aantal berichten weergeven"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 geef deze hulp weer"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr " --version\t\tgeef versie informatie en sluit af"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Codering voor uitgaande berichten"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2625,21 +2824,21 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "U bent een bericht aan het opstellen.\n"
 "Wilt u werkelijk het programma afsluiten?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2648,661 +2847,661 @@ msgstr ""
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Bezig met wegschrijven van configuratie van acties...\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Bestand/_Map/Nieuwe map aanmaken..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Bestand/_Map/Map ver_wijderen"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Mailbox verwijderen"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Bestand/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Bestand/Mbox bestand importeren..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Bestand/Mbox bestand _exporteren..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Bestand/Prullenbak _leegmaken"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Bestand/Af_drukken..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Bestand/Bijlage _invoegen"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Bestand/A_fsluiten"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/B_ewerken/_Discussie selecteren"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Be_werken/_Huidig bericht doorzoeken..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/Be_werken/Berichten door_zoeken..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/B_eeld/_Tonen of Verbergen"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/B_eeld/_Tonen of Verbergen/_Accountlijst"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/B_eeld/_Tonen of Verbergen/_Bericht"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/Afbeelding _en tekst"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Niet weergeven"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/B_eeld/_Tonen of Verbergen/Status_balk"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/B_eeld/Acc_ountlijst los"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/B_eeld/_Bericht los"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/B_eeld/_Sorteren"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/B_eeld/_Sorteren/Op _nummer"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/B_eeld/_Sorteren/Op _grootte"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/B_eeld/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/B_eeld/_Sorteren/Op _afzender"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/B_eeld/_Sorteren/Op _ontvanger"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/B_eeld/_Sorteren/Op _onderwerp"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/B_eeld/_Sorteren/Op _kleurlabel"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/B_eeld/_Sorteren/Op _markering"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/B_eeld/_Sorteren/Op on_gelezen"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/B_eeld/_Sorteren/Op _bijvoeging"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/B_eeld/_Sorteren/_Ongesorteerd"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/B_eeld/_Sorteren/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/B_eeld/_Sorteren/Oplopend"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/B_eeld/_Sorteren/Aantrekken op onderwerp"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/B_eeld/Ge_nest"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/B_eeld/Discussies _uitklappen"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/B_eeld/Discussies _inklappen"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/B_eeld/Beeld_item instellen..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/B_eeld/_Ga naar"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/B_eeld/_Ga naar/_Vorige bericht"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende bericht"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/B_eeld/_Ga naar/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/B_eeld/_Ga naar/Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/B_eeld/_Ga naar/Volgende on_gelezen bericht"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/B_eeld/_Ga naar/_Vorige nieuwe bericht"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende nieuwe bericht"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/B_eeld/_Ga naar/Vorige ge_markeerd bericht"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/B_eeld/_Ga naar/Volgende gem_arkeerd bericht"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/B_eeld/_Ga naar/Vorige gela_beld bericht"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/B_eeld/_Ga naar/Volgende gelab_eld bericht"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/B_eeld/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/B_eeld/Codering/Automatisch"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/B_eeld/_Codering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/B_eeld/_Codering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/B_eeld/_Codering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/B_eeld/_Codering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/B_eeld/Open in _nieuw venster"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/B_eeld/Bekijk _broncode"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Be_richt/Ontvangen af_breken"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen als bij_voeging"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Gereedschap/_Uitvoeren"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3312,16 +3511,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3331,153 +3530,152 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Instellen als standaard"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -3595,32 +3793,32 @@ msgstr "Einde van het bericht bereikt; verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Bijvoegingen"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3629,7 +3827,7 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3638,41 +3836,6 @@ msgstr ""
 "Afdrukopdracht is ongeldig:\n"
 "'%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "kan bericht niet kopiëren van %s naar %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "kan het bestand met markeringen niet openen\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "de bronmap is hetzelfde als de doelmap.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Laatste nummer in map %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/Openen"
@@ -3759,118 +3922,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIMEviewer commandoregel is ongeldig: '%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "verbinding met nieuwsserver (NNTP) %s%d wordt opgezet...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr ""
-"De NNTP-verbinding met %s:%d is verbroken. Opnieuw contact aan het "
-"leggen...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "artikel %d is al gebufferd.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "artikel %d wordt opgehaald...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "kan artikel %d niet lezen\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "kan nieuwgroepenlijst niet ophalen\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "kan het ertikel niet versturen.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "kan het artikel %d niet ophalen\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "kan groep %s niet selecteren\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "ongeldig artikelbereik: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "geen nieuwe artikelen.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "xover %d - %d uit %s wordt opgehaald...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "Kan xover niet ophalen\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "Ongeldige xover regel: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "Kan xhdr niet ophalen\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "er is een fout opgetreden tijdens het ophalen van de xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protocolfout: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protocolfout\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Er is een fout opgetreden bij het versturen\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Fout bij het verwerken van de e-mail"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[geen gebruikersnaam]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3883,464 +3943,12 @@ msgstr ""
 " %.*s\n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
 msgstr "Slecht wachtwoord! Probeer opnieuw...\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Er is geen APOP timestamp gevonden in de begroeting\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "APOP Timestamp in de begroeting is ongeldig\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 protocolfout\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "Ongeldige xover regel: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Bezig met verwijderen van verlopen bericht %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Bericht %d wordt overgeslagen (%d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "e-mailpostbux is vergrendeld\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "Kan TLS sessie niet starten\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "er is een fout opgetreden tijdens de identificatie\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Opdracht"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "er is een fout opgetreden tijdens de identificatie\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Venster accountvoorkeuren wordt geopend...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Account%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Voorkeuren voor nieuw account"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Accountvoorkeuren"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Venster accountvoorkeuren wordt geopend...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Ontvangen"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privacy"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Naam van dit account"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Instellen als standaard"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Persoonlijke informatie"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Volledige naam"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-mail adres"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organisatie"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Serverinformatie"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Nieuws (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Niets (lokaal)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Deze server vereist authentificatie"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Nieuwsserver"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server om van te ontvangen"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP server (om te verzenden)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Gebruikersnaam"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Deze server vereist authentificatie"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Verwijderen na"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dagen"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dagen: direct verwijderen)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Haal alle berichten op van server"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Limiet ontvangstgrootte"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filter de berichten bij het ophalen"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Standaard inbox"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Identificatiemethode"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatisch"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Nieuws"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maximum aantal te downloaden artikelen\n"
-"(0 = alles)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Ontvanger is niet gespecificeerd."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Header"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Datum veld toevoegen aan header"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Bericht-ID aanmaken"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Voeg een door de gebruiker gespecificeerde header toe"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr "Bewerken"
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Identificatie"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP identificatie (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Als u deze ingangen niet invult, zal hetzelfde\n"
-"naam/wachtwoord-paar gebruikt worden als\n"
-"voor het ontvangen."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Identificatie met POP3 voor het verzenden"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Opdracht"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Stel automatisch de volgende adressen in"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Antwoorden naar"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Standaard een identificatiehandtekening toevoegen"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Standaard het bericht coderen"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "ASCII-versterkt formaat gebruiken voor codering"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Teksthandtekening gebruiken"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Signeersleutel"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Gebruik standaard GnuPG sleutel"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Selecteer sleutel naar e-mail adres"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Specificeer sleutel zelf"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Gebruikers- of sleutel-ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Geen SSL gebruiken"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "SSL gebruiken voor POP3 verbinding"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "SSL gebruiken voor IMAP verbinding"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "SSL gebruiken voor NNTP verbinding"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Verzenden (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "SSL gebruiken voor SMTP verbinding"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "SMTP poort"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "POP3 poort"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "IMAP4 poort"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "SMTP poort"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Specificeer domeinnaam"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP server-map"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Verzonden berichten opslaan in"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Kladberichten opslaan in"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Verwijderde berichten opslaan in"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Accountnaam is niet ingevuld."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "E-mail adres is niet ingevoerd."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP server is niet ingevoerd."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Gebruikersnaam is niet ingevoerd."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3 server is niet ingevoerd."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4 server is niet ingevoerd."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP server is niet ingevoerd."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Het wordt afgeraden om de oude stijl van ASCII-versterkte\n"
-"codering te gebruiken. Het voldoet niet aan de RFC 3156\n"
-"- MIME-beveiligingsregels als u OpenPGP gebruikt."
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4402,17 +4010,17 @@ msgstr " Syntaxhulp"
 msgid "Registered actions"
 msgstr "Ingestelde acties"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(nieuw)"
 
@@ -4455,842 +4063,31 @@ msgstr "Actie verwijderen"
 msgid "Do you really want to delete this action?"
 msgstr "Wilt u werkelijk deze actie verwijderen?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Accounts"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Venster algemene voorkeuren wordt aangemaakt...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Algemene voorkeuren"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citaat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Beeld"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Bericht"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Diversen"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Extern programma gebruiken voor verwerking van de e-mail"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Opdracht"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Lokale e-mail beheren"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filteren bij het ophalen"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Kijk "
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "iedere"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuten of er nieuwe e-mail is."
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Kijk bij opstarten of er nieuwe e-mail is"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Ververs alle lokale mappen na de verwerking"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Extern programma gebruiken voor het verzenden"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Verzonden berichten opslaan in de outbox"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Codering voor uitgaande berichten"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatisch (aanbevolen)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Westeuropees (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Westeuropees (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Centraaleuropees (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltisch (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltisch (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grieks (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grieks (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Cyrillisch (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turks (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrillisch (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrillisch (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cyrillisch (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillisch (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japans (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japans (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japans (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Vereenvoudigd Chinees (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Vereenvoudigd Chinees (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Traditioneel Chinees (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Traditioneel Chinees (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chinees (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Koreaans (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thais (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thais (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Als 'Automatisch' is geselecteerd, wordt de meest\n"
-"optimale codering voor de huidige locale gebruikt."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Berichtcodering"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Geef de Content-Transfer-Encoding die gebruikt wordt om\n"
-"het bericht te coderen wanneer deze non-ASCII tekens bevat."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Handtekening scheidingsteken"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Automatisch invoegen"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Automatisch extern programma starten voor bewerken van e-mail bericht"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "niveau van ongedaan maken"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Regelterugloop na:"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "tekens"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Regelterugloop gebruiken bij citeren"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Regelterugloop tijdens invoer"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Regelterugloop activeren bij het verzenden"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Account automatisch selecteren voor beantwoorden"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Originele bericht citeren bij beantwoorden"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Antwoorden roept de functie 'Mailinglijst beantwoorden' aan"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Antwoordopmaak"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Citeerteken"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Doorstuuropmaak"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Beschrijving der symbolen"
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Lettertype"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Headervelden vertalen (zoals 'From:', 'Subject:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Nieuwsgroepen inkorten die langer zijn dan"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "brieven"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Berichtenlijst"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr ""
-"Ontvanger weergeven in 'Afzender' kolom wanneer u zelf de afzender bent"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Discussies uitklappen"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Datumopmaak"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr "Kies kolommen voor berichtenlijst..."
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Kleurmarkering in berichten aanzetten"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Multi-byte tekens weergeven als ASCII tekens\n"
-"(alleen Japans)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Headerinformatie weergeven boven bericht"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Korte headerinformatie weergeven boven bericht"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Korte headerinformatie weergeven boven bericht"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Regelafstand"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(s)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Schuiven"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Halve pagina"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Vloeiend schuiven"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Stap"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "Bijgevoegde afbeeldingen schalen"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Headerweergave instellingen"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Uitvoeren"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Uitvoeren"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Accounts"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filter de berichten bij het ophalen"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Controleer identificatiehandtekeningen automatisch"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Geef het resultaat van de controle weer in een popupvenster"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Wachtwoord tijdelijk in geheugen opslaan"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Verloopt na"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minuten"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Instellen op '0' zal het wachtwoord tot het\n"
-" einde bam de sessie opslaan)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "Geen berichtsbestand geselecteerd."
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr ""
-"Bericht alleen als gelezen markeren wanneer het geopend is in een nieuw "
-"venster"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Berichten worden gemarkeerd voor deze acties\n"
-"wanneer dit uitgeschakeld is)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Ontvangstvenster"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Ontvangstvenster weergeven"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Altijd"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nooit"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Geen foutmelding geven bij ontvangstfout"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Ontvangstvenster sluiten wanneer het klaar is."
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Sneltoetsen instellen..."
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externe opdrachten (%s is het bestand / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Webbrowser"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Afsluiten"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Bevestigen bij het afsluiten"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Prullenbak leegmaken bij het afsluiten"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Bevestigen bij het legen"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "afgekorte dag van de week"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "volledige dag van de week"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "afgekorte naam van de maand"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "volledig naam van de maand"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "de voorkeurs datum en tijd voor de huidige locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "eeuwnummer (jaar/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "dag van de maand als decimaal nummer"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "het uur als decimaal nummer op een 24 uurs klok"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "het uur als decimaal nummer op een 12-uurs klok"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "dag van het jaar als decimaal nummer"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "de maand als decimaal nummer"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "de minuut als decimaal nummer"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM of PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "de seconde als decimaal nummer"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "de dag van de week als decimaal nummer"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "de voorkeursdatum voor de huidige locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "de laatste twee cijfers van het jaartal"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "het jaartal als decimaal nummer"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "de tijdzone of naam of afkorting"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Selecteer"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Beschrijving"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Voorbeeld"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Berichtkleuren instellen"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Kleuren"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Geciteerde tekst - eerste niveau"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Geciteerde tekst - tweede niveau"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Geciteerde tekst - derde niveau"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI link"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Gebruikte kleuren opnieuw gebruiken"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Selecteer kleur voor niveau 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Selecteer kleur voor niveau 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Selecteer kleur voor niveau 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Selecteer kleur voor URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Beschrijving der symbolen"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Datum\n"
-"Afzender\n"
-"Volledige naam van de afzender\n"
-"Voornaam van de afzender\n"
-"Initiaal van de afzender\n"
-"Onderwerp\n"
-"Aan\n"
-"Cc\n"
-"Nieuwsgroepen\n"
-"Bericht-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Als x ingesteld is, expr weergeven"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Berichtinhoud\n"
-"Geciteerde berichtinhoud\n"
-"Berichtinhoud zonder handtekening\n"
-"Geciteerde berichtinhoud zonder handtekening\n"
-"Letterlijk %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Letterlijke backslash\n"
-"Letterlijk vraagteken\n"
-"Letterlijk haakje openen\n"
-"Letterlijk haakje sluiten"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Sneltoetsen"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Kies de vooringestelde sneltoetsbindingen.\n"
-"U kunt ook de sneltoetsen van de menu's aanpassen door\n"
-"op de gewenste toetscombinatie te drukken wanneer de\n"
-"muis boven het menu item zweeft."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Standaard"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Oude Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Header aanpassen"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Header"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr "Verwijderen"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Header handmatig instellen"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Headernaam is niet ingesteld."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Verwijder header"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Wil je deze header werkelijk verwijderen?"
 
@@ -5338,12 +4135,21 @@ msgstr "Filterbeheer"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Bewerken"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Geen titel"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
@@ -5432,6 +4238,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5576,6 +4386,10 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr "Toepassen op submappen"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Stel automatisch de volgende adressen in"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "ook gebruiken bij beantwoorden"
@@ -5650,64 +4464,46 @@ msgstr "Weergegeven items"
 msgid " Revert to default "
 msgstr " Standaard herstellen"
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Sjabloonnaam:"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Toevoegen"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Vervangen"
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Gebruikte sjablonen"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Sjabloonbeheer"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Sjabloon"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Sjabloon opmaakfout."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Verwijder sjabloon"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Wil je dit sjabloon werkelijk verwijderen?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "kan het bestand met markeringen niet openen\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "kan bericht %d niet ophalen\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Opdracht voor het afdrukken in onjuist: '%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Voortgangsdialoogvenster wordt gemaakt...\n"
@@ -5716,29 +4512,21 @@ msgstr "Voortgangsdialoogvenster wordt gemaakt...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "er is een fout opgetreden bij het ontvangen van de gegevens.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Het bestand is niet beschrijfbaar.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Kan gebruikers-ID niet vinden voor deze sleutel."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Handtekening gemaakt op %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Er is een fout opgetreden bij het controleren van de handtekening"
 
@@ -5764,6 +4552,10 @@ msgstr "Sleutel ID"
 msgid "Val"
 msgstr "Waarde"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Diversen"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Sleutel toevoegen"
@@ -5784,85 +4576,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "De header van het bericht in de wachtrij is kapot.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Kon het externe programma niet aanroepen: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Bezig met maken van verbinding"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Bezig met verbinden met SMTP server: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Bezig met sturen van HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Bezig met identificatie"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Bezig met sturen van EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Bezig met verzenden van MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Bezig met verzenden"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Bezig met verzenden van RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Bezig met verzenden van DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Bezig met afsluiten..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Bezig met verzenden van bericht"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5961,33 +4753,20 @@ msgstr "FOUTIEVE handtekening"
 msgid "No public key to verify the signature"
 msgstr "Geen publieke key om de handtekening te verifiëren"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH niet beschikbaar\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "er is een fout opgetreden tijdens de identificatie\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Bronvenster wordt aangemaakt...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Broncode van het bericht"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Bron wordt weergegeven voor %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Broncode"
@@ -6385,6 +5164,913 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Er zijn nog schermen open om een nieuw bericht op te stellen.\n"
+#~ "Deze moeten gesloten worden om de postvakken te kunnen bewerken."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Accountvoorkeuren worden geopend...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Postvakeigenschappen venster word gemaakt...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Accountbeheer"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nieuwe berichten zullen gecontroleerd worden in deze volgorde.\n"
+#~ "Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
+#~ "u op de knop 'Alles ophalen' klikt."
+
+#~ msgid "Protocol"
+#~ msgstr "Protocol"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Instellen als hoofdaccount"
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Wilt u dit account werkelijk verwijderen?"
+
+#~ msgid "Delete account"
+#~ msgstr "Account verwijderen"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Venster accountvoorkeuren wordt geopend...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Account%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Voorkeuren voor nieuw account"
+
+#~ msgid "Account preferences"
+#~ msgstr "Accountvoorkeuren"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Venster accountvoorkeuren wordt geopend...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Ontvangen"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacy"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Geavanceerd"
+
+#~ msgid "Name of this account"
+#~ msgstr "Naam van dit account"
+
+#~ msgid "Set as default"
+#~ msgstr "Instellen als standaard"
+
+#~ msgid "Personal information"
+#~ msgstr "Persoonlijke informatie"
+
+#~ msgid "Full name"
+#~ msgstr "Volledige naam"
+
+#~ msgid "Mail address"
+#~ msgstr "E-mail adres"
+
+#~ msgid "Organization"
+#~ msgstr "Organisatie"
+
+#~ msgid "Server information"
+#~ msgstr "Serverinformatie"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Nieuws (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Niets (lokaal)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Deze server vereist authentificatie"
+
+#~ msgid "News server"
+#~ msgstr "Nieuwsserver"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server om van te ontvangen"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP server (om te verzenden)"
+
+#~ msgid "User ID"
+#~ msgstr "Gebruikersnaam"
+
+#~ msgid "Password"
+#~ msgstr "Wachtwoord"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Deze server vereist authentificatie"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
+
+#~ msgid "Remove after"
+#~ msgstr "Verwijderen na"
+
+#~ msgid "days"
+#~ msgstr "dagen"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dagen: direct verwijderen)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Haal alle berichten op van server"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Limiet ontvangstgrootte"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filter de berichten bij het ophalen"
+
+#~ msgid "Default inbox"
+#~ msgstr "Standaard inbox"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Identificatiemethode"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatisch"
+
+#~ msgid "News"
+#~ msgstr "Nieuws"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maximum aantal te downloaden artikelen\n"
+#~ "(0 = alles)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Ontvanger is niet gespecificeerd."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Datum veld toevoegen aan header"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Bericht-ID aanmaken"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Voeg een door de gebruiker gespecificeerde header toe"
+
+#~ msgid " Edit... "
+#~ msgstr "Bewerken"
+
+#~ msgid "Authentication"
+#~ msgstr "Identificatie"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP identificatie (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Als u deze ingangen niet invult, zal hetzelfde\n"
+#~ "naam/wachtwoord-paar gebruikt worden als\n"
+#~ "voor het ontvangen."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Identificatie met POP3 voor het verzenden"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Opdracht"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Antwoorden naar"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Standaard een identificatiehandtekening toevoegen"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Standaard het bericht coderen"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "ASCII-versterkt formaat gebruiken voor codering"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Teksthandtekening gebruiken"
+
+#~ msgid "Sign key"
+#~ msgstr "Signeersleutel"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Gebruik standaard GnuPG sleutel"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Selecteer sleutel naar e-mail adres"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Specificeer sleutel zelf"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Gebruikers- of sleutel-ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Geen SSL gebruiken"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "SSL gebruiken voor POP3 verbinding"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "SSL gebruiken voor IMAP verbinding"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "SSL gebruiken voor NNTP verbinding"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Verzenden (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "SSL gebruiken voor SMTP verbinding"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "SMTP poort"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "POP3 poort"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "IMAP4 poort"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "SMTP poort"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Specificeer domeinnaam"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP server-map"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Verzonden berichten opslaan in"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Kladberichten opslaan in"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Verwijderde berichten opslaan in"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Accountnaam is niet ingevuld."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "E-mail adres is niet ingevoerd."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP server is niet ingevoerd."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Gebruikersnaam is niet ingevoerd."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3 server is niet ingevoerd."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4 server is niet ingevoerd."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP server is niet ingevoerd."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Het wordt afgeraden om de oude stijl van ASCII-versterkte\n"
+#~ "codering te gebruiken. Het voldoet niet aan de RFC 3156\n"
+#~ "- MIME-beveiligingsregels als u OpenPGP gebruikt."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Venster algemene voorkeuren wordt aangemaakt...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Algemene voorkeuren"
+
+#~ msgid "Quote"
+#~ msgstr "Citaat"
+
+#~ msgid "Display"
+#~ msgstr "Beeld"
+
+#~ msgid "Message"
+#~ msgstr "Bericht"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Extern programma gebruiken voor verwerking van de e-mail"
+
+#~ msgid "Command"
+#~ msgstr "Opdracht"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Lokale e-mail beheren"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filteren bij het ophalen"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Kijk "
+
+#~ msgid "every"
+#~ msgstr "iedere"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuten of er nieuwe e-mail is."
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Kijk bij opstarten of er nieuwe e-mail is"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Ververs alle lokale mappen na de verwerking"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Extern programma gebruiken voor het verzenden"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Verzonden berichten opslaan in de outbox"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Codering voor uitgaande berichten"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatisch (aanbevolen)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Westeuropees (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Westeuropees (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Centraaleuropees (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltisch (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltisch (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grieks (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grieks (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Cyrillisch (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turks (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cyrillisch (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cyrillisch (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cyrillisch (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cyrillisch (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japans (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japans (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japans (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Vereenvoudigd Chinees (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Vereenvoudigd Chinees (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Traditioneel Chinees (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Traditioneel Chinees (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chinees (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Koreaans (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thais (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thais (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Als 'Automatisch' is geselecteerd, wordt de meest\n"
+#~ "optimale codering voor de huidige locale gebruikt."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Berichtcodering"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Geef de Content-Transfer-Encoding die gebruikt wordt om\n"
+#~ "het bericht te coderen wanneer deze non-ASCII tekens bevat."
+
+#~ msgid "Signature separator"
+#~ msgstr "Handtekening scheidingsteken"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Automatisch invoegen"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr ""
+#~ "Automatisch extern programma starten voor bewerken van e-mail bericht"
+
+#~ msgid "Undo level"
+#~ msgstr "niveau van ongedaan maken"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Regelterugloop na:"
+
+#~ msgid "characters"
+#~ msgstr "tekens"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Regelterugloop gebruiken bij citeren"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Regelterugloop tijdens invoer"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Regelterugloop activeren bij het verzenden"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Account automatisch selecteren voor beantwoorden"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Originele bericht citeren bij beantwoorden"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Antwoorden roept de functie 'Mailinglijst beantwoorden' aan"
+
+#~ msgid "Reply format"
+#~ msgstr "Antwoordopmaak"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Citeerteken"
+
+#~ msgid "Forward format"
+#~ msgstr "Doorstuuropmaak"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Beschrijving der symbolen"
+
+#~ msgid "Font"
+#~ msgstr "Lettertype"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Headervelden vertalen (zoals 'From:', 'Subject:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Nieuwsgroepen inkorten die langer zijn dan"
+
+#~ msgid "letters"
+#~ msgstr "brieven"
+
+#~ msgid "Summary View"
+#~ msgstr "Berichtenlijst"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr ""
+#~ "Ontvanger weergeven in 'Afzender' kolom wanneer u zelf de afzender bent"
+
+#~ msgid "Expand threads"
+#~ msgstr "Discussies uitklappen"
+
+#~ msgid "Date format"
+#~ msgstr "Datumopmaak"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr "Kies kolommen voor berichtenlijst..."
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Kleurmarkering in berichten aanzetten"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Multi-byte tekens weergeven als ASCII tekens\n"
+#~ "(alleen Japans)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Headerinformatie weergeven boven bericht"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Korte headerinformatie weergeven boven bericht"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Korte headerinformatie weergeven boven bericht"
+
+#~ msgid "Line space"
+#~ msgstr "Regelafstand"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(s)"
+
+#~ msgid "Scroll"
+#~ msgstr "Schuiven"
+
+#~ msgid "Half page"
+#~ msgstr "Halve pagina"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Vloeiend schuiven"
+
+#~ msgid "Step"
+#~ msgstr "Stap"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Bijgevoegde afbeeldingen schalen"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Headerweergave instellingen"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Uitvoeren"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Uitvoeren"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Accounts"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filter de berichten bij het ophalen"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Controleer identificatiehandtekeningen automatisch"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Geef het resultaat van de controle weer in een popupvenster"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Wachtwoord tijdelijk in geheugen opslaan"
+
+#~ msgid "Expired after"
+#~ msgstr "Verloopt na"
+
+#~ msgid "minute(s) "
+#~ msgstr "minuten"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Instellen op '0' zal het wachtwoord tot het\n"
+#~ " einde bam de sessie opslaan)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Geen berichtsbestand geselecteerd."
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr ""
+#~ "Bericht alleen als gelezen markeren wanneer het geopend is in een nieuw "
+#~ "venster"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Berichten worden gemarkeerd voor deze acties\n"
+#~ "wanneer dit uitgeschakeld is)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Ontvangstvenster"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Ontvangstvenster weergeven"
+
+#~ msgid "Always"
+#~ msgstr "Altijd"
+
+#~ msgid "Never"
+#~ msgstr "Nooit"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Geen foutmelding geven bij ontvangstfout"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Ontvangstvenster sluiten wanneer het klaar is."
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Sneltoetsen instellen..."
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Externe opdrachten (%s is het bestand / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Webbrowser"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
+
+#~ msgid "On exit"
+#~ msgstr "Afsluiten"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Bevestigen bij het afsluiten"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Prullenbak leegmaken bij het afsluiten"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Bevestigen bij het legen"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "afgekorte dag van de week"
+
+#~ msgid "the full weekday name"
+#~ msgstr "volledige dag van de week"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "afgekorte naam van de maand"
+
+#~ msgid "the full month name"
+#~ msgstr "volledig naam van de maand"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "de voorkeurs datum en tijd voor de huidige locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "eeuwnummer (jaar/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "dag van de maand als decimaal nummer"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "het uur als decimaal nummer op een 24 uurs klok"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "het uur als decimaal nummer op een 12-uurs klok"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "dag van het jaar als decimaal nummer"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "de maand als decimaal nummer"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "de minuut als decimaal nummer"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM of PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "de seconde als decimaal nummer"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "de dag van de week als decimaal nummer"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "de voorkeursdatum voor de huidige locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "de laatste twee cijfers van het jaartal"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "het jaartal als decimaal nummer"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "de tijdzone of naam of afkorting"
+
+#~ msgid "Specifier"
+#~ msgstr "Selecteer"
+
+#~ msgid "Description"
+#~ msgstr "Beschrijving"
+
+#~ msgid "Example"
+#~ msgstr "Voorbeeld"
+
+#~ msgid "Set message colors"
+#~ msgstr "Berichtkleuren instellen"
+
+#~ msgid "Colors"
+#~ msgstr "Kleuren"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Geciteerde tekst - eerste niveau"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Geciteerde tekst - tweede niveau"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Geciteerde tekst - derde niveau"
+
+#~ msgid "URI link"
+#~ msgstr "URI link"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Gebruikte kleuren opnieuw gebruiken"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Selecteer kleur voor niveau 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Selecteer kleur voor niveau 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Selecteer kleur voor niveau 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Selecteer kleur voor URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Beschrijving der symbolen"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Datum\n"
+#~ "Afzender\n"
+#~ "Volledige naam van de afzender\n"
+#~ "Voornaam van de afzender\n"
+#~ "Initiaal van de afzender\n"
+#~ "Onderwerp\n"
+#~ "Aan\n"
+#~ "Cc\n"
+#~ "Nieuwsgroepen\n"
+#~ "Bericht-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Als x ingesteld is, expr weergeven"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Berichtinhoud\n"
+#~ "Geciteerde berichtinhoud\n"
+#~ "Berichtinhoud zonder handtekening\n"
+#~ "Geciteerde berichtinhoud zonder handtekening\n"
+#~ "Letterlijk %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Letterlijke backslash\n"
+#~ "Letterlijk vraagteken\n"
+#~ "Letterlijk haakje openen\n"
+#~ "Letterlijk haakje sluiten"
+
+#~ msgid "Key bindings"
+#~ msgstr "Sneltoetsen"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Kies de vooringestelde sneltoetsbindingen.\n"
+#~ "U kunt ook de sneltoetsen van de menu's aanpassen door\n"
+#~ "op de gewenste toetscombinatie te drukken wanneer de\n"
+#~ "muis boven het menu item zweeft."
+
+#~ msgid "Default"
+#~ msgstr "Standaard"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Oude Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Lettertype"
 
@@ -6745,9 +6431,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Widgets worden aangemaakt..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Bericht %s%c%d wordt verplaatst naar %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tBerichten worden gemarkeerd..."
 
diff --git a/po/pl.po b/po/pl.po
index d141266d..71eac96a 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -11,13 +11,398 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Odczyt ustawień wszystkich kont...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "błąd podczas zapisu konfiguracji do pliku\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr ""
+"Połączenie IMAP4 z %s zostało przerwane. Ponowne nawiązywanie połączenia...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Katalog serwera IMAP4."
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "tworzenie połączenia IMAP4 do %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Nie można uruchomić sesji TLS\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Wysyłanie wiadomości (%d / %d)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Pobieranie wiadomości z %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "nie można ustawić flag skasowany: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "nie można zlikwidować\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Pobieranie wiadomości z %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "nie można ustawić flagi skasowany: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "nie można zamknąć katalogu\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "brak głównego katalogu %s\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "nie można utworzyć \"%s\"\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "nie można utworzyć \"%s\" w INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "nie można utworzyć skrzynki\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "nie można zmienić nazwy skrzynki: %s na %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "nie można skasować skrzynki\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "nie można pobrać koperty\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Wysyłanie wiadomości (%d / %d)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "wystąpił błąd podczas pobierania koperty.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "nie można przetworzyć koperty: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Nie można nawiązać połączenia z serwerem IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "nie można pobrać przestrzeni nazw\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "nie można wybrać katalogu: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "Błąd uwierzytelniania IMAP4.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Nie można zalogować się do serwera IMAP4.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "nie można dołączyć %s do %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(wysyłanie pliku...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "nie można dołączyć wiadomości do %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "nie można skopiować %s do %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "nie można skopiować wiadomości %s do %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Nie można otworzyć pliku zaznaczeń.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Ostatni numer w katalogu %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Plik \"%s\" już istnieje.\n"
+"Nie można utworzyć katalogu."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "tworzenie połączenia NNTP z %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr ""
+"Połączenie NNTP %s:%d zostało zerwane. Ponowne nawiązywanie połączenia...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "artykuł %d został już zapamiętany.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "pobieranie artykułu %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "nie można odczytać artykułu %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "nie można pobrać listy grup news\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "nie można wysłać artykułu.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "nie można odebrać artykułu %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "nie można wybrać grupy: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "niepoprawny zakres artykułu: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "brak nowych artykułów.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "pobieranie xover %d - %d w %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "nie można pobrać xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "błąd podczas pobierania xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "niepoprawna linia xover: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "nie można pobrać xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "błąd podczas pobierania xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "błąd protokołu: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "błąd protokołu\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Wystąpił błąd podczas publikowania\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Błąd podczas wysyłania polecenia\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Przy powitaniu zabrakło wymaganego znacznika czasowego APOP\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Błąd składni przy znaczniku czasowym powitania\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Błąd protokołu POP3\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "niepoprawna linia xover: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Usuwanie przestarzałej wiadomości %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Pomijanie wiadomości %d (%d bajtów)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "skrzynka jest zablokowana\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "przekroczenie czasu sesji\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "nie można uruchomić sesji TLS\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "wystąpił błąd podczas uwierzytelniania\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "nieobsługiwane polecenie\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "wystąpił błąd podczas sesji POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -27,6 +412,53 @@ msgstr "Znaleziono: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracja zapisana.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Niechciana poczta"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "nie można otworzyć pliku zaznaczeń\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "nie można pobrać wiadomości %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Nie mogę pobrać części tekstu\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "błąd podczas odbierania danych.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Nie można zapisać do pliku.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH niedostępna\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "nieprawidłowa odpowiedź SMTP\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "wystąpił błąd w sesji SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 niedostępny\n"
@@ -161,77 +593,6 @@ msgstr ""
 "Licencji Publicznej GNU (GNU General Public License);jeśli nie - napisz do "
 "Free Software Foundation, Inc., 675 Mass Ave,Cambridge, MA 02139, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Odczyt ustawień wszystkich kont...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Niektóre okna edycji są otwarte.\n"
-"Zamknij wszystkie okna edycji przed zmianami konta."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Otwieranie okna edycji konta...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Tworzenie okna edycji konta...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Edycja kont"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nowe wiadomości zostaną sprawdzone w tej kolejności. Zaznacz\n"
-"w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nazwa"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokół"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Serwer"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Edycja"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Ustaw jako podstawowe konto "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Czy naprawdę chcesz usunąć konto '%s'?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(Nienazwany)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Usuń konto"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -331,6 +692,14 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nazwa"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -345,8 +714,8 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Plik"
 
@@ -367,9 +736,9 @@ msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _Serwer"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
@@ -385,7 +754,7 @@ msgstr "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
@@ -417,8 +786,8 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
@@ -426,13 +795,13 @@ msgstr "/_Narzędzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
@@ -449,17 +818,17 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Edycja"
 
@@ -471,7 +840,7 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -481,14 +850,14 @@ msgstr "Nazwa:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Usuń"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -499,11 +868,11 @@ msgid "Lookup"
 msgstr "Wyszukaj"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Kopia:"
 
@@ -530,7 +899,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -644,7 +1013,7 @@ msgstr "Błąd konwersji książki adresowej"
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interfejs"
 
@@ -664,8 +1033,7 @@ msgstr "Adres e-mail"
 msgid "Group"
 msgstr "Grupa"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Katalog"
 
@@ -689,15 +1057,15 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Notatka"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Błąd"
 
@@ -752,8 +1120,8 @@ msgstr "/Dod_aj..."
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
@@ -793,8 +1161,8 @@ msgstr "/_Edycja/_Cofnij"
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
@@ -802,7 +1170,7 @@ msgstr "/_Edycja/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
@@ -814,7 +1182,7 @@ msgstr "/_Edycja/_Wstaw"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
@@ -830,7 +1198,7 @@ msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Widok"
@@ -852,9 +1220,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
@@ -870,7 +1238,7 @@ msgstr "/_Widok/_Linijka"
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
@@ -881,103 +1249,103 @@ msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
@@ -985,14 +1353,14 @@ msgstr "/_Narzędzia/_Książka adresowa"
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
@@ -1013,10 +1381,6 @@ msgstr "/_Narzędzia/Szyfrowani_e GPG"
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Nie mogę pobrać części tekstu\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
@@ -1093,7 +1457,7 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
@@ -1183,8 +1547,7 @@ msgstr "typ MIME"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Wyślij"
 
@@ -1224,8 +1587,7 @@ msgstr "Dołącz"
 msgid "Attach file"
 msgstr "Dołącz plik"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1233,7 +1595,7 @@ msgstr "Podpis"
 msgid "Insert signature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Edytor"
 
@@ -1429,7 +1791,7 @@ msgstr "Zmień"
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Wartość"
 
@@ -1462,7 +1824,6 @@ msgid " Check File "
 msgstr " Sprawdź plik"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Plik"
 
@@ -1518,12 +1879,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -1540,7 +1901,7 @@ msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1604,7 +1965,7 @@ msgstr "Opóźnienie (sek)"
 msgid "Maximum Entries"
 msgstr "Maksymalna ilość pozycji"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -1661,7 +2022,6 @@ msgid "Exporting file:"
 msgstr "Eksportowanie pliku:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Wybierz... "
 
@@ -1685,161 +2045,161 @@ msgstr "Czy nadpisać istniejący plik?"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Utwórz _nowy katalog..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Usuń katalog"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Opróżnij śmie_tnik"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Sprawdź nowe wiadomoś_ci"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Odbuduj drz_ewo katalogów"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Wy_szukaj wiadomości..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Pobierz"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Subskrybuj grupę news..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Usuń g_rupę news"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalogów...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1849,21 +2209,21 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1874,21 +2234,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1897,34 +2257,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -1985,7 +2345,7 @@ msgstr "pobrano %d grup dyskusyjnych (%s przeczytano)"
 msgid "Newsgroups:"
 msgstr "Grupy dyskusyjne:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Temat:"
 
@@ -2009,161 +2369,6 @@ msgstr "Tworzenie widoku obrazu...\n"
 msgid "Can't load the image."
 msgstr "Nie można załadować obrazu."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr ""
-"Połączenie IMAP4 z %s zostało przerwane. Ponowne nawiązywanie połączenia...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Katalog serwera IMAP4."
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "tworzenie połączenia IMAP4 do %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Nie można uruchomić sesji TLS\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "nie można ustawić flag skasowany: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "nie można zlikwidować\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "nie można ustawić flagi skasowany: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "nie można zamknąć katalogu\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "brak głównego katalogu %s\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "nie można utworzyć \"%s\"\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "nie można utworzyć \"%s\" w INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "nie można utworzyć skrzynki\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "nie można zmienić nazwy skrzynki: %s na %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "nie można skasować skrzynki\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "nie można pobrać koperty\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "wystąpił błąd podczas pobierania koperty.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "nie można przetworzyć koperty: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Nie można nawiązać połączenia z serwerem IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "nie można pobrać przestrzeni nazw\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "nie można wybrać katalogu: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "Błąd uwierzytelniania IMAP4.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Nie można zalogować się do serwera IMAP4.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "nie można dołączyć %s do %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(wysyłanie pliku...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "nie można dołączyć wiadomości do %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "nie można skopiować %s do %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importuj"
@@ -2261,7 +2466,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Następna"
 
@@ -2277,143 +2482,143 @@ msgstr "Atrybuty"
 msgid "Finish"
 msgstr "Koniec"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Dawny Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Gotowe (brak nowych wiadomości)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2422,28 +2627,28 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2452,11 +2657,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2465,15 +2670,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -2491,29 +2696,20 @@ msgstr "Wprowadź hasło"
 msgid "Protocol log"
 msgstr "Dziennik protokołu"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Plik \"%s\" już istnieje.\n"
-"Nie można utworzyć katalogu."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "Bibltioteka glib nie obsługuje wywołania g_thread.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2523,23 +2719,23 @@ msgstr ""
 "                         otwiera okno tworzenia wiadomości z plikami,\n"
 "                         które mają zostać dołączone"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomości"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła wszystkie skolejkowane wiadomości"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalog]...    pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2547,25 +2743,25 @@ msgstr ""
 "  --status-full [katalog]...\n"
 "                         pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debugowania"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wyświetla tę pomoc i wychodzi"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version              wyświetla informację o wersji i kończy działanie"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Kodowanie wyjściowe"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2579,19 +2775,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Tworzenie nowej wiadomości. Czy zakończyć?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Skolejkowane wiadomości"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2600,635 +2796,635 @@ msgstr ""
 "wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Utwórz _nowy katalog..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuń kata_log"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Plik/S_krzynka"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Plik/S_krzynka/Dod_aj skrzynkę..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Usuń _skrzynkę"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Plik/S_krzynka/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Plik/S_krzynka/Sprawdź nowe wiadomoś_ci"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Plik/S_krzynka/Sprawdź wiadomoś_ci we wszystkich skrzynkach"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Plik/S_krzynka/Odbuduj drz_ewo katalogów"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Plik/_Importuj plik mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Plik/Opróżnij śmie_tnik"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Plik/Praca _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Plik/_Koniec"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/Wybierz wą_tek"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/Zna_jdź w bieżącej wiadomości..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edycja/Wy_szukaj wiadomości..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Wyświetl lub _ukryj"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Drzewo katalogów"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Wyświetl lub _ukryj/Widok wiado_mości"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/I_kony i tekst"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Żade_n"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielkości"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg _kolorów etykiet"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczeń"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Widok/_Sortuj/wg _nieprzeczytanych"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_ałączników"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosnąco"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malejąco"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/_Grupuj wg tematu"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Widok/Widok wą_tków"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/_Rozwiń wszystkie wątki"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Widok/Ustaw wyświetlane _elementy..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Widok/_Idź do"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/_Idź do/_Następna wiadomość"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/_Idź do/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/_Idź do/Poprzednia niep_rzeczytana wiadomość"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/_Idź do/Następna ni_eprzeczytana wiadomość"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/_Idź do/_Następna nowa wiadomość"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/_Idź do/Poprzednia zaznaczona wiado_mość"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/_Idź do/Następna z_aznaczona wiadomość"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/_Idź do/_Poprzednia etykietowana wiadomość"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Widok/Pokaż wszystkie na_główki"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Zmiana typu rozdzielania okna z %d na %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3238,16 +3434,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3257,150 +3453,149 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
@@ -3518,32 +3713,32 @@ msgstr "Osiągnięto koniec wiadomości; czy kontynuować od początku?"
 msgid "Search finished"
 msgstr "Przeszukiwanie zakończone"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Tworzenie widoku wiadomości...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Załączniki"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3552,7 +3747,7 @@ msgstr ""
 "Podaj polecenie wydruku:\n"
 "(\"%s\" zostanie zastąpione nazwą pliku)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3561,41 +3756,6 @@ msgstr ""
 "Błędne polecenie wydruku:\n"
 "\"%s\""
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "nie można skopiować wiadomości %s do %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Nie można otworzyć pliku zaznaczeń.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Ostatni numer w katalogu %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Otwórz"
@@ -3679,116 +3839,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Niepoprawne polecenie podglądu MIME: '%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "tworzenie połączenia NNTP z %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr ""
-"Połączenie NNTP %s:%d zostało zerwane. Ponowne nawiązywanie połączenia...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "artykuł %d został już zapamiętany.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "pobieranie artykułu %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "nie można odczytać artykułu %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "nie można pobrać listy grup news\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "nie można wysłać artykułu.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "nie można odebrać artykułu %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "nie można wybrać grupy: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "niepoprawny zakres artykułu: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "brak nowych artykułów.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "pobieranie xover %d - %d w %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "nie można pobrać xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "błąd podczas pobierania xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "niepoprawna linia xover: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "nie można pobrać xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "błąd podczas pobierania xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "błąd protokołu: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "błąd protokołu\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Wystąpił błąd podczas publikowania\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Błąd podczas wysyłania polecenia\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Hasło"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[ brak identyfikatora ]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3801,7 +3860,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3809,453 +3868,6 @@ msgstr ""
 "Niewłaściwe hasło! Spróbuj ponownie...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Przy powitaniu zabrakło wymaganego znacznika czasowego APOP\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Błąd składni przy znaczniku czasowym powitania\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Błąd protokołu POP3\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "niepoprawna linia xover: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Usuwanie przestarzałej wiadomości %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Pomijanie wiadomości %d (%d bajtów)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "skrzynka jest zablokowana\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "przekroczenie czasu sesji\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "nie można uruchomić sesji TLS\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "wystąpił błąd podczas uwierzytelniania\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "nieobsługiwane polecenie\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "wystąpił błąd podczas sesji POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Otwieranie okna preferencji konta...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Konto%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Preferencje nowego konta"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Preferencje konta"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Tworzenie okna preferencji okna...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Odbieranie"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Prywatność"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Nazwa tego konta"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Ustaw jako domyślne"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Informacje osobiste"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Pełna nazwa"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Adres e-mail"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizacja"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informacje o serwerze"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Żaden (lokalnie)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Ten serwer wymaga autoryzacji"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Serwer news"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Serwer dla odbioru"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Serwer SMTP (dla wysyłania)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Identyfikator użytkownika"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Hasło"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Użyj bezpiecznej autentykacji (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Usuwanie wiadomości z serwera po odebraniu"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Usuwanie po"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dniach"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dni: usuwa natychmiast)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Pobieranie wszystkich wiadomości z serwera"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Ograniczenie wielkości pobierania"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrowanie wiadomości podczas odbierania"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Domyślny inbox"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Sposób uwierzytelniania"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatycznie"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "News"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maksymalna liczba pobieranych artykułów\n"
-"(bez ograniczeń - 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Nie podano odbiorcy."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "\"Odbierz wszystkie\" sprawdza pocztę dla tego konta"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Nagłówek"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Dodawanie pola Data do nagłówka"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generowanie identyrikatora wiadomości"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr "Edycja..."
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Uwierzytelnianie"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Jeśli te pola pozostaną puste, użyty zostanie ten sam login i hasło, co przy "
-"odbieraniu."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Wyjście polecenia"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Automatyczne ustawianie następujących adresów"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Kopia"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Ukryta kopia"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Adres zwrotny"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Domyślnie podpisywanie wiadomości"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Domyślnie szyfrowanie wiadomości"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Używanie formatu ASCII-armored dla szyfrowania"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Wstawianie podpisu czystym tekstem"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Klucz"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Używanie standardowego klucza GnuPG"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Wybieranie klucz poprzez swój adres e-mail"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Ręczne określanie klucza"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Użytkownik lub klucz ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Nie korzystanie z SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Używanie SSL dla połączeń POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Używanie polecenia STARTTLS by rozpocząć sesję SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Używanie SSL dla połączeń IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Używanie SSL dla połączeń NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Wysyłanie (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Używanie SSL dla połączeń SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Używanie nieblokującego SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(Wyłącz to, jeśli masz problemy z połączeniem SSL)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Określ port SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Określ port POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Określ port IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Określ port NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Określ nazwę domeny"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Katalog serwera IMAP4."
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Zapisywanie wysłanych wiadomości do"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Zapisywanie szablonów wiadomości do"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Zapisywanie usuniętych wiadomości do"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Nie określono nazwy konta."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Nie określono adresu e-mail."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Nie określono serwera SMTP."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Nie określono ID użytkownika."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Nie określono serwera POP3."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Nie określono serwera IMAP4."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Nie określono serwera NNTP."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Nie zaleca się używania starego stylu trybu ASCII-armored\n"
-"dla kodowanych wiadomości. Nie jest to zgodne z RFC 3156\n"
-"- Bezpieczeństwo MIME z OpenPGP"
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Ustawienia akcji"
@@ -4320,17 +3932,17 @@ msgstr " Pomoc składni "
 msgid "Registered actions"
 msgstr "Zarejestrowane polecenia"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "W górę"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "W dół"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nowy)"
 
@@ -4373,820 +3985,31 @@ msgstr "Usuń polecenie"
 msgid "Do you really want to delete this action?"
 msgstr "Czy naprawdę usunąć to polecenie?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Niechciana poczta"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Tworzenie okna preferencji...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Preferencje"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Cytat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Wyświetlanie"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Wiadomość"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Niechciana poczta"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Inne"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Użycie zewnętrznego programu do odbierania poczty"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Polecenie"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Odbierz z kolejki"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrowanie przy odbieraniu"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Ścieżka do kolejki"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Automatyczne sprawdzanie poczty"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "każde"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuta(y)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Sprawdzanie poczty przy uruchamianiu programu"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Aktualizacja wszystkich lokalnych katalogów po odebraniu"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Używanie zewnętrznego programu do wysyłania"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Zapisywanie wysłanych wiadomości do Poczta wysłana"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Kodowanie wyjściowe"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatyczne (Zalecane)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7-bitowe ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unikod (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Europa Zachodnia (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Europa Zachodnia (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Europa Śodkowa (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Bałtyckie (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Bałtyckie (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Greckie (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Hebrajskie (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebrajskie (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Tureckie (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrylica (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrylica (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cyrylica (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrylica (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japońskie (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japońskie (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japońskie (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Uproszczone Chińskie (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Uproszczone Chińskie (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradycyjne Chińskie (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradycyjne Chińskie (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chińskie (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Koreańskie (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tajskie (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tajskie (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Jeśli wybrano `Automatyczne', zostanie użyte kodowanie optymalne dla "
-"bieżących ustawień lokalnych."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Kodowanie przesyłanych danych"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr "Wybierz kodowanie dla listów, których treść zawiera znaki nie-ASCII."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Oddzielenie podpisu"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Automatyczne wstawianie podpisu"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Automatyczne uruchamianie zewnętrznego edytora"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Poziom Cofnij"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Zawijaj wiadomości przy"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "znakach"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Zawijanie cytatu"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Zawijanie podczas wprowadzania"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Zawijanie przed wysłaniem"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Automatyczne ustawianie konta dla odpowiedzi"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Cytowanie wiadomości przy odpowiedzi"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Przycisk Odpowiedz wysyła odpowiedź na listę dyskusyjną"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Format odpowiedzi"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Znak cytowania"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Format przekazywania"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Opis symboli "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Czcionka"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Tłumaczenie nazwy nagłówka (jak np. 'Od:', 'Temat:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Skracanie nazwy grup dłuższych niż "
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "liter"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Widok listy wiadomości"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Wyświetlanie odbiorcy w kolumnie \"Od\" gdy użytkownik jest nadawcą"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Rozwijanie wątków"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Format daty"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Ustaw element wyświetlania podsumowania... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Włączenie kolorowania wiadomości"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "Wyświetlanie znaków wielobajtowych jako ASCII (tylko japoński)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Wyświetlanie panelu nagłówków ponad oknem wiadomości"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Wyświetlanie krótkich nagłówków w widoku wiadomości"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "Wyświetlanie wiadomości HTML jako teskt"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Pokaż kursor w widoku wiadomości"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Odstęp międzywierszowy"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "piksel(e)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Przewijanie"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Pół strony"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Wygładzone przewijanie"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Krok"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Dopasuj rozmiar załączonych obrazków do rozmiaru okna"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Pokaż grafikę w treści"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr ""
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr ""
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "katalog:"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrowanie wiadomości podczas odbierania"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automatyczne sprawdzanie podpisów"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Wyświetlanie wyniku sprawdzania podpisu w oknie komunikatów"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Tymczasowe zapamiętywanie hasła w pamięci"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Wygasa po"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minuta(y)"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "Wartość '0' ustawi zapamiętywanie hasła na czas całej sesji."
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Przechwytywanie wejścia podczas wprowadzania hasła"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Wyświetlanie ostrzeżenia przy uruchamianiu gdy nie działa GnuPG"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Zawsze otwieraj wiadomości gdy wybrano widok podsumowania."
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr ""
-"Otwieranie pierwszej nieprzeczytanej wiadomości przy wchodzeniu do katalogu"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr ""
-"Zaznaczanie wiadomości jako odczytanych tylko po otwarciu w nowym oknie"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Przechodzenie do Poczty przychodzącej po odbiorze poczty"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"Gdy opcja ta jest wyłączona, wiadomości pozostaną zaznaczone do aż do "
-"momentu wykonania."
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Okno dialogowe odbierania"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Wyświetlanie okna dialogowego odbierania"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Zawsze"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Tylko przy ręcznym odbieraniu"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nigdy"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Okno błędu pobierania wiadomości nie jest wyświetlane"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Zamykanie okna dialogowego odbierania po zakończeniu"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Ustaw dowiązania klawiszy... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Polecenia zewnętrzne  (%s zostanie zastąpione nazwą pliku / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Przeglądarka Web"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Dodawanie adresu do docelowego po dwukrotnym kliknięciu"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Podczas wyjścia"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Potwierdzanie zamykania programu"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Opróżnianie śmietnika przy zamykaniu programu"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Wyświetlanie pytania przed opróżnieniem"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Ostrzeganie jeśli są wiadomości w kolejce"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Zapisywanie cache podsumowania (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Limit czasu gniazda I/O:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "sekund(y)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "skrócona nazwa dnia tygodnia"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "pełna nazwa dnia tygodnia"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "skrócona nazwa miesiąca"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "pełna nazwa miesiąca"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "preferowana data i czas dla ustawień lokalnych"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "numer roku (rok/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "dzień miesiąca jako liczba dziesiętna"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "godzina jako liczba dziesiętna z użyciem czasu 24-ro godzinnego"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "godzina jako liczba dziesiętna z użyciem czasu 12-to godzinnego"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "dzień roku jako liczba dziesiętna"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "miesiąc jako liczba dziesiętna"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minuta jako liczba dziesiętna"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "albo AM albo PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekunda jako liczba dziesiętna"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "dzień tygodnia jako liczba dziesiętna"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "preferowana data dla ustawień lokalnych"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "ostatnie dwie cyfry roku"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "rok jako liczba dziesiętna"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "strefa czasowa jako nazwa lub skrót"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Wyszczególniacz"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Opis"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Przykład"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Ustaw kolory wiadomości"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Kolory"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Cytowany tekst - poziom pierwszy"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Cytowany tekst - poziom drugi"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Cytowany tekst - poziom trzeci"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Łącze URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Powtarzanie kolorów cytowania"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Wybierz kolor dla drugiego poziomu cytowania"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Wybierz kolor dla URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Opis symboli"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Data\n"
-"Od\n"
-"Pełna nazwa nadawcy\n"
-"Imię nadawcy\n"
-"Inicjał nadawcy\n"
-"Temat\n"
-"Do\n"
-"Kopia\n"
-"Grupy news\n"
-"ID wiadomości"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Wyświetla expr jeśli ustawiono x"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Ciało wiadomości\n"
-"Ciało cytowanej wiadomości\n"
-"Ciało wiadomości bez sygnatury\n"
-"Ciało cytowanej wiadomości bez sygnatury\n"
-"Literalny %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Literalny backslash\n"
-"Literalny znak zapytania\n"
-"Literalny nawias klamrowy otwierający\n"
-"Literalny nawias klamrowy zamykający"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Dowiązania klawiszy"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Wybierz ustawienia dowiązań klawiszy.\n"
-"Można również zmienić każdy skrót klawiaturowy w menu\n"
-"naciskając klawisze gdy kursor myszy znajduje się nad elementem."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Domyślny"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Dawny Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Ustawienia nagłówka użytkownika"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Nagłówek"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Usuń "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Nagłówki użytkownika"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Brak nazwy nagłówka."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Usuń nagłówek"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Czy naprawdę chcesz usunąć ten nagłówek?"
 
@@ -5234,12 +4057,20 @@ msgstr "Reguły filtrowania"
 msgid "Enabled"
 msgstr "Aktywna"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Edycja"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naprawdę chcesz usunąć regułkę '%s'?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(Nienazwany)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Usuń regułę"
 
@@ -5323,6 +4154,10 @@ msgstr "dłuższe niż"
 msgid "is shorter than"
 msgstr "krótsze niż"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Przenieś do"
@@ -5446,6 +4281,10 @@ msgstr "Usuń [...] lub (...) z początku tematu przy odpowiedzi"
 msgid "Apply to subfolders"
 msgstr "Stosowane także do podkatalogów"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Automatyczne ustawianie następujących adresów"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "użycie także przy odpowiadaniu"
@@ -5519,64 +4358,46 @@ msgstr "Wyświetlone elementy"
 msgid " Revert to default "
 msgstr " Przywróć domyślne "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Nazwa szablonu"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Zastąp "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Symbole "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Zarejestrowane szablony"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Szablony"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Szablon"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Błąd formatu szablonu."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Usuń szablon"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Czy naprawdę chcesz usunąć ten szablon?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "nie można otworzyć pliku zaznaczeń\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "nie można pobrać wiadomości %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Tworzenie dialogu postępu...\n"
@@ -5585,29 +4406,21 @@ msgstr "Tworzenie dialogu postępu...\n"
 msgid "Status"
 msgstr "Stan"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "błąd podczas odbierania danych.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Nie można zapisać do pliku.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Nie można znaleźć ID użykownika dla tego klucza"
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpis wykonano %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Błąd podczas sprawdzania podpisu"
 
@@ -5633,6 +4446,10 @@ msgstr "ID klucza"
 msgid "Val"
 msgstr "Wartość"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Inne"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj klucz"
@@ -5653,84 +4470,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Uszkodzony nagłówek wiadomości w kolejce.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Wysyłanie wiadomości z użyciem polecenia: %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Nie można wykonać polecenia: %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Błąd podczas wykonywania polecenia: %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Podłączanie"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Łączenie z serwerem SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Wysyłanie HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Uwierzytelnianie"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Wysyłanie wiadomości..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Wysyłanie EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Wysyłanie MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Wysyłanie"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Wysyłanie RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Wysyłanie DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Wysyłanie wiadomości"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Błąd podczas wysyłania wiadomości."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5830,32 +4647,20 @@ msgstr "ZŁY podpis"
 msgid "No public key to verify the signature"
 msgstr "Brak klucza publicznego dla sprawdzenia podpisu"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH niedostępna\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "nieprawidłowa odpowiedź SMTP\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "wystąpił błąd w sesji SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Tworzenie okna źródła...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Źródło wiadomości"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Wyświetlanie źródła %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Źródło"
@@ -6264,6 +5069,907 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Niektóre okna edycji są otwarte.\n"
+#~ "Zamknij wszystkie okna edycji przed zmianami konta."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Otwieranie okna edycji konta...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Tworzenie okna edycji konta...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Edycja kont"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nowe wiadomości zostaną sprawdzone w tej kolejności. Zaznacz\n"
+#~ "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
+
+#~ msgid "Protocol"
+#~ msgstr "Protokół"
+
+#~ msgid "Server"
+#~ msgstr "Serwer"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Ustaw jako podstawowe konto "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Czy naprawdę chcesz usunąć konto '%s'?"
+
+#~ msgid "Delete account"
+#~ msgstr "Usuń konto"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Otwieranie okna preferencji konta...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Konto%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Preferencje nowego konta"
+
+#~ msgid "Account preferences"
+#~ msgstr "Preferencje konta"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Tworzenie okna preferencji okna...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Odbieranie"
+
+#~ msgid "Privacy"
+#~ msgstr "Prywatność"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Zaawansowane"
+
+#~ msgid "Name of this account"
+#~ msgstr "Nazwa tego konta"
+
+#~ msgid "Set as default"
+#~ msgstr "Ustaw jako domyślne"
+
+#~ msgid "Personal information"
+#~ msgstr "Informacje osobiste"
+
+#~ msgid "Full name"
+#~ msgstr "Pełna nazwa"
+
+#~ msgid "Mail address"
+#~ msgstr "Adres e-mail"
+
+#~ msgid "Organization"
+#~ msgstr "Organizacja"
+
+#~ msgid "Server information"
+#~ msgstr "Informacje o serwerze"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Żaden (lokalnie)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Ten serwer wymaga autoryzacji"
+
+#~ msgid "News server"
+#~ msgstr "Serwer news"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Serwer dla odbioru"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Serwer SMTP (dla wysyłania)"
+
+#~ msgid "User ID"
+#~ msgstr "Identyfikator użytkownika"
+
+#~ msgid "Password"
+#~ msgstr "Hasło"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Użyj bezpiecznej autentykacji (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Usuwanie wiadomości z serwera po odebraniu"
+
+#~ msgid "Remove after"
+#~ msgstr "Usuwanie po"
+
+#~ msgid "days"
+#~ msgstr "dniach"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dni: usuwa natychmiast)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Pobieranie wszystkich wiadomości z serwera"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Ograniczenie wielkości pobierania"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrowanie wiadomości podczas odbierania"
+
+#~ msgid "Default inbox"
+#~ msgstr "Domyślny inbox"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Sposób uwierzytelniania"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatycznie"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maksymalna liczba pobieranych artykułów\n"
+#~ "(bez ograniczeń - 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Nie podano odbiorcy."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "\"Odbierz wszystkie\" sprawdza pocztę dla tego konta"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Dodawanie pola Data do nagłówka"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generowanie identyrikatora wiadomości"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
+
+#~ msgid " Edit... "
+#~ msgstr "Edycja..."
+
+#~ msgid "Authentication"
+#~ msgstr "Uwierzytelnianie"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Jeśli te pola pozostaną puste, użyty zostanie ten sam login i hasło, co "
+#~ "przy odbieraniu."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
+
+#~ msgid "Command output"
+#~ msgstr "Wyjście polecenia"
+
+#~ msgid "Cc"
+#~ msgstr "Kopia"
+
+#~ msgid "Bcc"
+#~ msgstr "Ukryta kopia"
+
+#~ msgid "Reply-To"
+#~ msgstr "Adres zwrotny"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Domyślnie podpisywanie wiadomości"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Domyślnie szyfrowanie wiadomości"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Używanie formatu ASCII-armored dla szyfrowania"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Wstawianie podpisu czystym tekstem"
+
+#~ msgid "Sign key"
+#~ msgstr "Klucz"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Używanie standardowego klucza GnuPG"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Wybieranie klucz poprzez swój adres e-mail"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Ręczne określanie klucza"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Użytkownik lub klucz ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Nie korzystanie z SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Używanie SSL dla połączeń POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Używanie polecenia STARTTLS by rozpocząć sesję SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Używanie SSL dla połączeń IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Używanie SSL dla połączeń NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Wysyłanie (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Używanie SSL dla połączeń SMTP"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Używanie nieblokującego SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(Wyłącz to, jeśli masz problemy z połączeniem SSL)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Określ port SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Określ port POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Określ port IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Określ port NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Określ nazwę domeny"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Katalog serwera IMAP4."
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Zapisywanie wysłanych wiadomości do"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Zapisywanie szablonów wiadomości do"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Zapisywanie usuniętych wiadomości do"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Nie określono nazwy konta."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Nie określono adresu e-mail."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Nie określono serwera SMTP."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Nie określono ID użytkownika."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Nie określono serwera POP3."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Nie określono serwera IMAP4."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Nie określono serwera NNTP."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Nie zaleca się używania starego stylu trybu ASCII-armored\n"
+#~ "dla kodowanych wiadomości. Nie jest to zgodne z RFC 3156\n"
+#~ "- Bezpieczeństwo MIME z OpenPGP"
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Tworzenie okna preferencji...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Preferencje"
+
+#~ msgid "Quote"
+#~ msgstr "Cytat"
+
+#~ msgid "Display"
+#~ msgstr "Wyświetlanie"
+
+#~ msgid "Message"
+#~ msgstr "Wiadomość"
+
+#~ msgid "Junk mail"
+#~ msgstr "Niechciana poczta"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Użycie zewnętrznego programu do odbierania poczty"
+
+#~ msgid "Command"
+#~ msgstr "Polecenie"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Odbierz z kolejki"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrowanie przy odbieraniu"
+
+#~ msgid "Spool path"
+#~ msgstr "Ścieżka do kolejki"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Automatyczne sprawdzanie poczty"
+
+#~ msgid "every"
+#~ msgstr "każde"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuta(y)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Sprawdzanie poczty przy uruchamianiu programu"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Aktualizacja wszystkich lokalnych katalogów po odebraniu"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr ""
+#~ "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Używanie zewnętrznego programu do wysyłania"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Zapisywanie wysłanych wiadomości do Poczta wysłana"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Kodowanie wyjściowe"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatyczne (Zalecane)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7-bitowe ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unikod (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Europa Zachodnia (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Europa Zachodnia (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Europa Śodkowa (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Bałtyckie (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Bałtyckie (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Greckie (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Hebrajskie (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Hebrajskie (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Tureckie (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cyrylica (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cyrylica (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cyrylica (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cyrylica (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japońskie (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japońskie (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japońskie (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Uproszczone Chińskie (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Uproszczone Chińskie (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradycyjne Chińskie (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradycyjne Chińskie (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chińskie (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Koreańskie (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tajskie (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tajskie (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Jeśli wybrano `Automatyczne', zostanie użyte kodowanie optymalne dla "
+#~ "bieżących ustawień lokalnych."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Kodowanie przesyłanych danych"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Wybierz kodowanie dla listów, których treść zawiera znaki nie-ASCII."
+
+#~ msgid "Signature separator"
+#~ msgstr "Oddzielenie podpisu"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Automatyczne wstawianie podpisu"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Automatyczne uruchamianie zewnętrznego edytora"
+
+#~ msgid "Undo level"
+#~ msgstr "Poziom Cofnij"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Zawijaj wiadomości przy"
+
+#~ msgid "characters"
+#~ msgstr "znakach"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Zawijanie cytatu"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Zawijanie podczas wprowadzania"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Zawijanie przed wysłaniem"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Automatyczne ustawianie konta dla odpowiedzi"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Cytowanie wiadomości przy odpowiedzi"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Przycisk Odpowiedz wysyła odpowiedź na listę dyskusyjną"
+
+#~ msgid "Reply format"
+#~ msgstr "Format odpowiedzi"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Znak cytowania"
+
+#~ msgid "Forward format"
+#~ msgstr "Format przekazywania"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Opis symboli "
+
+#~ msgid "Font"
+#~ msgstr "Czcionka"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Tłumaczenie nazwy nagłówka (jak np. 'Od:', 'Temat:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Skracanie nazwy grup dłuższych niż "
+
+#~ msgid "letters"
+#~ msgstr "liter"
+
+#~ msgid "Summary View"
+#~ msgstr "Widok listy wiadomości"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Wyświetlanie odbiorcy w kolumnie \"Od\" gdy użytkownik jest nadawcą"
+
+#~ msgid "Expand threads"
+#~ msgstr "Rozwijanie wątków"
+
+#~ msgid "Date format"
+#~ msgstr "Format daty"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Ustaw element wyświetlania podsumowania... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Włączenie kolorowania wiadomości"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "Wyświetlanie znaków wielobajtowych jako ASCII (tylko japoński)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Wyświetlanie panelu nagłówków ponad oknem wiadomości"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Wyświetlanie krótkich nagłówków w widoku wiadomości"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "Wyświetlanie wiadomości HTML jako teskt"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Pokaż kursor w widoku wiadomości"
+
+#~ msgid "Line space"
+#~ msgstr "Odstęp międzywierszowy"
+
+#~ msgid "pixel(s)"
+#~ msgstr "piksel(e)"
+
+#~ msgid "Scroll"
+#~ msgstr "Przewijanie"
+
+#~ msgid "Half page"
+#~ msgstr "Pół strony"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Wygładzone przewijanie"
+
+#~ msgid "Step"
+#~ msgstr "Krok"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Dopasuj rozmiar załączonych obrazków do rozmiaru okna"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Pokaż grafikę w treści"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "katalog:"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrowanie wiadomości podczas odbierania"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Automatyczne sprawdzanie podpisów"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Wyświetlanie wyniku sprawdzania podpisu w oknie komunikatów"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Tymczasowe zapamiętywanie hasła w pamięci"
+
+#~ msgid "Expired after"
+#~ msgstr "Wygasa po"
+
+#~ msgid "minute(s) "
+#~ msgstr "minuta(y)"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "Wartość '0' ustawi zapamiętywanie hasła na czas całej sesji."
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Przechwytywanie wejścia podczas wprowadzania hasła"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Wyświetlanie ostrzeżenia przy uruchamianiu gdy nie działa GnuPG"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Zawsze otwieraj wiadomości gdy wybrano widok podsumowania."
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr ""
+#~ "Otwieranie pierwszej nieprzeczytanej wiadomości przy wchodzeniu do "
+#~ "katalogu"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr ""
+#~ "Zaznaczanie wiadomości jako odczytanych tylko po otwarciu w nowym oknie"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Przechodzenie do Poczty przychodzącej po odbiorze poczty"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr ""
+#~ "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "Gdy opcja ta jest wyłączona, wiadomości pozostaną zaznaczone do aż do "
+#~ "momentu wykonania."
+
+#~ msgid "Receive dialog"
+#~ msgstr "Okno dialogowe odbierania"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Wyświetlanie okna dialogowego odbierania"
+
+#~ msgid "Always"
+#~ msgstr "Zawsze"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Tylko przy ręcznym odbieraniu"
+
+#~ msgid "Never"
+#~ msgstr "Nigdy"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Okno błędu pobierania wiadomości nie jest wyświetlane"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Zamykanie okna dialogowego odbierania po zakończeniu"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Ustaw dowiązania klawiszy... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Polecenia zewnętrzne  (%s zostanie zastąpione nazwą pliku / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Przeglądarka Web"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Dodawanie adresu do docelowego po dwukrotnym kliknięciu"
+
+#~ msgid "On exit"
+#~ msgstr "Podczas wyjścia"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Potwierdzanie zamykania programu"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Opróżnianie śmietnika przy zamykaniu programu"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Wyświetlanie pytania przed opróżnieniem"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Ostrzeganie jeśli są wiadomości w kolejce"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Zapisywanie cache podsumowania (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Limit czasu gniazda I/O:"
+
+#~ msgid "second(s)"
+#~ msgstr "sekund(y)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "skrócona nazwa dnia tygodnia"
+
+#~ msgid "the full weekday name"
+#~ msgstr "pełna nazwa dnia tygodnia"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "skrócona nazwa miesiąca"
+
+#~ msgid "the full month name"
+#~ msgstr "pełna nazwa miesiąca"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "preferowana data i czas dla ustawień lokalnych"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "numer roku (rok/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "dzień miesiąca jako liczba dziesiętna"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "godzina jako liczba dziesiętna z użyciem czasu 24-ro godzinnego"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "godzina jako liczba dziesiętna z użyciem czasu 12-to godzinnego"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "dzień roku jako liczba dziesiętna"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "miesiąc jako liczba dziesiętna"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minuta jako liczba dziesiętna"
+
+#~ msgid "either AM or PM"
+#~ msgstr "albo AM albo PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekunda jako liczba dziesiętna"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "dzień tygodnia jako liczba dziesiętna"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "preferowana data dla ustawień lokalnych"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "ostatnie dwie cyfry roku"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "rok jako liczba dziesiętna"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "strefa czasowa jako nazwa lub skrót"
+
+#~ msgid "Specifier"
+#~ msgstr "Wyszczególniacz"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "Example"
+#~ msgstr "Przykład"
+
+#~ msgid "Set message colors"
+#~ msgstr "Ustaw kolory wiadomości"
+
+#~ msgid "Colors"
+#~ msgstr "Kolory"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Cytowany tekst - poziom pierwszy"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Cytowany tekst - poziom drugi"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Cytowany tekst - poziom trzeci"
+
+#~ msgid "URI link"
+#~ msgstr "Łącze URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Powtarzanie kolorów cytowania"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Wybierz kolor dla drugiego poziomu cytowania"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Wybierz kolor dla URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Opis symboli"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Data\n"
+#~ "Od\n"
+#~ "Pełna nazwa nadawcy\n"
+#~ "Imię nadawcy\n"
+#~ "Inicjał nadawcy\n"
+#~ "Temat\n"
+#~ "Do\n"
+#~ "Kopia\n"
+#~ "Grupy news\n"
+#~ "ID wiadomości"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Wyświetla expr jeśli ustawiono x"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Ciało wiadomości\n"
+#~ "Ciało cytowanej wiadomości\n"
+#~ "Ciało wiadomości bez sygnatury\n"
+#~ "Ciało cytowanej wiadomości bez sygnatury\n"
+#~ "Literalny %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Literalny backslash\n"
+#~ "Literalny znak zapytania\n"
+#~ "Literalny nawias klamrowy otwierający\n"
+#~ "Literalny nawias klamrowy zamykający"
+
+#~ msgid "Key bindings"
+#~ msgstr "Dowiązania klawiszy"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Wybierz ustawienia dowiązań klawiszy.\n"
+#~ "Można również zmienić każdy skrót klawiaturowy w menu\n"
+#~ "naciskając klawisze gdy kursor myszy znajduje się nad elementem."
+
+#~ msgid "Default"
+#~ msgstr "Domyślny"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Dawny Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Wybór czcionki"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dc742011..e4e944c8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:17+0900\n"
-"PO-Revision-Date: 2005-08-27 11:50-0300\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
+"PO-Revision-Date: 2005-09-05 17:44-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 "
@@ -17,13 +17,402 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Lendo as configurações de cada conta...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 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"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "A conexão IMAP4 com %s terminou. Reconectando...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "servidor IMAP4 desabilita LOGIN.\n"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "criando conexão IMAP4 com %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Não foi possível iniciar sessão TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Enviando mensagem (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Movendo mensagem %s%c%d para %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Copiando mensagem %s%c%d para %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Recebendo mensagens de %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "não posso marcar como apagado: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "não posso eliminar\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Recebendo mensagens de %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "não posso marcar como apagado: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "não posso fechar pasta\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "pasta raiz %s inexistente\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "erro recebendo resultados do LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Não foi possível criar '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "não foi possível criar '%s' em baixo da INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "não posso criar caixa de correio: LIST falhou\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "não posso criar caixa de correio\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "não é possível renomear caixa de correio: %s para %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "não posso apagar caixa de correio\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "Não foi possível obter o 'envelope'\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Enviando mensagem (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "Ocorreu um erro ao obter 'envelope'\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "não foi possível realizar o parse no envelope: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Não foi possível se conectar ao servidor IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Não foi possível estabelecer uma sessão IMAP4 com: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "Não foi possível obter o 'envelope'\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "não posso selecionar pasta: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "Falha na autenticação IMAP4.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Falha ao logar no servidor IMAP4.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "não foi possível copiar a mensagem %s para %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(enviando arquivo...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "não foi possível anexar a mensagem em %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "não posso copiar %s para %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "erro no comando imap: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "erro no comando imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "erro no comando imap: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "o iconv não pode converter UTF-7 para %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "o iconv não pode converter %s para UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+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:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Não foi possível abrir o arquivo de marcas.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "pastas de origem e destino são idênticas.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Copiando mensagem %s%c%d para %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Último número no diretório %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"O arquivo `%s' já existe.\n"
+"Não foi possível criar a pasta."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+"Diretório de nome\n"
+"'%s' não é uma string UTF-8 válida.\n"
+"Talvez a codificação local seja usada para o nome de arquivo.\n"
+"Se este for o caso, você deve definir a seguinte variável de ambiente\n"
+"(veja o README para detalhes):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "criando conexão NNTP com %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "A conexão NNTP com %s:%d terminou. Reconectando...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "o artigo %d já está no cache.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "obtendo artigo %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "não foi possível ler o artigo %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "não foi possível obter a lista de grupo de notícias\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "não posso postar artigo.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "não foi possível obter o artigo %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "não foi possível selecionar o grupo: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "intervalo de artigos inválido: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "não há novos artigos.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "obtendo xover %d - %d en %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "não foi possível obter xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "ocorreu um erro ao obter xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "linha xover inválida: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "não foi possível obter xover\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "ocorreu um erro ao obter xover.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+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
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "erro do protocolo: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "erro do protocolo\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Ocorreu um erro quando postando\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Erro ao enviar comando\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Timestamp APOP requerida não encontrada no greeting\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Erro de sintaxe no greeting\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Erro do protocolo POP3\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "resposta UIDL inválida: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Apagando mensagem expirada %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Pulando mensagem %d (%d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "a caixa de correio está travada\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "tempo limite da sessão\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "não foi possível iniciar sessão TLS\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "ocorreu um erro na autenticação\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "comando não suportado\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "Erro na sessão POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -33,6 +422,52 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuração salva.\n"
 
+#: libsylph/prefs_common.c:421
+msgid "Junk mail filter"
+msgstr "Filtro de spam"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "não foi possível abrir o arquivo de marcas\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "não posso obter mensagem %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Não foi possível obter o texto\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "O comando de impressão é inválido: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "ocorreu um erro enquanto os dados eram obtidos.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Não foi possível gravar no arquivo.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH não disponível\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "resposta SMTP inválida\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "erro na sessão SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 não disponível\n"
@@ -165,75 +600,6 @@ msgstr ""
 "programa; caso não, escreva para a Free Software Foundation, Inc., \n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Lendo as configurações de cada conta...\n"
-
-#: src/account.c:357
-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."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Abrindo janela de edição de conta...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Criando janela de edição de conta...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Editar contas"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
-"na coluna `G' para habilitar essa caixa no `Baixar tudo'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nome"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Servidor"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Editar"
-
-#: src/account.c:759
-msgid " _Set as default account "
-msgstr " _Marcar como conta padrão "
-
-#: src/account.c:812
-#, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Quer realmente apagar a conta '%s'?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-msgid "(Untitled)"
-msgstr "(Sem título)"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Apagar conta"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -333,6 +699,14 @@ 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:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nome"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -347,8 +721,8 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Arquivo"
 
@@ -369,9 +743,9 @@ msgid "/_File/New _Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
@@ -387,7 +761,7 @@ msgstr "/_Arquivo/_Apagar"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
@@ -419,8 +793,8 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
@@ -428,13 +802,13 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 
@@ -451,17 +825,17 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -473,7 +847,7 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -483,14 +857,14 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 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:236
+#: 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:1572
 msgid "Add"
@@ -501,11 +875,11 @@ msgid "Lookup"
 msgstr "Procurar"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -531,7 +905,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -643,7 +1017,7 @@ 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.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interface"
 
@@ -663,8 +1037,7 @@ msgstr "Endereço de e-mail"
 msgid "Group"
 msgstr "Grupo"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Pasta"
 
@@ -688,15 +1061,15 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Erro"
 
@@ -751,8 +1124,8 @@ msgstr "/_Adicionar"
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
@@ -792,8 +1165,8 @@ msgstr "/_Editar/_Desfazer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
@@ -801,7 +1174,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
@@ -813,7 +1186,7 @@ msgstr "/_Editar/Co_lar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
@@ -829,7 +1202,7 @@ msgstr "/_Editar/Quebrar todas as _linhas compridas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/E_xibir"
@@ -851,9 +1224,9 @@ msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
@@ -869,7 +1242,7 @@ msgstr "/E_xibir/_Régua"
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
@@ -880,103 +1253,103 @@ msgstr "/E_xibir/Codificação de caracteres/_Automático"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 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:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 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:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 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:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
@@ -984,14 +1357,14 @@ msgstr "/_Ferramentas/_Catálogo de endereços"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
@@ -1012,10 +1385,6 @@ msgstr "/_Ferramentas/_Encriptar (PGP)"
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Não foi possível obter o texto\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
@@ -1091,7 +1460,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:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
@@ -1185,8 +1554,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Enviar"
 
@@ -1226,8 +1594,7 @@ msgstr "Anexar"
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Assinatura"
 
@@ -1235,7 +1602,7 @@ msgstr "Assinatura"
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1427,7 +1794,7 @@ msgstr "Modificar"
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valor"
 
@@ -1460,7 +1827,6 @@ msgid " Check File "
 msgstr " Verificar Arquivo "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Arquivo"
 
@@ -1517,12 +1883,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -1539,7 +1905,7 @@ 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.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1603,7 +1969,7 @@ msgstr "Timeout (segundos)"
 msgid "Maximum Entries"
 msgstr "Máximo de Entradas"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Básicas"
 
@@ -1662,7 +2028,6 @@ msgid "Exporting file:"
 msgstr "Arquivo a exportar:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "Selecionar..."
 
@@ -1686,160 +2051,160 @@ msgstr "Sobrescrever o arquivo existente?"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 msgid "/_Move folder..."
 msgstr "/_Mover pasta..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Apagar pasta"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Esvaziar _lixeira"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/_Baixar"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Assinar grupo de notícias..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo de notícias"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Configurando informações da pasta...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A árvore de pastas será reconstruída. Continuar?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a árvore de pastas."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1849,21 +2214,21 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1876,20 +2241,20 @@ msgstr ""
 "\n"
 "Quer realmente apagar?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1898,34 +2263,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -1986,7 +2351,7 @@ msgstr "%d grupos de notícias recebidos (%s lidos)"
 msgid "Newsgroups:"
 msgstr "Grupos de notícias:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Assunto:"
 
@@ -2010,159 +2375,6 @@ msgstr "Criando visualizador de imagem...\n"
 msgid "Can't load the image."
 msgstr "Não foi possível carregar a imagem."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "A conexão IMAP4 com %s terminou. Reconectando...\n"
-
-#: src/imap.c:512 src/imap.c:518
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "servidor IMAP4 desabilita LOGIN.\n"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "criando conexão IMAP4 com %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Não foi possível iniciar sessão TLS.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "não posso marcar como apagado: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "não posso eliminar\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "não posso marcar como apagado: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "não posso fechar pasta\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "pasta raiz %s inexistente\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "erro recebendo resultados do LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Não foi possível criar '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "não foi possível criar '%s' em baixo da INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "não posso criar caixa de correio: LIST falhou\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "não posso criar caixa de correio\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "não é possível renomear caixa de correio: %s para %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "não posso apagar caixa de correio\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "Não foi possível obter o 'envelope'\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "Ocorreu um erro ao obter 'envelope'\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "não foi possível realizar o parse no envelope: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Não foi possível se conectar ao servidor IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Não foi possível estabelecer uma sessão IMAP4 com: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "Não foi possível obter o 'envelope'\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "não posso selecionar pasta: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "Falha na autenticação IMAP4.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Falha ao logar no servidor IMAP4.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "não foi possível copiar a mensagem %s para %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(enviando arquivo...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "não foi possível anexar a mensagem em %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "não posso copiar %s para %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "erro no comando imap: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "erro no comando imap: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "erro no comando imap: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "o iconv não pode converter UTF-7 para %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "o iconv não pode converter %s para UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importar"
@@ -2261,7 +2473,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Próxima"
 
@@ -2277,142 +2489,142 @@ msgstr "Atributos"
 msgid "Finish"
 msgstr "Terminar"
 
-#: src/inc.c:158
-#, fuzzy, c-format
+#: src/inc.c:157
+#, c-format
 msgid "Sylpheed: %d new messages"
-msgstr "Concluído (%d nova(s) mensagem(ns))"
+msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:162
+#: src/inc.c:161
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Concluído (%d mensagen(s) (%s) recebida(s))"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Feito (Não há mensagens novas)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 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:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recebendo (%d mensagem(ns) (%s) recebido)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2421,28 +2633,28 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2451,11 +2663,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2464,15 +2676,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
@@ -2490,29 +2702,20 @@ msgstr "Informe a senha"
 msgid "Protocol log"
 msgstr "Log do protocolo"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"O arquivo `%s' já existe.\n"
-"Não foi possível criar a pasta."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportada pela glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPÇÃO]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endreço]    abre janela de composição"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2522,23 +2725,23 @@ msgstr ""
 "                         abrir a janela de composição com os arquivos\n"
 "                         especificados anexados"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensgens"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da fila"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...   mostra o número total de mensagens"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2546,23 +2749,23 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         exibe o status de cada pasta"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo debug"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe esta ajuda e sai"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informação de versão e sai"
 
-#: src/main.c:422
+#: src/main.c:432
 msgid "Filename encoding"
 msgstr "Codificação de nome de arquivo"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2586,19 +2789,19 @@ msgstr ""
 "\n"
 "Continuar?"
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Ainda há mensagens sendo escritas. Deseja sair?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Mensagens enviadas para a fila"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Algumas mensagens não enviadas estão na fila. Sair agora?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2607,15 +2810,15 @@ msgstr ""
 "Suporte a OpenPGP desabilitado."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2623,615 +2826,615 @@ msgstr ""
 "As configurações antigas foram encontradas.\n"
 "Deseja migrar para o novo formato?"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Arquivo/_Pasta"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "_Arquivo/_Pasta/Criar _nova pasta ..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arquivo/_Pasta/_Renomear pasta..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arquivo/_Pasta/_Mover pasta..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arquivo/_Pasta/A_pagar pasta"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Arquivo/_Caixa de correio"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arquivo/_Caixa de correio/_Adicionar caixa de correio..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arquivo/_Caixa de correio/Remover _caixa de correio"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arquivo/_Caixa de correio/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arquivo/_Caixa de correio/_Procurar por mensagens novas"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Arquivo/_Procurar por mensagens novas em _todas as caixas de correio"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arquivo/_Caixa de correio/_Reconstruir árvore de pastas"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arquivo/I_mportar arquivo mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arquivo/_Exportar para arquivo mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Arquivo/_Trabalhar desconectado"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Arquivo/Sai_r"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar t_hread"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Encontrar na mensagem atual..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editar/_Procurar mensagens..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/E_xibir/_Mostrar ou esconder"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/E_xibir/_Mostrar ou esconder/_Árvore de pastas"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/E_xibir/_Mostrar ou esconder/Ver _Mensagens"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Ícones _e texto"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Í_cones"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Texto"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Nenhum"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _estado"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Visualização separada da _mensagem"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/E_xibir/_Ordenação"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/E_xibir/_Ordenar/por _número"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/E_xibir/_Ordenar/por _tamanho"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/E_xibir/_Ordenar/por _data"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/E_xibir/_Ordenar/por _remetente"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/E_xibir/_Ordenar/por _destinatário"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/E_xibir/_Ordenar/por as_sunto"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/E_xibir/_Ordenar/por _etiqueta de cor"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/E_xibir/_Ordenar/por _marca"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/E_xibir/_Ordenar/por _não lidas"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/E_xibir/_Ordenar/por _anexos"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/_Não ordenar"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/E_xibir/_Ordenar/Crescente"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/E_xibir/_Ordenar/Decrescente"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/E_xibir/_Ordenar/Atrair _por assunto"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/E_xibir/Visão de th_read"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/E_xibir/E_xpandir todas as threads"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/E_xibir/_Fechar todas as threads"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/E_xibir/Elementos _visíveis..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/E_xibir/Ir _Para"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/E_xibir/Ir _Para/Anterior não _lida"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/E_xibir/Ir _Para/Próxima não l_ida"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/E_xibir/Ir _Para/Mensagem n_ova anterior"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem _nova"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/E_xibir/Ir _Para/Mensagem marcada a_nterior"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem ma_rcada"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/E_xibir/Ir _Para/Mensagem eti_quetada anterior"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 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:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/_Receber"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/_Receber/Receber da conta _atual"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensagem/_Receber/_Cancelar recebimento"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/_Receber/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensagem/Classificar como _spam"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Adicionar remetente ao catálogo de _endereços"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/Filtrar spam na _pasta"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/Filtrar _spam nas mensagens selecionadas"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuração/Configuração de _filtros..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências da conta _atual..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/_Mudar conta atual"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Ajuda/_Manual"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajuda/_Manual/_Inglês"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajuda/_Manual/_Japonês"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Ajuda/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajuda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajuda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajuda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajuda/_FAQ/_Francês"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Ajuda/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mudando tipo de separação de janela de %d para %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3241,16 +3444,16 @@ msgstr ""
 "Se uma caixa de correio existente é especificada, ela será\n"
 "mapeada automaticamente."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3260,149 +3463,148 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr "Spam"
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -3520,32 +3722,32 @@ msgstr "Fim da mensagem atingido; continuar do início?"
 msgid "Search finished"
 msgstr "Procura concluída"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar remetente ao Livro de _Endereços"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Criando visualizador de mensagem...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Anexos"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3554,7 +3756,7 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "(`%s' será sustituído pelo arquivo)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3563,48 +3765,6 @@ msgstr ""
 "O comando de impressão é inválido:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "não foi possível copiar a mensagem %s para %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Não foi possível abrir o arquivo de marcas.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "pastas de origem e destino são idênticas.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Copiando mensagem %s%c%d para %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Último número no diretório %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-"Diretório de nome\n"
-"'%s' não é uma string UTF-8 válida.\n"
-"Talvez a codificação local seja usada para o nome de arquivo.\n"
-"Se este for o caso, você deve definir a seguinte variável de ambiente\n"
-"(veja o README para detalhes):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Abrir"
@@ -3688,115 +3848,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "O comando do visualizador MIME é inválido: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "criando conexão NNTP com %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "A conexão NNTP com %s:%d terminou. Reconectando...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "o artigo %d já está no cache.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "obtendo artigo %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "não foi possível ler o artigo %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "não foi possível obter a lista de grupo de notícias\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "não posso postar artigo.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "não foi possível obter o artigo %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "não foi possível selecionar o grupo: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "intervalo de artigos inválido: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "não há novos artigos.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "obtendo xover %d - %d en %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "não foi possível obter xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "ocorreu um erro ao obter xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "linha xover inválida: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "não foi possível obter xover\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "ocorreu um erro ao obter xover.\n"
-
-#: src/nntp.c:68
-#, c-format
-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"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "erro do protocolo: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "erro do protocolo\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Ocorreu um erro quando postando\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Erro ao enviar comando\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[sem id de usuário]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3809,7 +3869,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3817,447 +3877,6 @@ msgstr ""
 "Senha errada! Tente novamente...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Timestamp APOP requerida não encontrada no greeting\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Erro de sintaxe no greeting\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Erro do protocolo POP3\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "resposta UIDL inválida: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Apagando mensagem expirada %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Pulando mensagem %d (%d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "a caixa de correio está travada\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "tempo limite da sessão\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "não foi possível iniciar sessão TLS\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "ocorreu um erro na autenticação\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "comando não suportado\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "Erro na sessão POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Abrindo janela de preferências da conta...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Conta%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Preferências para a nova conta"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Preferências da Conta"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Criando janela de preferências da conta...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Receber"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privacidade"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avançadas"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Nome desta conta"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Marcar como padrão"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Informações pessoais"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Nome completo"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Endereço de e-mail"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organização"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informações do servidor"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Notícias (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Nenhuma (local)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Este servidor requer autenticação"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Servidor de notícias"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Servidor de recepção"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Servidor SMTP (envio)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Usuario"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Senha"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Usar autenticação segura (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Ao receber, eliminar a(s) mensagem(ns) do servidor"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Remover depois de"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dias"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dias: remover imediatamente)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Receber todas as mensagens no servidor"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Limite de tamanho de recebimento"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrar mensagens ao receber"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Caixa de Entrada Padrão"
-
-#: src/prefs_account.c:1126
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "Mensagens não filtradas serão guardadas nesta pasta."
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Método de Autenticação"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automático"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Notícias"
-
-#: src/prefs_account.c:1167
-msgid "Maximum number of articles to download"
-msgstr "Número máximo de artigos para baixar"
-
-#: src/prefs_account.c:1184
-msgid "No limit if 0 is specified."
-msgstr "Sem limite se 0 for especificado."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Obter todas' confere novas mensagens nessa conta"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Cabeçalho"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Adicionar campo de data"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Gerar Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Adicionar cabeçalho do usuário"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Editar... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Autenticação SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-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.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autenticar com POP3 antes de enviar"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Saída de comando"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Estabelecer os seguintes endereços automaticamente"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Responder"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Assinar mensagens por padrão"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Encriptar mensagems por padrão"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr "Encriptar quando responder uma mensagem encriptada"
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Usar formato ASCII-armored para encriptação"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Inserir assinatura de texto puro"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Assinar chave"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Usar chave GnuPG padrão"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Selecionar chave através de seu endereço de e-mail"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Especificar chave manualmente"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Usuário ou ID da chave:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Não usar SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Utilizar SSL para conexão POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Utilizar comando STARTTLS para iniciar a sessão SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Utilizar SSL para conexão IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Usar SSL para conexão NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Enviar (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Utilizar SSL para conexão SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Usar SSL não-bloqueante"
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "Desabilite isso se você tiver problemas na conexão SSL"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Especifique a porta SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Especifique a porta POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Especificar a porta IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Especificar a porta NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Especificar nome do domínio"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Servidor de diretório IMAP"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Colocar mensagens enviadas em"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Colocar mensagens de rascunho em"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Colocar mensagens apagadas em"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Nome da conta não definido."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Endereço de e-mail não especificado."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Servidor SMTP não especificado."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Usuário não especificado."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Servidor POP3 não especificado."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Servidor IMAP4 não especificado."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Servidor NNTP não especificado."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Não é recomendado o uso do velho estilo ASCII-armored\n"
-"para mensagens encriptadas. Não é compatível com a \n"
-"RFC 3156 - Segurança MIME com OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Configuração das ações"
@@ -4322,17 +3941,17 @@ msgstr "Ajuda com sintaxe"
 msgid "Registered actions"
 msgstr "Ações registradas"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Acima"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -4375,823 +3994,31 @@ msgstr "Apagar ação"
 msgid "Do you really want to delete this action?"
 msgstr "Você realmente deseja apagar esta ação?"
 
-#: src/prefs_common.c:918
-msgid "Junk mail filter"
-msgstr "Filtro de spam"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Criando janela de preferências comuns...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Preferências comuns"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citação"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Exibir"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Mensagem"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr "Spam"
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Outros"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Usar um programa externo para obter mensagens"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Comando"
-
-# alguma tradução boa para spool?
-#: src/prefs_common.c:1039
-msgid "Incorporate from local spool"
-msgstr "Incorporar do spool local"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrar ao incorporar"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Caminho para o spool"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Checar nova mensagem"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "a cada"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Checar o correio quando iniciar"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Atualizar todas as pastas locais ao incorporar"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr "Executar comando quando chegarem novas mensagens"
-
-#: src/prefs_common.c:1126
-#, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "`%d' será substituído pelo número de novas mensagens."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Usar programa externo para enviar"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Salvar mensagens enviadas na Caixa de saída"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr "Aplicar regras de filtragem para as mensagens enviadas"
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "Codificação de envio"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automático (Recomendado)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "ASCII de 7 bits (US-ASC_II)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Europeu Ocidental (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Europeu Ocidental (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Europeu Central (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Báltico (ISO-8859-4)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Báltico (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grego (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Hebreu (ISO-8859-8)"
-
-#: src/prefs_common.c:1248
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebreu (Windows-1255)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turco (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirílico (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirílico (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cirílico (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirílico (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonês (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonês (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonês (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Chinês simplificado (GB2312)"
-
-#: src/prefs_common.c:1264
-msgid "Simplified Chinese (GBK)"
-msgstr "Chinês simplificado (GBK)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Chinês tradicional (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Chinês tradicional (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chinês (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-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.c:1287
-msgid "Transfer encoding"
-msgstr "Codificação para transferência"
-
-#: src/prefs_common.c:1306
-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.c:1370
-msgid "Signature separator"
-msgstr "Separador de assinatura"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Inserir automaticamente"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Executar o editor externo automaticamente"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Nível de desfazer"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Quebrar mensagens em"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "caracteres"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Quebrar quote"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Quebrar na entrada"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Quebrar antes de enviar"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Escolher conta para respostas automaticamente"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Quotar mensagem ao responder"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Botão de responder chama resposta para a lista"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Formato de resposta"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Marca de citação"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Formato de Mensagem Encaminhada"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Descrição dos símbolos "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Fonte"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Traduzir cabeçalhos (como `De:', `Assunto:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Exibir número de não lidas próximas ao nome da pasta"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Abreviar newsgroups maiores que"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "letras"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Visão de Sumário "
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Expandir threads"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Formato de data"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Elementos visíveis no cabeçalho... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Permitir cores na mensagem"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Exibir alfabetos de 2-bytes e numéricos com \n"
-"caracteres ASCII (1-byte)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Exibir cabeçalho acima da visão da mensagem"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Cabeçalhos pequenos na visualização da mensagem"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "Renderizar mensagens HTML como texto"
-
-#: src/prefs_common.c:1843
-msgid "Display cursor in message view"
-msgstr "Exibir cursor na área de visualização da mensagem"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Linha de espaço"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(s)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Rolagem"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Meia página"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Rolagem silenciosa"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Passo"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "Imagens"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Redimensionar imagens em anexo para que caibam na janela"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "Dispor as imagens em seqüência"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr "Habilitar controle de spam"
-
-#: src/prefs_common.c:1973
-msgid "Learning command:"
-msgstr "Comando de aprendizado:"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr "Não spam"
-
-#: src/prefs_common.c:2009
-msgid "Classifying command"
-msgstr "Comando de classificação"
-
-#: src/prefs_common.c:2023
-msgid "Junk folder"
-msgstr "Pasta de spam"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr "As mensagens classificadas como spam serão movidas para esta pasta."
-
-#: src/prefs_common.c:2047
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrar mensagens classificadas como spam ao receber"
-
-#: src/prefs_common.c:2051
-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."
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automaticamente checar assinatura"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Armazenar senha temporariamente na memória"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Expirado depois"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minuto(s)"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "Definindo para '0' guardará a senha para toda a sessão."
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Obter entrada quando informando uma passphrase"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Exibir aviso na inicialização se o GnuPG não funciona"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Sempre abrir mensagens no sumário quando selecionado"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Abrir a primeira mensagem não lida ao abrir uma pasta"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Somente marcar a mensagem como lida quando aberta em uma nova janela"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Ir para Caixa de Entrada depois de receber novas mensagens"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
-
-#: src/prefs_common.c:2236
-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."
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Diálogo de recepção"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Exibir diálogo de recepção"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Sempre"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Apenas no recebimento manual"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nunca"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Não mostrar diálogo de erro no caso de erros ao receber"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Fechar diálogo de recepção quando terminar"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr "Ordenar os botões de acordo com o GNOME HIG"
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Definir atalhos de teclado... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Navegador Web"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Adicionar endereço para o destino quando clicado duas vezes"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Ao sair"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Confirmar ao sair"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Esvaziar lixeira ao sair"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Pergunte antes de esvaziar"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Avise se existirem mensagens na fila"
-
-#: src/prefs_common.c:2468
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Habilitar verificação rigorosa da integridade dos caches do sumário"
-
-#: src/prefs_common.c:2471
-msgid ""
-"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"
-"Esta opção reduzirá o desempenho de exibição do sumário."
-
-# tradução boa para socket?
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Tempo limite de E/S no socket:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "segundo(s)"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "o nome completo do mês abreviado"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "o nome completo do dia da semana"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "o nome do mês abreviado"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "o nome completo do mês"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "a data é hora preferida para a localização atual"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "o número do século (ano/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "o dia do mês como um número decimal"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "a hora como um número decimal usando um relógio de 24 horas"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "a hora como um número decimal usando um relógio de 12 horas"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "o dia do ano como um número decimal"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "o mês como um número decimal"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "o minuto como um número decimal"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "ou AM ou PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "o segundo como um número decimal"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "o dia da semana como um número decimal"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "a data preferida para localização atual"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "os últimos dois dígitos de um ano"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "o ano como um número decimal"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "o zona de tempo ou nome ou abreviação"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Especificador"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Descrição"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Exemplo"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Defina as cores de mensagens"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Cores"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Texto Quotado - Primeiro Nível"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Texto Quotado - Segundo Nível"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Texto Quotado - Terceiro Nível"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Ligação URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Reaproveitar cores de quote"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Escolher cor para quotação nível 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Escolher cor para quotação nível 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Escolher cor para quotação nível 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Escolher cor para URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Descrição dos símbolos"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Data\n"
-"De\n"
-"Nome Completo do Remetente\n"
-"Primeiro Nome do Remetente\n"
-"Iniciais do Remetente\n"
-"Assunto\n"
-"Para\n"
-"CC\n"
-"Grupo de Notícias\n"
-"Message-ID\n"
-"%"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Se x estiver definido, mostra expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Corpo da mensagem\n"
-"Corpo da mensagem citada\n"
-"Corpo da mensagem sem assinatura\n"
-"Corpo da mensagem citada sem assinatura\n"
-"%% literal"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Barra invertida literal\n"
-"Ponto de interrogação literal\n"
-"Abre-chave literal\n"
-"Fecha-chave literal"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Atalhos de teclado"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Selecionar os atalhos de teclado.\n"
-"Você pode também modificar o atalho para cada menu\n"
-"pressionando qualquer tecla enquanto coloca o ponteiro\n"
-"do mouse sobre o item."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Padrão"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Sylpheed antigo"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Configuração de cabeçalho personalizado"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Cabeçalho"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Apagar "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Cabeçalhos personalizados"
 
-#: src/prefs_customheader.c:482 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."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Apagar cabeçalho"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Quer realmente apagar este cabeçalho?"
 
@@ -5239,12 +4066,20 @@ msgstr "Configuração de filtros"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Editar"
+
+#: src/prefs_filter.c:685
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Quer realmente apagar a regra '%s'?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+msgid "(Untitled)"
+msgstr "(Sem título)"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Apagar regra"
 
@@ -5328,6 +4163,10 @@ msgstr "mais longo que"
 msgid "is shorter than"
 msgstr "mais curto que"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Mover para"
@@ -5449,6 +4288,10 @@ msgstr "Remover [...] ou (...) do começo do assunto na resposta"
 msgid "Apply to subfolders"
 msgstr "Aplicar nas subpastas"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Estabelecer os seguintes endereços automaticamente"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "Usar também ao responder"
@@ -5523,64 +4366,46 @@ msgstr "Itens mostrados"
 msgid " Revert to default "
 msgstr " Voltar ao padrão "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Nome do Modelo"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registrar"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Sustituir "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Modelos registrados"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Modelo"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Erro no formato do modelo"
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Apagar modelo"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Quer realmente apagar este modelo?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "não foi possível abrir o arquivo de marcas\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "não posso obter mensagem %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "O comando de impressão é inválido: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Criando diálogo de progresso...\n"
@@ -5589,29 +4414,21 @@ msgstr "Criando diálogo de progresso...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "ocorreu um erro enquanto os dados eram obtidos.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Não foi possível gravar no arquivo.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Não posso encontrar identificação de usuário para esta chave."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\taka \"%s\"\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Assinatura feita em %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Erro verificando a assinatura"
 
@@ -5637,6 +4454,10 @@ msgstr "Key ID"
 msgid "Val"
 msgstr "Valor"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Outros"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Adicionar chave"
@@ -5661,84 +4482,84 @@ msgstr ""
 "saberá com certeza se ela irá com certeza para a pessoa que você deseja.\n"
 "Confia nela suficientemente para usá-la mesmo assim?"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Mensagem da fila com cabeçalho corrompido.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando mensagem usando o comando: %s\n"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, c-format
 msgid "Can't execute command: %s"
 msgstr "Não foi possível executar o comando: %s"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Erro ao executar comando: %s"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando com o servidor SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Enviando mensagem..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensagem (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro ao enviar suas mensagens."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5838,32 +4659,20 @@ msgstr "Assinatura ERRADA"
 msgid "No public key to verify the signature"
 msgstr "Sem chave pública para verificar a assinatura"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH não disponível\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "resposta SMTP inválida\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "erro na sessão SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Criando janela fonte ...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Fonte da mensagem"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Exibindo a fonte de %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Fonte"
@@ -6253,6 +5062,933 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
+#~ 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."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Abrindo janela de edição de conta...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Criando janela de edição de conta...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Editar contas"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
+#~ "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protocolo"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid " _Set as default account "
+#~ msgstr " _Marcar como conta padrão "
+
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Quer realmente apagar a conta '%s'?"
+
+#~ msgid "Delete account"
+#~ msgstr "Apagar conta"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Abrindo janela de preferências da conta...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Conta%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Preferências para a nova conta"
+
+#~ msgid "Account preferences"
+#~ msgstr "Preferências da Conta"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Criando janela de preferências da conta...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Receber"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacidade"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançadas"
+
+#~ msgid "Name of this account"
+#~ msgstr "Nome desta conta"
+
+#~ msgid "Set as default"
+#~ msgstr "Marcar como padrão"
+
+#~ msgid "Personal information"
+#~ msgstr "Informações pessoais"
+
+#~ msgid "Full name"
+#~ msgstr "Nome completo"
+
+#~ msgid "Mail address"
+#~ msgstr "Endereço de e-mail"
+
+#~ msgid "Organization"
+#~ msgstr "Organização"
+
+#~ msgid "Server information"
+#~ msgstr "Informações do servidor"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Notícias (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Nenhuma (local)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Este servidor requer autenticação"
+
+#~ msgid "News server"
+#~ msgstr "Servidor de notícias"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Servidor de recepção"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Servidor SMTP (envio)"
+
+#~ msgid "User ID"
+#~ msgstr "Usuario"
+
+#~ msgid "Password"
+#~ msgstr "Senha"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Usar autenticação segura (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Ao receber, eliminar a(s) mensagem(ns) do servidor"
+
+#~ msgid "Remove after"
+#~ msgstr "Remover depois de"
+
+#~ msgid "days"
+#~ msgstr "dias"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dias: remover imediatamente)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Receber todas as mensagens no servidor"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Limite de tamanho de recebimento"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrar mensagens ao receber"
+
+#~ msgid "Default inbox"
+#~ 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."
+
+#~ msgid "Authentication method"
+#~ msgstr "Método de Autenticação"
+
+#~ msgid "Automatic"
+#~ msgstr "Automático"
+
+#~ msgid "News"
+#~ msgstr "Notícias"
+
+#~ msgid "Maximum number of articles to download"
+#~ msgstr "Número máximo de artigos para baixar"
+
+#~ msgid "No limit if 0 is specified."
+#~ 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"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Adicionar campo de data"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Gerar Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Adicionar cabeçalho do usuário"
+
+#~ msgid " Edit... "
+#~ msgstr " Editar... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticação"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Autenticação SMTP (SMTP AUTH)"
+
+#~ 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 "Authenticate with POP3 before sending"
+#~ msgstr "Autenticar com POP3 antes de enviar"
+
+#~ msgid "Command output"
+#~ msgstr "Saída de comando"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Responder"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Assinar mensagens por padrão"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Encriptar mensagems por padrão"
+
+#~ msgid "Encrypt when replying to encrypted message"
+#~ msgstr "Encriptar quando responder uma mensagem encriptada"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Usar formato ASCII-armored para encriptação"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Inserir assinatura de texto puro"
+
+#~ msgid "Sign key"
+#~ msgstr "Assinar chave"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Usar chave GnuPG padrão"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Selecionar chave através de seu endereço de e-mail"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Especificar chave manualmente"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Usuário ou ID da chave:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Não usar SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Utilizar SSL para conexão POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Utilizar comando STARTTLS para iniciar a sessão SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Utilizar SSL para conexão IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Usar SSL para conexão NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Enviar (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Utilizar SSL para conexão SMTP"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Usar SSL não-bloqueante"
+
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "Desabilite isso se você tiver problemas na conexão SSL"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Especifique a porta SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Especifique a porta POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Especificar a porta IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Especificar a porta NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Especificar nome do domínio"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Servidor de diretório IMAP"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Colocar mensagens enviadas em"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Colocar mensagens de rascunho em"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Colocar mensagens apagadas em"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Nome da conta não definido."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Endereço de e-mail não especificado."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Servidor SMTP não especificado."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Usuário não especificado."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Servidor POP3 não especificado."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Servidor IMAP4 não especificado."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Servidor NNTP não especificado."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Não é recomendado o uso do velho estilo ASCII-armored\n"
+#~ "para mensagens encriptadas. Não é compatível com a \n"
+#~ "RFC 3156 - Segurança MIME com OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Criando janela de preferências comuns...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Preferências comuns"
+
+#~ msgid "Quote"
+#~ msgstr "Citação"
+
+#~ msgid "Display"
+#~ msgstr "Exibir"
+
+#~ msgid "Message"
+#~ msgstr "Mensagem"
+
+#~ msgid "Junk mail"
+#~ msgstr "Spam"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Usar um programa externo para obter mensagens"
+
+#~ msgid "Command"
+#~ msgstr "Comando"
+
+# alguma tradução boa para spool?
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Incorporar do spool local"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrar ao incorporar"
+
+#~ msgid "Spool path"
+#~ msgstr "Caminho para o spool"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Checar nova mensagem"
+
+#~ msgid "every"
+#~ msgstr "a cada"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto(s)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Checar o correio quando iniciar"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Atualizar todas as pastas locais ao incorporar"
+
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Executar comando quando chegarem novas mensagens"
+
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "`%d' será substituído pelo número de novas mensagens."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Usar programa externo para enviar"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Salvar mensagens enviadas na Caixa de saída"
+
+#~ msgid "Apply filter rules to sent messages"
+#~ msgstr "Aplicar regras de filtragem para as mensagens enviadas"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "Codificação de envio"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automático (Recomendado)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "ASCII de 7 bits (US-ASC_II)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Europeu Ocidental (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Europeu Ocidental (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Europeu Central (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Báltico (ISO-8859-4)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Báltico (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grego (ISO-8859-7)"
+
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Hebreu (ISO-8859-8)"
+
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Hebreu (Windows-1255)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turco (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cirílico (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cirílico (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cirílico (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cirílico (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonês (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonês (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonês (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Chinês simplificado (GB2312)"
+
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Chinês simplificado (GBK)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Chinês tradicional (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Chinês tradicional (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chinês (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Coreano (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#~ 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 "Transfer encoding"
+#~ msgstr "Codificação para transferência"
+
+#~ 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 "Signature separator"
+#~ msgstr "Separador de assinatura"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Inserir automaticamente"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Executar o editor externo automaticamente"
+
+#~ msgid "Undo level"
+#~ msgstr "Nível de desfazer"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Quebrar mensagens em"
+
+#~ msgid "characters"
+#~ msgstr "caracteres"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Quebrar quote"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Quebrar na entrada"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Quebrar antes de enviar"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Escolher conta para respostas automaticamente"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Quotar mensagem ao responder"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Botão de responder chama resposta para a lista"
+
+#~ msgid "Reply format"
+#~ msgstr "Formato de resposta"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Marca de citação"
+
+#~ msgid "Forward format"
+#~ msgstr "Formato de Mensagem Encaminhada"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Descrição dos símbolos "
+
+#~ msgid "Font"
+#~ msgstr "Fonte"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Traduzir cabeçalhos (como `De:', `Assunto:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Exibir número de não lidas próximas ao nome da pasta"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Abreviar newsgroups maiores que"
+
+#~ msgid "letters"
+#~ msgstr "letras"
+
+#~ msgid "Summary View"
+#~ msgstr "Visão de Sumário "
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
+
+#~ msgid "Expand threads"
+#~ msgstr "Expandir threads"
+
+#~ msgid "Date format"
+#~ msgstr "Formato de data"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Elementos visíveis no cabeçalho... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Permitir cores na mensagem"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Exibir alfabetos de 2-bytes e numéricos com \n"
+#~ "caracteres ASCII (1-byte)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Exibir cabeçalho acima da visão da mensagem"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Cabeçalhos pequenos na visualização da mensagem"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "Renderizar mensagens HTML como texto"
+
+#~ msgid "Display cursor in message view"
+#~ msgstr "Exibir cursor na área de visualização da mensagem"
+
+#~ msgid "Line space"
+#~ msgstr "Linha de espaço"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(s)"
+
+#~ msgid "Scroll"
+#~ msgstr "Rolagem"
+
+#~ msgid "Half page"
+#~ msgstr "Meia página"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Rolagem silenciosa"
+
+#~ msgid "Step"
+#~ msgstr "Passo"
+
+#~ msgid "Images"
+#~ msgstr "Imagens"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Redimensionar imagens em anexo para que caibam na janela"
+
+#~ msgid "Display images as inline"
+#~ msgstr "Dispor as imagens em seqüência"
+
+#~ msgid "Enable Junk mail control"
+#~ msgstr "Habilitar controle de spam"
+
+#~ msgid "Learning command:"
+#~ msgstr "Comando de aprendizado:"
+
+#~ msgid "Not Junk"
+#~ msgstr "Não spam"
+
+#~ msgid "Classifying command"
+#~ msgstr "Comando de classificação"
+
+#~ msgid "Junk folder"
+#~ msgstr "Pasta de spam"
+
+#~ msgid ""
+#~ "The messages which are set as junk mail will be moved to this folder."
+#~ msgstr "As mensagens classificadas como spam serão movidas para esta pasta."
+
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrar mensagens classificadas como spam ao receber"
+
+#~ 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 "Automatically check signatures"
+#~ msgstr "Automaticamente checar assinatura"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Armazenar senha temporariamente na memória"
+
+#~ msgid "Expired after"
+#~ msgstr "Expirado depois"
+
+#~ msgid "minute(s) "
+#~ msgstr "minuto(s)"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "Definindo para '0' guardará a senha para toda a sessão."
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Obter entrada quando informando uma passphrase"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Exibir aviso na inicialização se o GnuPG não funciona"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Sempre abrir mensagens no sumário quando selecionado"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Abrir a primeira mensagem não lida ao abrir uma pasta"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr ""
+#~ "Somente marcar a mensagem como lida quando aberta em uma nova janela"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Ir para Caixa de Entrada depois de receber novas mensagens"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
+
+#~ 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."
+
+#~ msgid "Receive dialog"
+#~ msgstr "Diálogo de recepção"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Exibir diálogo de recepção"
+
+#~ msgid "Always"
+#~ msgstr "Sempre"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Apenas no recebimento manual"
+
+#~ msgid "Never"
+#~ msgstr "Nunca"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Não mostrar diálogo de erro no caso de erros ao receber"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Fechar diálogo de recepção quando terminar"
+
+#~ msgid "Make the order of buttons comply with GNOME HIG"
+#~ msgstr "Ordenar os botões de acordo com o GNOME HIG"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Definir atalhos de teclado... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
+
+#~ msgid "Web browser"
+#~ msgstr "Navegador Web"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Adicionar endereço para o destino quando clicado duas vezes"
+
+#~ msgid "On exit"
+#~ msgstr "Ao sair"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Confirmar ao sair"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Esvaziar lixeira ao sair"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Pergunte antes de esvaziar"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Avise se existirem mensagens na fila"
+
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Habilitar verificação rigorosa da integridade dos caches do sumário"
+
+#~ msgid ""
+#~ "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"
+#~ "Esta opção reduzirá o desempenho de exibição do sumário."
+
+# tradução boa para socket?
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Tempo limite de E/S no socket:"
+
+#~ msgid "second(s)"
+#~ msgstr "segundo(s)"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "o nome completo do mês abreviado"
+
+#~ msgid "the full weekday name"
+#~ msgstr "o nome completo do dia da semana"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "o nome do mês abreviado"
+
+#~ msgid "the full month name"
+#~ msgstr "o nome completo do mês"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "a data é hora preferida para a localização atual"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "o número do século (ano/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "o dia do mês como um número decimal"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "a hora como um número decimal usando um relógio de 24 horas"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "a hora como um número decimal usando um relógio de 12 horas"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "o dia do ano como um número decimal"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "o mês como um número decimal"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "o minuto como um número decimal"
+
+#~ msgid "either AM or PM"
+#~ msgstr "ou AM ou PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "o segundo como um número decimal"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "o dia da semana como um número decimal"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "a data preferida para localização atual"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "os últimos dois dígitos de um ano"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "o ano como um número decimal"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "o zona de tempo ou nome ou abreviação"
+
+#~ msgid "Specifier"
+#~ msgstr "Especificador"
+
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
+#~ msgid "Example"
+#~ msgstr "Exemplo"
+
+#~ msgid "Set message colors"
+#~ msgstr "Defina as cores de mensagens"
+
+#~ msgid "Colors"
+#~ msgstr "Cores"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Texto Quotado - Primeiro Nível"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Texto Quotado - Segundo Nível"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Texto Quotado - Terceiro Nível"
+
+#~ msgid "URI link"
+#~ msgstr "Ligação URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Reaproveitar cores de quote"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Escolher cor para quotação nível 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Escolher cor para quotação nível 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Escolher cor para quotação nível 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Escolher cor para URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Descrição dos símbolos"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Data\n"
+#~ "De\n"
+#~ "Nome Completo do Remetente\n"
+#~ "Primeiro Nome do Remetente\n"
+#~ "Iniciais do Remetente\n"
+#~ "Assunto\n"
+#~ "Para\n"
+#~ "CC\n"
+#~ "Grupo de Notícias\n"
+#~ "Message-ID\n"
+#~ "%"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Se x estiver definido, mostra expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Corpo da mensagem\n"
+#~ "Corpo da mensagem citada\n"
+#~ "Corpo da mensagem sem assinatura\n"
+#~ "Corpo da mensagem citada sem assinatura\n"
+#~ "%% literal"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Barra invertida literal\n"
+#~ "Ponto de interrogação literal\n"
+#~ "Abre-chave literal\n"
+#~ "Fecha-chave literal"
+
+#~ msgid "Key bindings"
+#~ msgstr "Atalhos de teclado"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Selecionar os atalhos de teclado.\n"
+#~ "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 "Default"
+#~ msgstr "Padrão"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Sylpheed antigo"
+
 #~ msgid "Font selection"
 #~ msgstr "Seleção de fonte"
 
@@ -6611,9 +6347,6 @@ msgstr "Aviso de URL falsa"
 #~ msgid "Setting widgets..."
 #~ msgstr "Configurando widgets..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Movendo mensagem %s%c%d para %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tMarcando as mensagens..."
 
diff --git a/po/ro.po b/po/ro.po
index c1875873..2bcec361 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -13,13 +13,411 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Citire configuraţia conturilor...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "scrierea configuraţie în fişier a eşuat\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "Conexiunea IMAP4 la %s:%d a fost întreruptă. Reconectare...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Serverul IMAP4 nu a fost introdus."
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "creare conexiune IMAP4 la %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr ""
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Mutare mesaj %s%c%d în %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Copiere mesaj %s%c%d în %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Recepţionare mesaje din %s în %s...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "marcajul de ştergere nu a putut fi setat: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "ştergere imposibilă\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Recepţionare mesaje din %s în %s...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "marcajul de ştergere nu a putut fi setat: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "directorul nu a putut fi selectat: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Fişierul de marcaje nu a fost găsit.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "a avut loc o eroare la comanda LIST.\n"
+
+#: libsylph/imap.c:1981
+#, fuzzy, c-format
+msgid "Can't create '%s'\n"
+msgstr "nu poate fi creat %s\n"
+
+#: libsylph/imap.c:1986
+#, fuzzy, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "nu poate fi creat %s\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "crearea cutiei poştale a eşuat: LIST a eşuat.\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "crearea cutiei poştale este imposibilă\n"
+
+#: libsylph/imap.c:2163
+#, fuzzy, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "cutia poştală nu a putut fi setată: %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "ştergerea cutiei poştale este imposibilă\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "recepţionarea plicului nu a putut fi realizată\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "a avut loc o eroare în timpul recepţionării plicului.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "plicul nu poate fi analizat: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, fuzzy, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "spaţiul de nume nu a putut fi obţinut\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "directorul nu a putut fi selectat: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Autentificare..."
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Logare IMAP4 eşuată.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "nu a putut fi adăugat %s la %s\n"
+
+#: libsylph/imap.c:3593
+#, fuzzy
+msgid "(sending file...)"
+msgstr "Citire director %s ..."
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "mesajul %s nu a putut fi adăugat\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "nu a putut fi copiat %d la %s\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "eroare comandă IMAP: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "eroare comandă IMAP: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "eroare comandă IMAP: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr ""
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr ""
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "copierea mesajului %s în %s a eşuat\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Deschiderea fişierului marcaj este imposibilă.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "directorul sursă este identic cu cel destinaţie.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Copiere mesaj %s%c%d în %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Ultimul număr din directorul %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Fişierul '%s' există deja.\n"
+"Directorul nu poate fi creat."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "creare conexiune NNTP la %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "Conexiunea NNTP la %s:%d a fost întreruptă. Reconectare...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "Articolul %d a fost deja stocat.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "Receptionare articol %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "articolul %d nu poate fi citit\n"
+
+#: libsylph/news.c:545
+#, fuzzy
+msgid "can't retrieve newsgroup list\n"
+msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "postarea articolului este imposibilă.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "articolul %d nu poate fi recepţionat\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "grupul nu poate fi setat: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "interval invalid: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "nu există articole noi.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "executare xover %d - %d în %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "xover imposibil\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "linie xover invalidă: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+#, fuzzy
+msgid "can't get xhdr\n"
+msgstr "xover imposibil\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+#, fuzzy
+msgid "error occurred while getting xhdr.\n"
+msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Încercarea de conectare la serverul NNTP a eşuat: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "eroare de protocol: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "eroare de protocol\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "A avut loc o eroare la postare\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "A avut loc o eroare la procesarea mesajului."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Eroare de recepţionare timestamp APOP\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Eroare de sintaxă timestamp\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Eroare protocol POP3\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "linie xover invalidă: %s\n"
+
+#: libsylph/pop.c:616
+#, fuzzy, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "Ştergere mesaje duplicate..."
+
+#: libsylph/pop.c:624
+#, fuzzy, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
+
+#: libsylph/pop.c:655
+#, fuzzy
+msgid "mailbox is locked\n"
+msgstr "Setări căsuţă poştală"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+#, fuzzy
+msgid "can't start TLS session\n"
+msgstr "salvarea mesajului este imposibilă\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+#, fuzzy
+msgid "error occurred on authentication\n"
+msgstr "a avut loc o eroare la autorizaţie\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Commandă"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "a avut loc o eroare la autorizaţie\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -29,6 +427,56 @@ msgstr "Găsit: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuraţia a fost salvată.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Director"
+
+#: libsylph/procmime.c:761
+#, fuzzy
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "Convertirea codului a eşuat.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "deschiderea fişierului de marcaje este imposibilă\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "mesajul %d nu a putut fi recepţionat\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+#, fuzzy
+msgid "Can't get text part\n"
+msgstr "xover imposibil\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Linia de comandă pentru imprimare este invalidă: '%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "a apărut o eroare la recepţionarea datelor.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Scrierea în fişier este imposibilă.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr ""
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "a avut loc o eroare la autorizaţie\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr ""
@@ -165,80 +613,6 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Citire configuraţia conturilor...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Există una sau mai multe ferestre de compunere deschise.\n"
-"Vă rugăm să închideţi toate ferestrele de compunere înainteaeditării de "
-"conturi."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Deschidere fereastră de editare...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Creare fereastră de editarea conturilor...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Editare de conturi"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Mesajele noi vor fi verificate in această ordine. Activaţi\n"
-"checkboxurile din coloana `G' pentru a activa recepţionarea\n"
-"mesajelor de comanda `Ia tot'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Nume"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protocol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Editare"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Setare drept cont curent "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neintitulat"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Ştergere cont"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -333,6 +707,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Nume"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -347,8 +729,8 @@ msgstr "Observaţii"
 msgid "Select Address Book Folder"
 msgstr "Selectaţi un director"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Fişier"
 
@@ -369,9 +751,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fişier/Server _LDAP nou"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Fişier/---"
 
@@ -388,7 +770,7 @@ msgstr "/_Fişier/Ş_tergere"
 msgid "/_File/_Save"
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Fişier/Î_nchidere"
 
@@ -420,8 +802,8 @@ msgstr "/_Adresă/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/_Adresă/Ş_tergere"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 #, fuzzy
 msgid "/_Tools"
 msgstr "/_Utilitare"
@@ -430,13 +812,13 @@ msgstr "/_Utilitare"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Utilitare/Importare fişier _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/A_jutor/_Despre"
 
@@ -456,17 +838,17 @@ msgid "/New _Folder"
 msgstr "/_Director nou"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editare"
 
@@ -478,7 +860,7 @@ msgstr "/Ş_tergere"
 msgid "E-Mail address"
 msgstr "Adresă E-Mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Agendă"
 
@@ -488,14 +870,14 @@ msgstr " Nume:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Ştergere"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -506,11 +888,11 @@ msgid "Lookup"
 msgstr "Căutare"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "La:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -537,7 +919,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Ştergere director"
 
@@ -651,7 +1033,7 @@ msgstr "Eroare de convertire a agendei"
 msgid "Addressbook Conversion"
 msgstr "Convertire agendă"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Interfaţă"
 
@@ -671,8 +1053,7 @@ msgstr "Adresă E-Mail"
 msgid "Group"
 msgstr "Groupă"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Director"
 
@@ -696,15 +1077,15 @@ msgstr "Adresse comună:"
 msgid "Personal address"
 msgstr "Adresse personală:"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Informaţie"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Eroare"
 
@@ -759,8 +1140,8 @@ msgstr "/_Adăugare..."
 msgid "/_Remove"
 msgstr "/Ş_tergere"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Proprietăţi..."
@@ -805,8 +1186,8 @@ msgstr "/_Editare/An_ulare"
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Repetare"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
@@ -814,7 +1195,7 @@ msgstr "/_Editare/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Tăiere"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiere"
 
@@ -827,7 +1208,7 @@ msgstr "/_Editare/Li_pire"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Select_are tot"
 
@@ -845,7 +1226,7 @@ msgstr "/_Editare/Tăie_re linii lungi"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vedere"
@@ -867,9 +1248,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vedere/_Răspuns"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Vedere/---"
 
@@ -885,7 +1266,7 @@ msgstr "/_Vedere/Ri_glă"
 msgid "/_View/_Attachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vedere/_La"
@@ -897,127 +1278,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vedere/_La"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Mesaj/Set de _caractere/7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Mesaj/Set de _caractere/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Mesaj/Set de _caractere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Mesaj/Set de _caractere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Mesaj/Set de _caractere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Mesaj/Set de _caractere/Turcesc (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Mesaj/Set de _caractere/Japonez (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Utilitare/_Agendă"
@@ -1027,15 +1408,15 @@ msgstr "/_Utilitare/_Agendă"
 msgid "/_Tools/_Template"
 msgstr "/_Utilitare/_Modele"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xecutare"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Utilitare/---"
@@ -1060,11 +1441,6 @@ msgstr "/_Message/Cr_iptare"
 msgid "%s: file not exist\n"
 msgstr "%s: fişierul nu există\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-#, fuzzy
-msgid "Can't get text part\n"
-msgstr "xover imposibil\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citaţiei."
@@ -1141,7 +1517,7 @@ msgstr ""
 "Nu a fost specificat contul de pe care se doreşte trimiterea de mail.\n"
 "Vă rugăm să selectaţi un cont înainte de a trimite."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
@@ -1231,8 +1607,7 @@ msgstr "Tip MIME"
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Trimitere"
 
@@ -1272,8 +1647,7 @@ msgstr "Ataşament"
 msgid "Attach file"
 msgstr "Ataşare fişier"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Semnătură"
 
@@ -1281,7 +1655,7 @@ msgstr "Semnătură"
 msgid "Insert signature"
 msgstr "Inserare semnătură"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1480,7 +1854,7 @@ msgstr "Modificare"
 msgid "Clear"
 msgstr "Ştergere"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valoare"
 
@@ -1513,7 +1887,6 @@ msgid " Check File "
 msgstr " Verificare Fişier "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Fişier"
 
@@ -1569,12 +1942,12 @@ msgstr "Editare director"
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al directorului:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Director nou"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului director:"
 
@@ -1591,7 +1964,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editare Înregistrare JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1655,7 +2028,7 @@ msgstr "Timeout (secs)"
 msgid "Maximum Entries"
 msgstr "Număr Maxim de Înregistrări"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "General"
 
@@ -1714,7 +2087,6 @@ msgid "Exporting file:"
 msgstr "Exportare fişier:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Selectare... "
 
@@ -1738,175 +2110,175 @@ msgstr "Doriţi suprascrierea fişierului existent ?"
 msgid "Select folder"
 msgstr "Selectare director"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 #, fuzzy
 msgid "Sent"
 msgstr "Trimitere"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Lista de aşteptare"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 #, fuzzy
 msgid "Drafts"
 msgstr "Salvare"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 #, fuzzy
 msgid "NewFolder"
 msgstr "Director nou"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' există deja."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 #, fuzzy
 msgid "/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 #, fuzzy
 msgid "/_Rename folder..."
 msgstr "/_Redenumire director"
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Căutare _director..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Ştergere _director"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tCăutare mesaje nestocate... "
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nu există mesaje necitite"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/În_scriere la newsgroup"
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Şte_rgere newsgroup"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Creare mod vedere director...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nou"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Setare informaţii despre director...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Directorul %s este selectat\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Trimitere mesaj"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1916,21 +2288,21 @@ msgstr ""
 "(dacă doriţi crearea de subdirectoare in acest director,\n"
 " adăugaţi un `/' la sfârşitul numelui)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceţi noul nume pentru '%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Redenumire director"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1941,21 +2313,21 @@ msgstr ""
 "Toate directoarele şi mesajele din '%s' vor fi şterse.\n"
 "Doriţi într-adevăr să continuaţi ?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, fuzzy, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1964,35 +2336,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:2244
+#: src/folderview.c:2247
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Ştergere cont IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Ştergere newsgroup"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului de news '%s' ?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Ştergere cont de news"
 
@@ -2053,7 +2425,7 @@ msgstr "%d newsgroup-uri recepţionate (%s citite)"
 msgid "Newsgroups:"
 msgstr "Grupuri de discuţii:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Subiect:"
 
@@ -2077,166 +2449,6 @@ msgstr "Creare vedere imagine...\n"
 msgid "Can't load the image."
 msgstr "Imaginea nu a putut fi încărcată."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Conexiunea IMAP4 la %s:%d a fost întreruptă. Reconectare...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Serverul IMAP4 nu a fost introdus."
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "creare conexiune IMAP4 la %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr ""
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "marcajul de ştergere nu a putut fi setat: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "ştergere imposibilă\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "marcajul de ştergere nu a putut fi setat: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "directorul nu a putut fi selectat: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Fişierul de marcaje nu a fost găsit.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "a avut loc o eroare la comanda LIST.\n"
-
-#: src/imap.c:1944
-#, fuzzy, c-format
-msgid "Can't create '%s'\n"
-msgstr "nu poate fi creat %s\n"
-
-#: src/imap.c:1949
-#, fuzzy, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "nu poate fi creat %s\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "crearea cutiei poştale a eşuat: LIST a eşuat.\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "crearea cutiei poştale este imposibilă\n"
-
-#: src/imap.c:2126
-#, fuzzy, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "cutia poştală nu a putut fi setată: %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "ştergerea cutiei poştale este imposibilă\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "recepţionarea plicului nu a putut fi realizată\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "a avut loc o eroare în timpul recepţionării plicului.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "plicul nu poate fi analizat: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
-
-#: src/imap.c:2404
-#, fuzzy, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "spaţiul de nume nu a putut fi obţinut\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "directorul nu a putut fi selectat: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Autentificare..."
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Logare IMAP4 eşuată.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "nu a putut fi adăugat %s la %s\n"
-
-#: src/imap.c:3535
-#, fuzzy
-msgid "(sending file...)"
-msgstr "Citire director %s ..."
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "mesajul %s nu a putut fi adăugat\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "nu a putut fi copiat %d la %s\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "eroare comandă IMAP: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "eroare comandă IMAP: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "eroare comandă IMAP: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr ""
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr ""
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importare"
@@ -2334,7 +2546,7 @@ msgstr "Importare fişier LDIF în agendă"
 msgid "Prev"
 msgstr "Înapio"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Înainte"
 
@@ -2350,206 +2562,206 @@ msgstr "Atribute"
 msgid "Finish"
 msgstr "Terminare"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d mesaje noui\n"
 
-#: src/inc.c:162
+#: src/inc.c:161
 msgid "Sylpheed"
 msgstr ""
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Recepţionare mesaje noi"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Aşteptaţi"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Recepţionare"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ştergere mesaje de pe server după primire"
 
-#: src/inc.c:555
+#: src/inc.c:554
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nu există mesaje necitite"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Conexiunea a eşuat"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autorizarea a eşuat"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (secs)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d mesaje noui\n"
 
-#: src/inc.c:630
+#: src/inc.c:629
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nu există mesaje necitite"
 
-#: src/inc.c:639
+#: src/inc.c:638
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Au avut loc un număr de erori la recepţionarea poştei."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "recepţionare mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recepţionare mesaje noi"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Încercarea de conectare la serverul POP3 a eşuat: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepţionare mesaje din %s în %s...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Recepţionarea numărului de mesaje noi"
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Recepţionarea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Recepţionarea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Recepţionarea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Ştergere mesaj"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Închidere conexiune"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ştergere mesaje de pe server după primire"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexiunea a eşuat"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Nu mai este spaţiu pe disc."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 #, fuzzy
 msgid "Can't write file."
 msgstr "Scrierea în fişier este imposibilă.\n"
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 #, fuzzy
 msgid "Socket error."
 msgstr "eroare de protocol\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Setări căsuţă poştală"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Setări căsuţă poştală"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autentificare..."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autentificare..."
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Recepţionare mesaje noi pentru %s în %s...\n"
@@ -2567,79 +2779,70 @@ msgstr "Introducere parolă"
 msgid "Protocol log"
 msgstr "Log protocol"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Fişierul '%s' există deja.\n"
-"Directorul nu poate fi creat."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread nu este suportat de glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizare: %s [OPŢIUNE]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresă]    deschidere fereastră de compunere"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recepţionare mesaje noi"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          recepţionare mesaje noi pentru toate conturile"
 
-#: src/main.c:328
+#: src/main.c:338
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                mod debug"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afişare ajutor şi ieşire"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              afişare versiune şi ieşire"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Set de caractere"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2653,21 +2856,21 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Fereastra de compunere de mesaje există.\n"
 "Sunteţi sigur că doriţi sa ieşiţi ?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Mesaje în lista de aşteptare"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Exista mesaje netrimise în lista de aşteptare. Doriţi sa ieşiţi ?"
 
-#: src/main.c:561
+#: src/main.c:574
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2677,743 +2880,743 @@ msgstr ""
 "Suportul pentru OpenPGP a fost dezactivat."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează o alta sesiune Sylpheed.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Scriere configuraţia filtrului...\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 #, fuzzy
 msgid "/_File/_Folder"
 msgstr "/_Fişier/Î_nchidere"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 #, fuzzy
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 #, fuzzy
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Redenumire director"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Redenumire director"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 #, fuzzy
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Ştergere _director"
 
 # xxx#
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fişier/_Adăugare cutie poştală..."
 
 # xxx#
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fişier/_Adăugare cutie poştală..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fişier/Î_nchidere"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Verificare _mesaje noi"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 #, fuzzy
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fişier/_Importare fişier mbox"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fişier/_Importare fişier mbox"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Fişier/Im_primare..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fişier/_Inserare fişier"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Fişier/Ieşi_re"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Editare/Select_are tot"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editare/_Căutare"
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vedere/Vedere _mesaj"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vedere/Bară de _utilitare"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vedere/Bară de _utilitare/Icoane şi te_xt"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vedere/Bară de _utilitare/_Icoane"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vedere/Bară de _utilitare/_Text"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vedere/Bară de _utilitare/_Icoane"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vedere/Bară de _stare"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vedere/Separare arbore de direct_oare"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vedere/Separare arbore de m_esaje"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Re_zumat/_Sortare/Sortare după d_imensiune"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Re_zumat/_Sortare/Sortare după _dată"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Re_zumat/_Sortare/Sortare după e_xpeditor"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Re_zumat/_Sortare/Sortare după d_imensiune"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Re_zumat/_Sortare/Sortare după subiect"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Re_zumat/_Sortare/Sortare după _dată"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Vedere/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Re_zumat/_Sortare/_Atracţie după subiect"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Vedere/Vedere _mesaj"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Re_zumat/Selectare elemente afişate..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Re_zumat/Mesajul _precedent"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Re_zumat/Mesajul _următor"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Vedere/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Re_zumat/Următorul mesaj n_ecitit"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Re_zumat/Mesajul _precedent"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Re_zumat/Mesajul _următor"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vedere/Separare arbore de m_esaje"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr ""
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr ""
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Re_zumat/Alt di_rector"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Mesaj/Set de _caractere/Detectare _automată"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Message/Set de _caractere/Japonez (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Message/Set de _caractere/Japonez (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Message/Set de _caractere/Japonez (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Deschidere în _fereastră nouă"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Show all _header"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Salvare şi _continuare"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesa_jele din lista de aşteptare"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compunere mesaj _nou"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/_Răspuns"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Î_naintare"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 #, fuzzy
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Şter_gere"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marcare/_Marcare"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marcare/_Demarcare"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 #, fuzzy
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 #, fuzzy
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mesaj/Recepţ_ionare poştă"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Recepţ_ionare poştă"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 #, fuzzy
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Utilitare/_Agendă"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Re_zumat/Ştergere mesaje _duplicate"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/E_xecutare"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Utilitare/Fereastră _jurnal"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Configuraţie"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuraţie/Preferinţe _comune..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Configuraţie/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuraţie/_Preferinţe per cont..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuraţie/Creare cont _nou..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuraţie/_Selectare cont curent"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/A_jutor/_Despre"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Adăugare cutie poştală"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3423,16 +3626,16 @@ msgstr ""
 "Dacă este specificată o cutie poştală existentă, aceasta\n"
 "va fi scanată automat."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Cutie poştală"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3442,155 +3645,154 @@ msgstr ""
 "Probabil că anumite fişiere există deja, sau nu aveţi permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Recepţionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Răspuns"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Răspuns toţi"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Înaintare"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Înaintare mesaj"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Ştergere mesaj"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 msgid "Set as junk mail"
 msgstr ""
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Execută toate procesele marcate"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Setări cont curent"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Doriţi să părăsiţi acest program ?"
 
@@ -3711,34 +3913,34 @@ msgstr "S-a atins sfârşitul listei; continuaţi de la început ?"
 msgid "Search finished"
 msgstr "Căutarea a luat sfârşit"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Utilitare/_Agendă"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Creare vedere mesaj...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 #, fuzzy
 msgid "Text"
 msgstr "Înainte"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Ataşamente"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3747,7 +3949,7 @@ msgstr ""
 "Introduceţi linia de comandă pentru imprimare:\n"
 "('%s' va fi înlocuit cu numele fişierului)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3756,41 +3958,6 @@ msgstr ""
 "Linia de comandă pentru imprimare este invalidă:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "copierea mesajului %s în %s a eşuat\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Deschiderea fişierului marcaj este imposibilă.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "directorul sursă este identic cu cel destinaţie.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Copiere mesaj %s%c%d în %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Ultimul număr din directorul %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Deschidere"
@@ -3878,119 +4045,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Linia de comanda pentru vizualizare MIME este invalidă: '%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "creare conexiune NNTP la %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "Conexiunea NNTP la %s:%d a fost întreruptă. Reconectare...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "Articolul %d a fost deja stocat.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "Receptionare articol %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "articolul %d nu poate fi citit\n"
-
-#: src/news.c:548
-#, fuzzy
-msgid "can't retrieve newsgroup list\n"
-msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "postarea articolului este imposibilă.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "articolul %d nu poate fi recepţionat\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "grupul nu poate fi setat: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "interval invalid: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "nu există articole noi.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "executare xover %d - %d în %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "xover imposibil\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "linie xover invalidă: %s\n"
-
-#: src/news.c:847 src/news.c:879
-#, fuzzy
-msgid "can't get xhdr\n"
-msgstr "xover imposibil\n"
-
-#: src/news.c:859 src/news.c:891
-#, fuzzy
-msgid "error occurred while getting xhdr.\n"
-msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Încercarea de conectare la serverul NNTP a eşuat: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "eroare de protocol: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "eroare de protocol\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "A avut loc o eroare la postare\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "A avut loc o eroare la procesarea mesajului."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr ""
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr ""
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3999,480 +4062,12 @@ msgid ""
 "(%.*s)\n"
 msgstr ""
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
 msgstr ""
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Eroare de recepţionare timestamp APOP\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Eroare de sintaxă timestamp\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Eroare protocol POP3\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "linie xover invalidă: %s\n"
-
-#: src/pop.c:616
-#, fuzzy, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "Ştergere mesaje duplicate..."
-
-#: src/pop.c:624
-#, fuzzy, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
-
-#: src/pop.c:655
-#, fuzzy
-msgid "mailbox is locked\n"
-msgstr "Setări căsuţă poştală"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-#, fuzzy
-msgid "can't start TLS session\n"
-msgstr "salvarea mesajului este imposibilă\n"
-
-#: src/pop.c:671 src/smtp.c:492
-#, fuzzy
-msgid "error occurred on authentication\n"
-msgstr "a avut loc o eroare la autorizaţie\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Commandă"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "a avut loc o eroare la autorizaţie\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Deschidere fereastră de configurare cont...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Cont%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Preferinţe pentru noul cont"
-
-#: src/prefs_account.c:683
-#, fuzzy
-msgid "Account preferences"
-msgstr "Preferinţe comune"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Creare fereastră de preferinţe cont...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Recepţionare"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr ""
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr ""
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avansat"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Numele contului"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr ""
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Informatii personale"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Nume complet"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Adresa de mail"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizaţie"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informatii despre server"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Nimic (local)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr ""
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Server news"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server pentru recepţionare"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Server SMTP (trimitere)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Utilizator"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Parola"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "a avut loc o eroare la autorizaţie\n"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Ştergere mesaje de pe server după primire"
-
-#: src/prefs_account.c:1045
-#, fuzzy
-msgid "Remove after"
-msgstr "Ştergere director"
-
-#: src/prefs_account.c:1054
-#, fuzzy
-msgid "days"
-msgstr "Alias"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr ""
-
-#: src/prefs_account.c:1078
-#, fuzzy
-msgid "Download all messages on server"
-msgstr "Recepţionare toate mesajele de pe server"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr ""
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrare mesaje la primire"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr ""
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "Deschide primul mesaj necitit la intrarea într-un director"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-#, fuzzy
-msgid "Authentication method"
-msgstr "Autentificare..."
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automat"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "News"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Numărul maxim al articolului\n"
-"pentru recepţionare (0 = nelimitat)     "
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Destinatarul nu a fost specificat."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr ""
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Antet"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Adăugare câmp Date la antet"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generare Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Adăugare de câmpuri definite de utilizator"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Editare..."
-
-#: src/prefs_account.c:1267
-#, fuzzy
-msgid "Authentication"
-msgstr "Autentificare..."
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr ""
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr ""
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Commandă"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-#, fuzzy
-msgid "Automatically set the following addresses"
-msgstr "Setare automată a adreselor următoare"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr ""
-
-#: src/prefs_account.c:1520
-#, fuzzy
-msgid "Encrypt message by default"
-msgstr "Taie liniile mesajului la"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr ""
-
-#: src/prefs_account.c:1526
-#, fuzzy
-msgid "Use clear text signature"
-msgstr "Inserare semnătură"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr ""
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr ""
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr ""
-
-#: src/prefs_account.c:1557
-#, fuzzy
-msgid "Specify key manually"
-msgstr "Nume domeniu"
-
-#: src/prefs_account.c:1573
-#, fuzzy
-msgid "User or key ID:"
-msgstr "Utilizator"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr ""
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr ""
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr ""
-
-#: src/prefs_account.c:1687
-#, fuzzy
-msgid "Use SSL for IMAP4 connection"
-msgstr "creare conexiune tunel IMAP4\n"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr ""
-
-#: src/prefs_account.c:1708
-#, fuzzy
-msgid "Use SSL for NNTP connection"
-msgstr "creare conexiune tunel IMAP4\n"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr ""
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr ""
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Port SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Port POP3"
-
-#: src/prefs_account.c:1833
-#, fuzzy
-msgid "Specify IMAP4 port"
-msgstr "Port SMTP"
-
-#: src/prefs_account.c:1839
-#, fuzzy
-msgid "Specify NNTP port"
-msgstr "Port SMTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Nume domeniu"
-
-#: src/prefs_account.c:1862
-#, fuzzy
-msgid "IMAP server directory"
-msgstr "Serverul IMAP4 nu a fost introdus."
-
-#: src/prefs_account.c:1916
-#, fuzzy
-msgid "Put sent messages in"
-msgstr "Salvare mesaje trimise în outbox"
-
-#: src/prefs_account.c:1918
-#, fuzzy
-msgid "Put draft messages in"
-msgstr "Taie liniile mesajului la"
-
-#: src/prefs_account.c:1920
-#, fuzzy
-msgid "Put deleted messages in"
-msgstr "Ştergere mesaj"
-
-#: src/prefs_account.c:1981
-#, fuzzy
-msgid "Account name is not entered."
-msgstr "Adresa de mail nu a fost introdusă."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Adresa de mail nu a fost introdusă."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Serverul SMTP nu a fost introdus."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Numele de utilizator nu a fost introdus."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Serverul POP3 nu a fost introdus."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Serverul IMAP4 nu a fost introdus."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Serverul NNTP nu a fost introdus."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4524,17 +4119,17 @@ msgstr ""
 msgid "Registered actions"
 msgstr "Reguli înregistrate"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Sus"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Jos"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nou)"
 
@@ -4578,844 +4173,32 @@ msgstr "Ştergere cont"
 msgid "Do you really want to delete this action?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Director"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Creare fereastră de preferinţe comune...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Preferinţe comune"
-
-#: src/prefs_common.c:954
-#, fuzzy
-msgid "Quote"
-msgstr "Lista de aşteptare"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Afişare"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Mesaj"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Altele"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Foloseşte un program extern pentru incorporare"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Commandă"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Incorporare din spool"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrare la incorporare"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Verificare automată a poştei"
-
-#: src/prefs_common.c:1078
-#, fuzzy
-msgid "every"
-msgstr "Server"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minut(e)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Verificare poştă la pornire"
-
-#: src/prefs_common.c:1101
-#, fuzzy
-msgid "Update all local folders after incorporation"
-msgstr "Foloseşte un program extern pentru incorporare"
-
-#: src/prefs_common.c:1105
-msgid "Execute command when new messages arrived"
-msgstr ""
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Recepţionarea numărului de mesaje noi"
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Folosire program extern pentru trimitere"
-
-#: src/prefs_common.c:1208
-#, fuzzy
-msgid "Save sent messages to outbox"
-msgstr "Salvare mesaje trimise în outbox"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Set de caractere"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr ""
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ASCII (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Vest European (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-#, fuzzy
-msgid "Western European (ISO-8859-15)"
-msgstr "Vest European (ISO-8859-1)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Central European (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltic (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltic (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grec (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grec (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Chirilic (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turcesc (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Chirilic (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Chirilic (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Chirilic (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Chirilic (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonez (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonez (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonez (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Chinezesc Simplificat (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Chinezesc Simplificat (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Chinezesc Tradiţional (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Chinezesc Tradiţional (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Chinezesc"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Corean"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr ""
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr ""
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-
-#: src/prefs_common.c:1287
-#, fuzzy
-msgid "Transfer encoding"
-msgstr "Taie liniile înainte de trimitere"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Separator de semnătură"
-
-#: src/prefs_common.c:1379
-#, fuzzy
-msgid "Insert automatically"
-msgstr "Inserează semnătura automat"
-
-#: src/prefs_common.c:1389
-#, fuzzy
-msgid "Automatically launch the external editor"
-msgstr "Editare cu editor extern"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr ""
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Taie liniile mesajului la"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "caractere"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Taie liniile semnăturii"
-
-#: src/prefs_common.c:1447
-#, fuzzy
-msgid "Wrap on input"
-msgstr "Tăiere toate liniile lungi"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Taie liniile înainte de trimitere"
-
-#: src/prefs_common.c:1459
-#, fuzzy
-msgid "Automatically select account for replies"
-msgstr "Setare automată a adreselor următoare"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citează mesajul la care se răspunde"
-
-#: src/prefs_common.c:1463
-#, fuzzy
-msgid "Reply button invokes mailing list reply"
-msgstr "/Răspunde _la toţi"
-
-#. reply
-#: src/prefs_common.c:1509
-#, fuzzy
-msgid "Reply format"
-msgstr "Răspunde la toţi"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Semn de citare"
-
-#. forward
-#: src/prefs_common.c:1551
-#, fuzzy
-msgid "Forward format"
-msgstr "Înaintare"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Descrierea simbolurilor "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Font"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Traducere antet (cu ar fi 'From:', 'Subject:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Afişare număr de mesaje necitite lângă numele directorului"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr ""
-
-#: src/prefs_common.c:1690
-#, fuzzy
-msgid "letters"
-msgstr "Ştergere"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-#, fuzzy
-msgid "Summary View"
-msgstr "/Re_zumat"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Destinatarul pe coloana 'From', daca sunteţi expeditorul"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr ""
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-#, fuzzy
-msgid "Date format"
-msgstr "Format de citare:"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Elemente afişate... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Colorare mesaje"
-
-#: src/prefs_common.c:1814
-#, fuzzy
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "Afişare caractere pe 2 biţi cu un alfabet pe 1 bit"
-
-#: src/prefs_common.c:1820
-#, fuzzy
-msgid "Display header pane above message view"
-msgstr "Afişare antet scurt"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Afişare antet scurt"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Afişare antet scurt"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Spaţiere linii"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(i)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr ""
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr ""
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr ""
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr ""
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr ""
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "/Afişare ca te_xt"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Executare"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Executare"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Director"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrare mesaje la primire"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "Deschide primul mesaj necitit la intrarea într-un director"
-
-#: src/prefs_common.c:2089
-#, fuzzy
-msgid "Automatically check signatures"
-msgstr "Setare automată a adreselor următoare"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr ""
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr ""
-
-#: src/prefs_common.c:2110
-#, fuzzy
-msgid "Expired after"
-msgstr "Mai târziu"
-
-#: src/prefs_common.c:2123
-#, fuzzy
-msgid "minute(s) "
-msgstr "minut(e)"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr ""
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr ""
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "un mesaj nu a putut fi recepţionat\n"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Deschide primul mesaj necitit la intrarea într-un director"
-
-#: src/prefs_common.c:2212
-#, fuzzy
-msgid "Only mark message as read when opened in new window"
-msgstr "/_Mesaj/Desc_hidere în fereastră nouă"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr ""
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr ""
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-
-#: src/prefs_common.c:2239
-#, fuzzy
-msgid "Receive dialog"
-msgstr "Recepţionare"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr ""
-
-#: src/prefs_common.c:2259
-#, fuzzy
-msgid "Always"
-msgstr "Alias"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-#, fuzzy
-msgid "Never"
-msgstr "Server"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr ""
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr ""
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr ""
-
-#: src/prefs_common.c:2333
-#, fuzzy, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Editor extern (%s va fi înlocuit de numele fişierului)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr ""
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr ""
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "La ieşire"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Confirmare ieşire"
-
-#: src/prefs_common.c:2422
-#, fuzzy
-msgid "Empty trash on exit"
-msgstr "Curăţare gunoi"
-
-#: src/prefs_common.c:2424
-#, fuzzy
-msgid "Ask before emptying"
-msgstr "Întreabă înainte de curăţare"
-
-#: src/prefs_common.c:2428
-#, fuzzy
-msgid "Warn if there are queued messages"
-msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Scriere cache rezumat (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr ""
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr ""
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr ""
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr ""
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr ""
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr ""
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr ""
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr ""
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr ""
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr ""
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr ""
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr ""
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr ""
-
-#: src/prefs_common.c:2700
-#, fuzzy
-msgid "Specifier"
-msgstr "Selectare fişier"
-
-#: src/prefs_common.c:2701
-#, fuzzy
-msgid "Description"
-msgstr "Destinaţie"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr ""
-
-#: src/prefs_common.c:2821
-#, fuzzy
-msgid "Set message colors"
-msgstr "Trimitere mesaj"
-
-#: src/prefs_common.c:2829
-#, fuzzy
-msgid "Colors"
-msgstr "Închidere"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr ""
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr ""
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr ""
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr ""
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr ""
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr ""
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr ""
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr ""
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr ""
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Descrierea simbolurilor"
-
-#: src/prefs_common.c:3153
-#, fuzzy
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Data\n"
-"De la\n"
-"Numele complet al expeditorului\n"
-"Primul nume al expeditorului\n"
-"Iniţiala expeditorului\n"
-"Subiect\n"
-"La\n"
-"Message-ID\n"
-"Semnul %"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr ""
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr ""
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-#, fuzzy
-msgid "Default"
-msgstr "Ştergere"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr ""
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr ""
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Antet"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Ştergere "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr ""
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 #, fuzzy
 msgid "Delete header"
 msgstr "Ştergere director"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 #, fuzzy
 msgid "Do you really want to delete this header?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
@@ -5474,12 +4257,21 @@ msgstr "Filtrare"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Editare"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neintitulat"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Ştergere regulă"
 
@@ -5568,6 +4360,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5712,6 +4508,11 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr ""
 
+#: src/prefs_folder_item.c:304
+#, fuzzy
+msgid "Automatically set the following addresses"
+msgstr "Setare automată a adreselor următoare"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr ""
@@ -5790,72 +4591,53 @@ msgstr "Definire elemente afişate"
 msgid " Revert to default "
 msgstr ""
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 #, fuzzy
 msgid "Template name"
 msgstr "Numele fişierului"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Înregistrare"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Substituire "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr ""
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 #, fuzzy
 msgid "Registered templates"
 msgstr "Reguli înregistrate"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 #, fuzzy
 msgid "Templates"
 msgstr "/_Utilitare/_Modele"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 #, fuzzy
 msgid "Template"
 msgstr "/_Utilitare/_Modele"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 #, fuzzy
 msgid "Template format error."
 msgstr "Eroare de formatare a citaţiei."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 #, fuzzy
 msgid "Delete template"
 msgstr "Ştergere mesaj"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 #, fuzzy
 msgid "Do you really want to delete this template?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/procmime.c:773
-#, fuzzy
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "Convertirea codului a eşuat.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "deschiderea fişierului de marcaje este imposibilă\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "mesajul %d nu a putut fi recepţionat\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Linia de comandă pentru imprimare este invalidă: '%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Creare dialog de progres...\n"
@@ -5864,29 +4646,21 @@ msgstr "Creare dialog de progres...\n"
 msgid "Status"
 msgstr ""
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "a apărut o eroare la recepţionarea datelor.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Scrierea în fişier este imposibilă.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr ""
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, fuzzy, c-format
 msgid "Signature made at %s\n"
 msgstr "Fişier semnătură"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr ""
 
@@ -5915,6 +4689,10 @@ msgstr "Utilizator"
 msgid "Val"
 msgstr "Valoare"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Altele"
+
 #: src/select-keys.c:468
 #, fuzzy
 msgid "Add key"
@@ -5937,92 +4715,92 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Antetul mesajului din lista de aşteptare este invalid.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Editorul extern nu poate fi executat\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 #, fuzzy
 msgid "Connecting"
 msgstr "Conectare la %s ..."
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, fuzzy, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectare la serverul SMTP: %s ...\n"
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Trimitere"
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentificare..."
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Trimitere"
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 #, fuzzy
 msgid "Sending"
 msgstr "Trimitere"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 #, fuzzy
 msgid "Quitting..."
 msgstr "Închidere conexiune"
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, fuzzy, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 #, fuzzy
 msgid "Sending message"
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "A avut loc o eroare la încercarea de a trimite mesajul."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6126,35 +4904,22 @@ msgstr "Semnătură"
 msgid "No public key to verify the signature"
 msgstr ""
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr ""
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "a avut loc o eroare la autorizaţie\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 #, fuzzy
 msgid "Creating source window...\n"
 msgstr "Creare fereastră jurnal...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 #, fuzzy
 msgid "Source of the message"
 msgstr "Răspunde la mesaj"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, fuzzy, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Afişarea antetelor %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr ""
@@ -6590,6 +5355,648 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Există una sau mai multe ferestre de compunere deschise.\n"
+#~ "Vă rugăm să închideţi toate ferestrele de compunere înainteaeditării de "
+#~ "conturi."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Deschidere fereastră de editare...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Creare fereastră de editarea conturilor...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Editare de conturi"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Mesajele noi vor fi verificate in această ordine. Activaţi\n"
+#~ "checkboxurile din coloana `G' pentru a activa recepţionarea\n"
+#~ "mesajelor de comanda `Ia tot'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protocol"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Setare drept cont curent "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
+
+#~ msgid "Delete account"
+#~ msgstr "Ştergere cont"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Deschidere fereastră de configurare cont...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Cont%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Preferinţe pentru noul cont"
+
+#, fuzzy
+#~ msgid "Account preferences"
+#~ msgstr "Preferinţe comune"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Creare fereastră de preferinţe cont...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Recepţionare"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansat"
+
+#~ msgid "Name of this account"
+#~ msgstr "Numele contului"
+
+#~ msgid "Personal information"
+#~ msgstr "Informatii personale"
+
+#~ msgid "Full name"
+#~ msgstr "Nume complet"
+
+#~ msgid "Mail address"
+#~ msgstr "Adresa de mail"
+
+#~ msgid "Organization"
+#~ msgstr "Organizaţie"
+
+#~ msgid "Server information"
+#~ msgstr "Informatii despre server"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Nimic (local)"
+
+#~ msgid "News server"
+#~ msgstr "Server news"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server pentru recepţionare"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Server SMTP (trimitere)"
+
+#~ msgid "User ID"
+#~ msgstr "Utilizator"
+
+#~ msgid "Password"
+#~ msgstr "Parola"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "a avut loc o eroare la autorizaţie\n"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Ştergere mesaje de pe server după primire"
+
+#, fuzzy
+#~ msgid "Remove after"
+#~ msgstr "Ştergere director"
+
+#, fuzzy
+#~ msgid "days"
+#~ msgstr "Alias"
+
+#, fuzzy
+#~ msgid "Download all messages on server"
+#~ msgstr "Recepţionare toate mesajele de pe server"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrare mesaje la primire"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "Deschide primul mesaj necitit la intrarea într-un director"
+
+#, fuzzy
+#~ msgid "Authentication method"
+#~ msgstr "Autentificare..."
+
+#~ msgid "Automatic"
+#~ msgstr "Automat"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Numărul maxim al articolului\n"
+#~ "pentru recepţionare (0 = nelimitat)     "
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Destinatarul nu a fost specificat."
+
+#~ msgid "Add Date header field"
+#~ msgstr "Adăugare câmp Date la antet"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generare Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Adăugare de câmpuri definite de utilizator"
+
+#~ msgid " Edit... "
+#~ msgstr " Editare..."
+
+#, fuzzy
+#~ msgid "Authentication"
+#~ msgstr "Autentificare..."
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Commandă"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Reply-To"
+
+#, fuzzy
+#~ msgid "Encrypt message by default"
+#~ msgstr "Taie liniile mesajului la"
+
+#, fuzzy
+#~ msgid "Use clear text signature"
+#~ msgstr "Inserare semnătură"
+
+#, fuzzy
+#~ msgid "Specify key manually"
+#~ msgstr "Nume domeniu"
+
+#, fuzzy
+#~ msgid "User or key ID:"
+#~ msgstr "Utilizator"
+
+#, fuzzy
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "creare conexiune tunel IMAP4\n"
+
+#, fuzzy
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "creare conexiune tunel IMAP4\n"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Port SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Port POP3"
+
+#, fuzzy
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Port SMTP"
+
+#, fuzzy
+#~ msgid "Specify NNTP port"
+#~ msgstr "Port SMTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Nume domeniu"
+
+#, fuzzy
+#~ msgid "IMAP server directory"
+#~ msgstr "Serverul IMAP4 nu a fost introdus."
+
+#, fuzzy
+#~ msgid "Put sent messages in"
+#~ msgstr "Salvare mesaje trimise în outbox"
+
+#, fuzzy
+#~ msgid "Put draft messages in"
+#~ msgstr "Taie liniile mesajului la"
+
+#, fuzzy
+#~ msgid "Put deleted messages in"
+#~ msgstr "Ştergere mesaj"
+
+#, fuzzy
+#~ msgid "Account name is not entered."
+#~ msgstr "Adresa de mail nu a fost introdusă."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Adresa de mail nu a fost introdusă."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Serverul SMTP nu a fost introdus."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Numele de utilizator nu a fost introdus."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Serverul POP3 nu a fost introdus."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Serverul IMAP4 nu a fost introdus."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Serverul NNTP nu a fost introdus."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Creare fereastră de preferinţe comune...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Preferinţe comune"
+
+#, fuzzy
+#~ msgid "Quote"
+#~ msgstr "Lista de aşteptare"
+
+#~ msgid "Display"
+#~ msgstr "Afişare"
+
+#~ msgid "Message"
+#~ msgstr "Mesaj"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Foloseşte un program extern pentru incorporare"
+
+#~ msgid "Command"
+#~ msgstr "Commandă"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Incorporare din spool"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrare la incorporare"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Verificare automată a poştei"
+
+#, fuzzy
+#~ msgid "every"
+#~ msgstr "Server"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut(e)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Verificare poştă la pornire"
+
+#, fuzzy
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Foloseşte un program extern pentru incorporare"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Recepţionarea numărului de mesaje noi"
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Folosire program extern pentru trimitere"
+
+#, fuzzy
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Salvare mesaje trimise în outbox"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Set de caractere"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ASCII (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Vest European (ISO-8859-1)"
+
+#, fuzzy
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Vest European (ISO-8859-1)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Central European (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltic (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltic (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grec (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grec (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Chirilic (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turcesc (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Chirilic (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Chirilic (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Chirilic (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Chirilic (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonez (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonez (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonez (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Chinezesc Simplificat (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Chinezesc Simplificat (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Chinezesc Tradiţional (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Chinezesc Tradiţional (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Chinezesc"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Corean"
+
+#, fuzzy
+#~ msgid "Transfer encoding"
+#~ msgstr "Taie liniile înainte de trimitere"
+
+#~ msgid "Signature separator"
+#~ msgstr "Separator de semnătură"
+
+#, fuzzy
+#~ msgid "Insert automatically"
+#~ msgstr "Inserează semnătura automat"
+
+#, fuzzy
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Editare cu editor extern"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Taie liniile mesajului la"
+
+#~ msgid "characters"
+#~ msgstr "caractere"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Taie liniile semnăturii"
+
+#, fuzzy
+#~ msgid "Wrap on input"
+#~ msgstr "Tăiere toate liniile lungi"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Taie liniile înainte de trimitere"
+
+#, fuzzy
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Setare automată a adreselor următoare"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citează mesajul la care se răspunde"
+
+#, fuzzy
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "/Răspunde _la toţi"
+
+#, fuzzy
+#~ msgid "Reply format"
+#~ msgstr "Răspunde la toţi"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Semn de citare"
+
+#, fuzzy
+#~ msgid "Forward format"
+#~ msgstr "Înaintare"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Descrierea simbolurilor "
+
+#~ msgid "Font"
+#~ msgstr "Font"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Traducere antet (cu ar fi 'From:', 'Subject:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Afişare număr de mesaje necitite lângă numele directorului"
+
+#, fuzzy
+#~ msgid "letters"
+#~ msgstr "Ştergere"
+
+#, fuzzy
+#~ msgid "Summary View"
+#~ msgstr "/Re_zumat"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Destinatarul pe coloana 'From', daca sunteţi expeditorul"
+
+#, fuzzy
+#~ msgid "Date format"
+#~ msgstr "Format de citare:"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Elemente afişate... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Colorare mesaje"
+
+#, fuzzy
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "Afişare caractere pe 2 biţi cu un alfabet pe 1 bit"
+
+#, fuzzy
+#~ msgid "Display header pane above message view"
+#~ msgstr "Afişare antet scurt"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Afişare antet scurt"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Afişare antet scurt"
+
+#~ msgid "Line space"
+#~ msgstr "Spaţiere linii"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(i)"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "/Afişare ca te_xt"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Executare"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Executare"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Director"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrare mesaje la primire"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "Deschide primul mesaj necitit la intrarea într-un director"
+
+#, fuzzy
+#~ msgid "Automatically check signatures"
+#~ msgstr "Setare automată a adreselor următoare"
+
+#, fuzzy
+#~ msgid "Expired after"
+#~ msgstr "Mai târziu"
+
+#, fuzzy
+#~ msgid "minute(s) "
+#~ msgstr "minut(e)"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "un mesaj nu a putut fi recepţionat\n"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Deschide primul mesaj necitit la intrarea într-un director"
+
+#, fuzzy
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "/_Mesaj/Desc_hidere în fereastră nouă"
+
+#, fuzzy
+#~ msgid "Receive dialog"
+#~ msgstr "Recepţionare"
+
+#, fuzzy
+#~ msgid "Always"
+#~ msgstr "Alias"
+
+#, fuzzy
+#~ msgid "Never"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Editor extern (%s va fi înlocuit de numele fişierului)"
+
+#~ msgid "On exit"
+#~ msgstr "La ieşire"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Confirmare ieşire"
+
+#, fuzzy
+#~ msgid "Empty trash on exit"
+#~ msgstr "Curăţare gunoi"
+
+#, fuzzy
+#~ msgid "Ask before emptying"
+#~ msgstr "Întreabă înainte de curăţare"
+
+#, fuzzy
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Scriere cache rezumat (%s)..."
+
+#, fuzzy
+#~ msgid "Specifier"
+#~ msgstr "Selectare fişier"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Destinaţie"
+
+#, fuzzy
+#~ msgid "Set message colors"
+#~ msgstr "Trimitere mesaj"
+
+#, fuzzy
+#~ msgid "Colors"
+#~ msgstr "Închidere"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Descrierea simbolurilor"
+
+#, fuzzy
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Data\n"
+#~ "De la\n"
+#~ "Numele complet al expeditorului\n"
+#~ "Primul nume al expeditorului\n"
+#~ "Iniţiala expeditorului\n"
+#~ "Subiect\n"
+#~ "La\n"
+#~ "Message-ID\n"
+#~ "Semnul %"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Ştergere"
+
 #~ msgid "Font selection"
 #~ msgstr "Selectare font"
 
@@ -6905,9 +6312,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Setare widgets..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Mutare mesaj %s%c%d în %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tMarcare mesaje..."
 
diff --git a/po/ru.po b/po/ru.po
index e7a5200c..b4eafa51 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -16,13 +16,396 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Чтение настроек учетных записей...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "ошибка записи настроек в файл\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "Соединение IMAP4 с %s прервано. Восстановление соединения...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Каталог сервера IMAP4"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "установление соединения IMAP4 с %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Не удалось начать сеанс TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Отправка сообщения (%d / %d байт)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Копирование сообщения %s%c%d в %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Копирование сообщения %s%c%d в %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Получение сообщений с %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "не удалось установить флаг удаления: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "не удалось очистить папку от удаленных сообщений\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Получение сообщений с %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "не удалось установить флаг удаления: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "невозможно закрыть папку\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "корневая папка %s не существует\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "произошла ошибка при получении LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Ошибка при создании '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Ошибка при создании '%s' внутри INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "не удается создать почтовый ящик: ошибка LIST\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "не удается создать почтовый ящик\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "не удается переименовать почтовый ящик %s в %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "не удается удалить почтовый ящик\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "не удалось получить данные конверта\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Отправка сообщения (%d / %d байт)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "ошибка при получении данных конверта.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "ошибка при разборе данных конверта: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "не удалось получить пространство имен\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "невозможно выбрать папку: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "Ошибка аутентификации IMAP4.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Ошибка авторизации IMAP4.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "не удалось добавить %s к %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(передача файла...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "не удалось добавить сообщение к %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "не удалось скопировать %s в %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "ошибка преобразования iconv из %s в UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "не удалось скопировать сообщение %s в %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Не удалось открыть файл пометок.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "исходная папка совпадает с папкой назначения.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Копирование сообщения %s%c%d в %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Последний номер в каталоге %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Файл '%s' существует.\n"
+"Нельзя создать папку."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "соединение NNTP с %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "Потеряно соединение NNTP с %s:%d. Попытка восстановления...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "статья %d уже в кеше.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "получение статьи %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "ошибка чтения статьи %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "ошибка получения списка групп новостей\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "ошибка отправки статьи.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "ошибка получения статьи %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "не удалось выбрать группу: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "неверный диапазон статей: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "новых статей нет.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "загрузка xover %d - %d в %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "не удалось загрузить xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "произошла ошибка при получении xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "неверная строка xover: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "не удалось загрузить xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "произошла ошибка при получении xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Ошибка соединения с сервером NNTP: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "ошибка протокола: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "ошибка протокола\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Произошла ошибка при отправке статьи\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Произошла ошибка при передаче команды.\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "В сообщении сервера не найдена требуемая метка времени APOP\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Ошибка синтаксиса метки времени в сообщении сервера\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Ошибка протокола POP3\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "неверный ответ UIDL: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Удаление устаревшего сообщения %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Пропускается сообщение %d (%d байт)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "почтовый ящик занят\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "время сеанса истекло\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "не удалось начать сеанс TLS\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "ошибка при аутентификации\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "команда не поддерживается\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "ошибка сеанса POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -32,6 +415,53 @@ msgstr "Найдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройки сохранены.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "папку:"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "ошибка открытия файла пометок\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "не удалось получить сообщение %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Ошибка получения части текста\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Неправильная команда печати: '%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "произошла ошибка при получении данных.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Ошибка записи в файл.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "Аутентификация SMTP недоступна\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "неверный ответ SMTP\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "ошибка сеанса SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 недоступен\n"
@@ -164,79 +594,6 @@ msgstr ""
 "лицензии GNU; если этого не случилось, -- напишите в Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Чтение настроек учетных записей...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Некоторые окна с неотправленными сообщениями открыты.\n"
-"Пожалуйста, закройте их перед изменением учетных записей."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Открытие окна редактирования учетных записей...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Создание окна редактирования учетных записей...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Редактирование учетных записей"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Новые сообщения будут приниматься в указанном порядке.\n"
-"Пометьте в колонке 'G' учетные записи, которые нужно проверять\n"
-"по команде 'Получить все'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Имя"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Протокол"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Сервер"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Изменить"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Установить учетную запись по умолчанию "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Вы действительно хотите удалить эту запись?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Без названия"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Удалить учетную запись"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -336,6 +693,14 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Имя"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -350,8 +715,8 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/Файл"
 
@@ -372,9 +737,9 @@ msgid "/_File/New _Server"
 msgstr "/Файл/Новый сервер"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -390,7 +755,7 @@ msgstr "/Файл/Удалить"
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
@@ -422,8 +787,8 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/Инструменты"
 
@@ -431,13 +796,13 @@ msgstr "/Инструменты"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
@@ -454,17 +819,17 @@ msgid "/New _Folder"
 msgstr "/Новая папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Правка"
 
@@ -476,7 +841,7 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -486,14 +851,14 @@ msgstr "Имя:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Удалить"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -504,11 +869,11 @@ msgid "Lookup"
 msgstr "Найти"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Копия:"
 
@@ -534,7 +899,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -647,7 +1012,7 @@ msgstr "Ошибка преобразования адресной книги"
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -667,8 +1032,7 @@ msgstr "Адрес E-Mail"
 msgid "Group"
 msgstr "Группа"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Папка"
 
@@ -692,15 +1056,15 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Ошибка"
 
@@ -755,8 +1119,8 @@ msgstr "/Добавить..."
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
@@ -796,8 +1160,8 @@ msgstr "/Правка/Откат"
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Откат отката"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Правка/---"
 
@@ -805,7 +1169,7 @@ msgstr "/Правка/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
@@ -817,7 +1181,7 @@ msgstr "/Правка/Вставить"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить все"
 
@@ -833,7 +1197,7 @@ msgstr "/Правка/Отформатировать все сообщение"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Вид"
@@ -855,9 +1219,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/Вид/---"
 
@@ -873,7 +1237,7 @@ msgstr "/Вид/Линейка"
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Сортировка/По убыванию"
@@ -885,127 +1249,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллическая (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Русская (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Украинская (KOI8-_U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Традиционная китайская (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вид/Кодировка/Традиционная китайская (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
@@ -1013,14 +1377,14 @@ msgstr "/Инструменты/Адресная книга"
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
@@ -1041,10 +1405,6 @@ msgstr "/Инструменты/Шифровать сообщение (PGP)"
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Ошибка получения части текста\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
@@ -1121,7 +1481,7 @@ msgstr ""
 "Учетная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите ее перед отправкой."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
@@ -1213,8 +1573,7 @@ msgstr "Тип MIME"
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Отправить"
 
@@ -1254,8 +1613,7 @@ msgstr "Вложение"
 msgid "Attach file"
 msgstr "Вложить файл"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Подпись"
 
@@ -1263,7 +1621,7 @@ msgstr "Подпись"
 msgid "Insert signature"
 msgstr "Добавить подпись"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Редактор"
 
@@ -1460,7 +1818,7 @@ msgstr "Изменить"
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Значение"
 
@@ -1493,7 +1851,6 @@ msgid " Check File "
 msgstr " Проверить файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Файл"
 
@@ -1549,12 +1906,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -1571,7 +1928,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1635,7 +1992,7 @@ msgstr "Тайм-аут (сек)"
 msgid "Maximum Entries"
 msgstr "Максимальный размер результата"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Основные"
 
@@ -1693,7 +2050,6 @@ msgid "Exporting file:"
 msgstr "Экспортировать в файл:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Выбор... "
 
@@ -1717,161 +2073,161 @@ msgstr "Переписать существующий файл?"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку '%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Создать новую папку..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Переименовать папку..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Переименовать папку..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Удалить папку"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Очистить корзину"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Проверить новые сообщения"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Перестроить дерево папок"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Поиск сообщений..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Загрузить"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Подписка на группу новостей..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Удалить группу новостей"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Создание области просмотра папок...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Новые"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочитанные"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Установка информации о папке...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из '%s'."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1881,21 +2237,21 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте '/' в конец имени)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для '%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1906,21 +2262,21 @@ msgstr ""
 "Все вложенные папки и сообщения из '%s' будут удалены.\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1929,34 +2285,34 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учетную запись IMAP4 '%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Удалить учетную запись IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей '%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учетную запись новостей '%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Удалить учетную запись новостей"
 
@@ -2017,7 +2373,7 @@ msgstr "%d групп новостей (%s загружено)"
 msgid "Newsgroups:"
 msgstr "Группы новостей:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -2041,160 +2397,6 @@ msgstr "Создание области просмотра изображени�
 msgid "Can't load the image."
 msgstr "Ошибка загрузки изображения"
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Соединение IMAP4 с %s прервано. Восстановление соединения...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Каталог сервера IMAP4"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "установление соединения IMAP4 с %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Не удалось начать сеанс TLS.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "не удалось установить флаг удаления: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "не удалось очистить папку от удаленных сообщений\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "не удалось установить флаг удаления: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "невозможно закрыть папку\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "корневая папка %s не существует\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "произошла ошибка при получении LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Ошибка при создании '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Ошибка при создании '%s' внутри INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "не удается создать почтовый ящик: ошибка LIST\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "не удается создать почтовый ящик\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "не удается переименовать почтовый ящик %s в %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "не удается удалить почтовый ящик\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "не удалось получить данные конверта\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "ошибка при получении данных конверта.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "ошибка при разборе данных конверта: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "не удалось получить пространство имен\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "невозможно выбрать папку: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "Ошибка аутентификации IMAP4.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Ошибка авторизации IMAP4.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "не удалось добавить %s к %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(передача файла...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "не удалось добавить сообщение к %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "не удалось скопировать %s в %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "ошибка преобразования iconv из %s в UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Импорт"
@@ -2292,7 +2494,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Далее"
 
@@ -2308,143 +2510,143 @@ msgstr "Атрибуты"
 msgid "Finish"
 msgstr "Завершение"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Старая Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Выполнено (принято сообщений: %d (%s))"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Выполнено (нет новых сообщений)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учетной записи %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединение с сервером POP3: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Прием (принято сообщений: %d (%s))"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2453,28 +2655,28 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Не осталось места на диске."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2483,11 +2685,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2496,15 +2698,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Прием сообщений прерван\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -2522,29 +2724,20 @@ msgstr "Ввод пароля"
 msgid "Protocol log"
 msgstr "Журнал"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Файл '%s' существует.\n"
-"Нельзя создать папку."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не поддерживается в glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Использование: %s [ПАРАМЕТР]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрес]      открыть окно подготовки сообщения"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2554,24 +2747,24 @@ msgstr ""
 "                         открыть окно создания сообщения с присоединенными\n"
 "                         файлами"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              получить новые сообщения"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          получить новые сообщения со всех учетных записей"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 отослать все сообщения из очереди"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...    вывести суммарное количество сообщений"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2579,24 +2772,24 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         вывести состояние указанных папок"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим отладки"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 отобразить это описание и выйти"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              вывести информацию о версии и выйти"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Кодировка отправляемых сообщений"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2610,19 +2803,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Есть редактируемое сообщение. Выходить?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Сообщения в очереди"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди есть непосланные сообщения. Выходить?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2631,643 +2824,643 @@ msgstr ""
 "Поддержка OpenPGP отключена."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Настройка действий"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Создать новую папку..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Удалить папку"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Почтовый ящик"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Почтовый ящик/Добавить почтовый ящик..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Почтовый ящик/Удалить почтовый ящик"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Почтовый ящик/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения во всех папках"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Почтовый ящик/Перестроить дерево папок"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Импорт mbox-файла..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Экспорт в mbox-файл..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Очистить все корзины"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/Файл/Сохранить как..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/Файл/Печать..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/Файл/Работать автономно"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/Файл/Выход"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/Правка/Выделить обсуждение"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Правка/Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/Правка/Поиск сообщений..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/Вид/Показать или скрыть"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вид/Показать или скрыть/Дерево папок"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вид/Показать или скрыть/Область просмотра"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вид/Показать или скрыть/Панель инструментов"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы и текст"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Текст"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Не показывать"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/Вид/Отдельное дерево папок"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Вид/Отдельная область просмотра"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/Вид/Сортировка"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/Вид/Сортировка/По номеру"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вид/Сортировка/По размеру"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/Вид/Сортировка/По дате"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/Вид/Сортировка/По отправителю"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вид/Сортировка/По получателю"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вид/Сортировка/По теме"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вид/Сортировка/По выделению цветом"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вид/Сортировка/По отметке"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вид/Сортировка/По непрочитанным"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вид/Сортировка/По вложениям"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вид/Сортировка/Без сортировки"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/Вид/Сортировка/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вид/Сортировка/По возрастанию"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вид/Сортировка/Группировка по теме"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/Вид/Группировка по дискуссиям"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/Вид/Развернуть все обсуждения"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вид/Свернуть все обсуждения"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/Вид/Установить видимые поля..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/Вид/Перейти"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вид/Перейти/Предыдущее сообщение"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вид/Перейти/Следующее сообщение"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/Вид/Перейти/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вид/Перейти/Предыдущее непрочитанное сообщение"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вид/Перейти/Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вид/Перейти/Предыдущее новое сообщение"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вид/Перейти/Следующее новое сообщение"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вид/Перейти/Предыдущее отмеченное сообщение"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вид/Перейти/Следующее отмеченное сообщение"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вид/Перейти/Предыдущее выделенное цветом сообщение"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вид/Перейти/Следующее выделенное цветом сообщение"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/Вид/Показать все заголовки"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/Сообщение"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/Сообщение/Получить"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Сообщение/Получить/Получить с текущей учетной записи"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учетных записей"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/Сообщение/Получить/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/Сообщение/Отправить сообщения из очереди"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/Сообщение/Переместить..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/Сообщение/Копировать..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/Сообщение/Удалить"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/Сообщение/Отметить"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Сообщение/Отметить/Отметить"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/Сообщение/Отметить/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Сообщение/Отметить/Пометить как непрочитанное"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Сообщение/Отметить/Пометить как прочитанное"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Сообщение/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/Инструменты/Выполнить"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/Инструменты/Окно журнала"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/Настройка"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Настройка/Настройка фильтров..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/Настройка/Шаблоны..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/Настройка/Действия..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/Настройка/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Настройка/Настройка текущей учетной записи... "
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/Настройка/Создать новую учетную запись..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Настройка/Редактирование учетных записей..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/Настройка/Переключить текущую учетную запись"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/Справка/Руководство"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/Справка/Руководство/Английское"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Справка/Руководство/Японское"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/Справка/FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/Справка/FAQ/Английский"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/Справка/FAQ/Немецкий"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Справка/FAQ/Испанский"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/Справка/FAQ/Французский"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Справка/FAQ/Итальянский"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3277,16 +3470,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3296,151 +3489,150 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "По умолчанию"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
@@ -3559,32 +3751,32 @@ msgstr "Достигнут конец сообщения; продолжить �
 msgid "Search finished"
 msgstr "Поиск закончен"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Создание области просмотра сообщения...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Вложения"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла '%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3593,7 +3785,7 @@ msgstr ""
 "Введите команду печати:\n"
 "('%s' будет заменено на имя файла)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3602,41 +3794,6 @@ msgstr ""
 "Неправильная команда печати:\n"
 "'%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "не удалось скопировать сообщение %s в %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Не удалось открыть файл пометок.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "исходная папка совпадает с папкой назначения.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Копирование сообщения %s%c%d в %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Последний номер в каталоге %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/Открыть"
@@ -3723,115 +3880,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Неверная команда просмотра MIME: '%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "соединение NNTP с %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "Потеряно соединение NNTP с %s:%d. Попытка восстановления...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "статья %d уже в кеше.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "получение статьи %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "ошибка чтения статьи %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "ошибка получения списка групп новостей\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "ошибка отправки статьи.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "ошибка получения статьи %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "не удалось выбрать группу: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "неверный диапазон статей: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "новых статей нет.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "загрузка xover %d - %d в %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "не удалось загрузить xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "произошла ошибка при получении xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "неверная строка xover: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "не удалось загрузить xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "произошла ошибка при получении xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Ошибка соединения с сервером NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "ошибка протокола: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "ошибка протокола\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Произошла ошибка при отправке статьи\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Произошла ошибка при передаче команды.\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[нет идентификатора пользователя]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3844,7 +3901,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3852,454 +3909,6 @@ msgstr ""
 "Неверно! Повторите...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "В сообщении сервера не найдена требуемая метка времени APOP\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Ошибка синтаксиса метки времени в сообщении сервера\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Ошибка протокола POP3\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "неверный ответ UIDL: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Удаление устаревшего сообщения %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Пропускается сообщение %d (%d байт)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "почтовый ящик занят\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "время сеанса истекло\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "не удалось начать сеанс TLS\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "ошибка при аутентификации\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "команда не поддерживается\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "ошибка сеанса POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Открытие окна настроек учетной записи...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Учетная запись %d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Настройки новой учетной записи"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Настройки учетной записи"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Создание окна настроек учетной записи...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Прием"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Защита"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Дополнительные"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Имя учетной записи"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "По умолчанию"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Личная информация"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Полное имя"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Адрес E-Mail"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Организация"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Сведения о серверах"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Новостной (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Нет (локальный)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Этот сервер требует аутентификации"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Сервер новостей"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Сервер для приема"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Сервер SMTP (отправка)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "ID пользователя"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Пароль"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Использовать безопасную аутентификацию (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Удалять сообщения с сервера после приема"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Удалить через"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "дней"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 дней: удалить немедленно)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Принимать все сообщения с сервера"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Ограничить размер принимаемых сообщений"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "кб"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Фильтровать сообщения при приеме"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Папка для входящих сообщений"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Неотфильтрованные сообщения будут сохранены в этой папке)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Метод аутентификации"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Автоматически"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Новости"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Наибольшее число статей для загрузки\n"
-"(не ограничено, если указан 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Получатель сообщения не указан."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "Проверять по команде 'Получить все'"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Заголовок"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Добавить в заголовок поле Date"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Создавать Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Добавить дополнительные заголовки"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Определить... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Аутентификация"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Аутентификация SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Если оставить эти поля пустыми, будут использоваться\n"
-"имя пользователя и пароль, заданные для приема почты."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Проверка пароля через POP3 перед отправкой"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Вывод команды"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Автоматически устанавливать адреса"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Копия"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Скрытно"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Обратный адрес"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Подписывать сообщения по умолчанию"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Шифровать сообщения по умолчанию"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Использовать ASCII-кодирование при шифровании"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Использовать открытую текстовую подпись"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Ключ подписи"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Ключ GnuPG по умолчанию"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Ключ для выбранного адреса E-mail"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Другой ключ"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "ID пользователя ключа:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Не использовать SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Использовать SSL для соединения POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Использовать команду STARTTLS для начала сеанса SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Использовать SSL для соединения IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Использовать SSL для соединения NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Отправка (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Использовать SSL для соединения SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Использовать неблокирующий режим SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(Выключите эту опцию, если возникают проблемы при использовании SSL)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Порт SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Порт POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Порт IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Порт NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Имя домена"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Каталог сервера IMAP4"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Сохранять отправленные сообщения в"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Сохранять черновики в"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Сохранять удаленные сообщения в"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Не указано имя учетной записи."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Не указан адрес."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Не указан сервер SMTP."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Не указан идентификатор пользователя."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Не указан сервер POP3."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Не указан сервер IMAP4."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Не указан сервер NNTP."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Использование устаревшего ASCII-кодирования зашифрованных\n"
-"сообщений не рекомендуется. Этот формат не соответствует\n"
-"RFC 3156 - MIME Security with OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Настройка действий"
@@ -4364,17 +3973,17 @@ msgstr " Описание синтаксиса "
 msgid "Registered actions"
 msgstr "Зарегистрированные действия"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Вверх"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Вниз"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Новое)"
 
@@ -4416,837 +4025,31 @@ msgstr "Удалить действие"
 msgid "Do you really want to delete this action?"
 msgstr "Вы действительно хотите удалить это действие?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "папку:"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Создание окна общих настроек...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Общие настройки"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Цитирование"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Отображение"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Сообщение"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Другое"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Использовать внешнюю программу для приема"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Команда"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Принимать из спула"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Фильтровать при приеме"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Путь к спулу"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Проверять приход новых сообщений"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "каждые"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "минут"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Проверять приход новых сообщений при запуске"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Обновить все локальные папки после приема"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Немедленно выполнять перемещение и удаление сообщений"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Получение количества новых сообщений (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Использовать внешнюю программу для отправки"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Сохранять отправленные сообщения в папке \"Отправленные\""
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Кодировка отправляемых сообщений"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Автоматически (Рекомендуется)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7 бит ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Западноевропейская (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Западноевропейская (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Центральноевропейская (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Балтийская (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Балтийская (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Греческая (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Греческая (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Кириллица Win (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Турецкая (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Кириллица (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Русская (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Украинская (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Кириллица Win (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Японская (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Японская (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Японская (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Упрощенная китайская (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Упрощенная китайская (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Традиционная китайская (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Традиционная китайская (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Китайская (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Корейская (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Тайская (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Тайская (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"При выборе варианта 'Автоматически' будет использована\n"
-"оптимальная кодировка для текущего языка и страны."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Кодирование текста сообщений"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Укажите метод кодирования текстов сообщений, содержащих символы\n"
-"не из диапазона ASCII (Content-Transfer-Encoding)."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Разделитель подписи"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Добавлять автоматически"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Автоматически запускать внешний редактор"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Число уровней отката"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Переносить строки с"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "символа"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Переносить цитаты"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Переносить при вводе"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Переносить перед отправкой"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Автоматически выбирать учетную запись при ответе"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Цитировать при ответе"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "По кнопке \"Ответить\" отвечать в список рассылки"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Формат ответа"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Знак цитаты"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Формат пересылаемого сообщения"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Описание символов "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Шрифт"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Переводить имена заголовков ('From:', 'Subject:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Показывать число непрочитанных сообщений рядом с именем папки"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Сокращать названия групп новостей длиннее"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "букв"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Список сообщений"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Показывать получателя в колонке 'От', если отправитель - Вы"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Разворачивать обсуждения"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Формат даты"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr "Установить показываемые поля..."
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Разрешить раскраску сообщений"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Отображать многобайтовые алфавитно-цифровые символы\n"
-"как ASCII (только для японских кодировок)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Показывать панель заголовков над областью просмотра сообщений"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Показывать сокращенные заголовки при просмотре сообщений"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Показывать сокращенные заголовки при просмотре сообщений"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Расстояние между строками"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "пикселей"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Прокрутка"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Половина страницы"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Плавная прокрутка"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Шаг"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Масштабировать присоединенные изображения по размеру окна"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Настройка отображения заголовков"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Выполнить команду"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Выполнить команду"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "папку:"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Фильтровать сообщения при приеме"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Неотфильтрованные сообщения будут сохранены в этой папке)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Автоматически проверять подписи"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Показывать результат проверки подписи в отдельном окне"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Сохранять парольную фразу в памяти"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Удалять через"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "минут"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(При установке в 0 парольная фраза будет храниться\n"
-" в течение всего сеанса)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Захватить ввод при запросе пароля"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Выводить предупреждение при запуске, если GnuPG не работает"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Открыть первое непрочитанное сообщение при входе в папку"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Помечать сообщение как прочитанное только после открытия в новом окне"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Перейти в папку \"Входящие\" после приема новых сообщений"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Немедленно выполнять перемещение и удаление сообщений"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Сообщения будут просто помечены до выполнения, если\n"
-" эта опция не включена)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Окно приема сообщений"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Показывать окно приема сообщений"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Всегда"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Только при ручном запуске приема"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Никогда"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Не отображать сообщение об ошибке при получении сообщений"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Закрывать окно приема сообщений после завершения"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Установить клавиатурные команды... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Внешние команды (%s будет заменен на имя файла/URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Web-браузер"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Добавлять адрес в список адресатов по двойному щелчку"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "При выходе"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Подтверждение при выходе"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Очищать корзину при выходе"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Спрашивать перед очисткой"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Предупреждать о наличии сообщений в очереди"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Запись кеша списка (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Время ожидания ответа из сети:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "секунд"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "сокращенное название дня недели"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "полное название дня недели"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "сокращенное название месяца"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "полное название месяца"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "предпочтительный формат даты и времени для выбранной страны"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "век (год/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "день месяца"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "час, 24-часовое представление"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "час, 12-часовое представление"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "день года"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "номер месяца"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "минута"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM или PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "секунда"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "номер дня недели"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "предпочтительный формат даты для выбранной страны"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "последние две цифры года"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "год полностью"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "имя или сокращение временной зоны"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Элемент формата"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Описание"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Пример"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Настройка цветов сообщений"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Цвета"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Цитата - Первый уровень"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Цитата - Второй уровень"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Цитата - Третий уровень"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "Ссылка (URI)"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Циклически использовать цвета цитат"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Выберите цвет для цитат уровня 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Выберите цвет для цитат уровня 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Выберите цвет для цитат уровня 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Выберите цвет для ссылок (URI)"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Описание символов"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Дата\n"
-"Отправитель\n"
-"Полное имя отправителя\n"
-"Фамилия отправителя\n"
-"Инициалы отправителя\n"
-"Тема\n"
-"Кому\n"
-"Копия\n"
-"Группы новостей\n"
-"Message-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Если x установлено, отображает expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Содержимое сообщения\n"
-"Содержимое сообщения со знаком цитаты\n"
-"Содержимое сообщения без подписи\n"
-"Содержимое сообщения без подписи со знаком цитаты\n"
-"Символ '%'"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Символ '\\'\n"
-"Символ '?'\n"
-"Символ '{'\n"
-"Символ '}'"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Клавиатурные команды"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Выберите одну из стандартных настроек для клавиатурных команд.\n"
-"Чтобы назначить или изменить комбинацию клавиш для команды меню,\n"
-"нажмите эту клавишу (или комбинацию клавиш), установив указатель\n"
-"на нужную команду в меню."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "По умолчанию"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Старая Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Настройка дополнительных заголовков"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Заголовок"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr "Удалить"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Дополнительные заголовки"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Имя заголовка не указано."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Удалить заголовок"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Удалить этот заголовок?"
 
@@ -5294,12 +4097,21 @@ msgstr "Настройка фильтров"
 msgid "Enabled"
 msgstr "Вкл."
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Изменить"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Вы хотите удалить правило?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Без названия"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Удаление правила"
 
@@ -5383,6 +4195,10 @@ msgstr "больше, чем"
 msgid "is shorter than"
 msgstr "меньше, чем"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "кб"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Переместить в"
@@ -5505,6 +4321,10 @@ msgstr "Удалять [...] или (...) в начале темы сообще�
 msgid "Apply to subfolders"
 msgstr "Применять к вложенным папкам"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Автоматически устанавливать адреса"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "также использовать при ответе"
@@ -5579,64 +4399,46 @@ msgstr "Отображаемые элементы"
 msgid " Revert to default "
 msgstr " Вернуть стандартные настройки "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Название шаблона"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Добавить"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr "Заменить"
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Символы "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Зарегистрированные шаблоны"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Неверный формат шаблона."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Удалить шаблон"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Удалить этот шаблон?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "ошибка открытия файла пометок\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "не удалось получить сообщение %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Неправильная команда печати: '%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Создание диалогового окна прогресса...\n"
@@ -5645,29 +4447,21 @@ msgstr "Создание диалогового окна прогресса...\n
 msgid "Status"
 msgstr "Состояние"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "произошла ошибка при получении данных.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Ошибка записи в файл.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Не найден идентификатор пользователя для этого ключа."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Подпись создана %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Ошибка проверки подписи"
 
@@ -5693,6 +4487,10 @@ msgstr "ID ключа"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Другое"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Добавить ключ"
@@ -5713,84 +4511,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок сообщения в очереди испорчен.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Выполнить команду"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Произошла ошибка при передаче команды.\n"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Соединение с сервером SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Передача HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Передача EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Передача MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Отправка"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Передача RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Отправка данных..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Произошла ошибка при отправке сообщения."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5892,32 +4690,20 @@ msgstr "ПЛОХАЯ подпись"
 msgid "No public key to verify the signature"
 msgstr "Нет ключа для проверки подписи"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "Аутентификация SMTP недоступна\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "неверный ответ SMTP\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "ошибка сеанса SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Создание окна просмотра исходного текста...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Исходный текст сообщения"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Отображение исходного текста %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Исходный текст"
@@ -6313,6 +5099,925 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Некоторые окна с неотправленными сообщениями открыты.\n"
+#~ "Пожалуйста, закройте их перед изменением учетных записей."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Открытие окна редактирования учетных записей...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Создание окна редактирования учетных записей...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Редактирование учетных записей"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Новые сообщения будут приниматься в указанном порядке.\n"
+#~ "Пометьте в колонке 'G' учетные записи, которые нужно проверять\n"
+#~ "по команде 'Получить все'."
+
+#~ msgid "Protocol"
+#~ msgstr "Протокол"
+
+#~ msgid "Server"
+#~ msgstr "Сервер"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Установить учетную запись по умолчанию "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Вы действительно хотите удалить эту запись?"
+
+#~ msgid "Delete account"
+#~ msgstr "Удалить учетную запись"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Открытие окна настроек учетной записи...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Учетная запись %d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Настройки новой учетной записи"
+
+#~ msgid "Account preferences"
+#~ msgstr "Настройки учетной записи"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Создание окна настроек учетной записи...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Прием"
+
+#~ msgid "Privacy"
+#~ msgstr "Защита"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Дополнительные"
+
+#~ msgid "Name of this account"
+#~ msgstr "Имя учетной записи"
+
+#~ msgid "Set as default"
+#~ msgstr "По умолчанию"
+
+#~ msgid "Personal information"
+#~ msgstr "Личная информация"
+
+#~ msgid "Full name"
+#~ msgstr "Полное имя"
+
+#~ msgid "Mail address"
+#~ msgstr "Адрес E-Mail"
+
+#~ msgid "Organization"
+#~ msgstr "Организация"
+
+#~ msgid "Server information"
+#~ msgstr "Сведения о серверах"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Новостной (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Нет (локальный)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Этот сервер требует аутентификации"
+
+#~ msgid "News server"
+#~ msgstr "Сервер новостей"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Сервер для приема"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Сервер SMTP (отправка)"
+
+#~ msgid "User ID"
+#~ msgstr "ID пользователя"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Использовать безопасную аутентификацию (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Удалять сообщения с сервера после приема"
+
+#~ msgid "Remove after"
+#~ msgstr "Удалить через"
+
+#~ msgid "days"
+#~ msgstr "дней"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 дней: удалить немедленно)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Принимать все сообщения с сервера"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Ограничить размер принимаемых сообщений"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Фильтровать сообщения при приеме"
+
+#~ msgid "Default inbox"
+#~ msgstr "Папка для входящих сообщений"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Неотфильтрованные сообщения будут сохранены в этой папке)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Метод аутентификации"
+
+#~ msgid "Automatic"
+#~ msgstr "Автоматически"
+
+#~ msgid "News"
+#~ msgstr "Новости"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Наибольшее число статей для загрузки\n"
+#~ "(не ограничено, если указан 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Получатель сообщения не указан."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "Проверять по команде 'Получить все'"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Добавить в заголовок поле Date"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Создавать Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Добавить дополнительные заголовки"
+
+#~ msgid " Edit... "
+#~ msgstr " Определить... "
+
+#~ msgid "Authentication"
+#~ msgstr "Аутентификация"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Аутентификация SMTP (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Если оставить эти поля пустыми, будут использоваться\n"
+#~ "имя пользователя и пароль, заданные для приема почты."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Проверка пароля через POP3 перед отправкой"
+
+#~ msgid "Command output"
+#~ msgstr "Вывод команды"
+
+#~ msgid "Cc"
+#~ msgstr "Копия"
+
+#~ msgid "Bcc"
+#~ msgstr "Скрытно"
+
+#~ msgid "Reply-To"
+#~ msgstr "Обратный адрес"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Подписывать сообщения по умолчанию"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Шифровать сообщения по умолчанию"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Использовать ASCII-кодирование при шифровании"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Использовать открытую текстовую подпись"
+
+#~ msgid "Sign key"
+#~ msgstr "Ключ подписи"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Ключ GnuPG по умолчанию"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Ключ для выбранного адреса E-mail"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Другой ключ"
+
+#~ msgid "User or key ID:"
+#~ msgstr "ID пользователя ключа:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Не использовать SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Использовать SSL для соединения POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Использовать команду STARTTLS для начала сеанса SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Использовать SSL для соединения IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Использовать SSL для соединения NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Отправка (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Использовать SSL для соединения SMTP"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Использовать неблокирующий режим SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr ""
+#~ "(Выключите эту опцию, если возникают проблемы при использовании SSL)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Порт SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Порт POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Порт IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Порт NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Имя домена"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Каталог сервера IMAP4"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Сохранять отправленные сообщения в"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Сохранять черновики в"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Сохранять удаленные сообщения в"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Не указано имя учетной записи."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Не указан адрес."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Не указан сервер SMTP."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Не указан идентификатор пользователя."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Не указан сервер POP3."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Не указан сервер IMAP4."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Не указан сервер NNTP."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Использование устаревшего ASCII-кодирования зашифрованных\n"
+#~ "сообщений не рекомендуется. Этот формат не соответствует\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Создание окна общих настроек...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Общие настройки"
+
+#~ msgid "Quote"
+#~ msgstr "Цитирование"
+
+#~ msgid "Display"
+#~ msgstr "Отображение"
+
+#~ msgid "Message"
+#~ msgstr "Сообщение"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Использовать внешнюю программу для приема"
+
+#~ msgid "Command"
+#~ msgstr "Команда"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Принимать из спула"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Фильтровать при приеме"
+
+#~ msgid "Spool path"
+#~ msgstr "Путь к спулу"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Проверять приход новых сообщений"
+
+#~ msgid "every"
+#~ msgstr "каждые"
+
+#~ msgid "minute(s)"
+#~ msgstr "минут"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Проверять приход новых сообщений при запуске"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Обновить все локальные папки после приема"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Немедленно выполнять перемещение и удаление сообщений"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Получение количества новых сообщений (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Использовать внешнюю программу для отправки"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Сохранять отправленные сообщения в папке \"Отправленные\""
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Кодировка отправляемых сообщений"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Автоматически (Рекомендуется)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7 бит ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Западноевропейская (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Западноевропейская (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Центральноевропейская (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Балтийская (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Балтийская (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Греческая (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Греческая (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Кириллица Win (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Турецкая (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Кириллица (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Русская (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Украинская (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Кириллица Win (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Японская (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Японская (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Японская (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Упрощенная китайская (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Упрощенная китайская (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Традиционная китайская (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Традиционная китайская (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Китайская (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Корейская (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Тайская (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Тайская (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "При выборе варианта 'Автоматически' будет использована\n"
+#~ "оптимальная кодировка для текущего языка и страны."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Кодирование текста сообщений"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Укажите метод кодирования текстов сообщений, содержащих символы\n"
+#~ "не из диапазона ASCII (Content-Transfer-Encoding)."
+
+#~ msgid "Signature separator"
+#~ msgstr "Разделитель подписи"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Добавлять автоматически"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Автоматически запускать внешний редактор"
+
+#~ msgid "Undo level"
+#~ msgstr "Число уровней отката"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Переносить строки с"
+
+#~ msgid "characters"
+#~ msgstr "символа"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Переносить цитаты"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Переносить при вводе"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Переносить перед отправкой"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Автоматически выбирать учетную запись при ответе"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Цитировать при ответе"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "По кнопке \"Ответить\" отвечать в список рассылки"
+
+#~ msgid "Reply format"
+#~ msgstr "Формат ответа"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Знак цитаты"
+
+#~ msgid "Forward format"
+#~ msgstr "Формат пересылаемого сообщения"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Описание символов "
+
+#~ msgid "Font"
+#~ msgstr "Шрифт"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Переводить имена заголовков ('From:', 'Subject:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Показывать число непрочитанных сообщений рядом с именем папки"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Сокращать названия групп новостей длиннее"
+
+#~ msgid "letters"
+#~ msgstr "букв"
+
+#~ msgid "Summary View"
+#~ msgstr "Список сообщений"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Показывать получателя в колонке 'От', если отправитель - Вы"
+
+#~ msgid "Expand threads"
+#~ msgstr "Разворачивать обсуждения"
+
+#~ msgid "Date format"
+#~ msgstr "Формат даты"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr "Установить показываемые поля..."
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Разрешить раскраску сообщений"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Отображать многобайтовые алфавитно-цифровые символы\n"
+#~ "как ASCII (только для японских кодировок)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Показывать панель заголовков над областью просмотра сообщений"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Показывать сокращенные заголовки при просмотре сообщений"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Показывать сокращенные заголовки при просмотре сообщений"
+
+#~ msgid "Line space"
+#~ msgstr "Расстояние между строками"
+
+#~ msgid "pixel(s)"
+#~ msgstr "пикселей"
+
+#~ msgid "Scroll"
+#~ msgstr "Прокрутка"
+
+#~ msgid "Half page"
+#~ msgstr "Половина страницы"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Плавная прокрутка"
+
+#~ msgid "Step"
+#~ msgstr "Шаг"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Масштабировать присоединенные изображения по размеру окна"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Настройка отображения заголовков"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Выполнить команду"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Выполнить команду"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "папку:"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Фильтровать сообщения при приеме"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Неотфильтрованные сообщения будут сохранены в этой папке)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Автоматически проверять подписи"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Показывать результат проверки подписи в отдельном окне"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Сохранять парольную фразу в памяти"
+
+#~ msgid "Expired after"
+#~ msgstr "Удалять через"
+
+#~ msgid "minute(s) "
+#~ msgstr "минут"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(При установке в 0 парольная фраза будет храниться\n"
+#~ " в течение всего сеанса)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Захватить ввод при запросе пароля"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Выводить предупреждение при запуске, если GnuPG не работает"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Открыть первое непрочитанное сообщение при входе в папку"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr ""
+#~ "Помечать сообщение как прочитанное только после открытия в новом окне"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Перейти в папку \"Входящие\" после приема новых сообщений"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Немедленно выполнять перемещение и удаление сообщений"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Сообщения будут просто помечены до выполнения, если\n"
+#~ " эта опция не включена)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Окно приема сообщений"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Показывать окно приема сообщений"
+
+#~ msgid "Always"
+#~ msgstr "Всегда"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Только при ручном запуске приема"
+
+#~ msgid "Never"
+#~ msgstr "Никогда"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Не отображать сообщение об ошибке при получении сообщений"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Закрывать окно приема сообщений после завершения"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Установить клавиатурные команды... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Внешние команды (%s будет заменен на имя файла/URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Web-браузер"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Добавлять адрес в список адресатов по двойному щелчку"
+
+#~ msgid "On exit"
+#~ msgstr "При выходе"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Подтверждение при выходе"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Очищать корзину при выходе"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Спрашивать перед очисткой"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Предупреждать о наличии сообщений в очереди"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Запись кеша списка (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Время ожидания ответа из сети:"
+
+#~ msgid "second(s)"
+#~ msgstr "секунд"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "сокращенное название дня недели"
+
+#~ msgid "the full weekday name"
+#~ msgstr "полное название дня недели"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "сокращенное название месяца"
+
+#~ msgid "the full month name"
+#~ msgstr "полное название месяца"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "предпочтительный формат даты и времени для выбранной страны"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "век (год/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "день месяца"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "час, 24-часовое представление"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "час, 12-часовое представление"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "день года"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "номер месяца"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "минута"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM или PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "секунда"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "номер дня недели"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "предпочтительный формат даты для выбранной страны"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "последние две цифры года"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "год полностью"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "имя или сокращение временной зоны"
+
+#~ msgid "Specifier"
+#~ msgstr "Элемент формата"
+
+#~ msgid "Description"
+#~ msgstr "Описание"
+
+#~ msgid "Example"
+#~ msgstr "Пример"
+
+#~ msgid "Set message colors"
+#~ msgstr "Настройка цветов сообщений"
+
+#~ msgid "Colors"
+#~ msgstr "Цвета"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Цитата - Первый уровень"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Цитата - Второй уровень"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Цитата - Третий уровень"
+
+#~ msgid "URI link"
+#~ msgstr "Ссылка (URI)"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Циклически использовать цвета цитат"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Выберите цвет для цитат уровня 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Выберите цвет для цитат уровня 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Выберите цвет для цитат уровня 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Выберите цвет для ссылок (URI)"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Описание символов"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Дата\n"
+#~ "Отправитель\n"
+#~ "Полное имя отправителя\n"
+#~ "Фамилия отправителя\n"
+#~ "Инициалы отправителя\n"
+#~ "Тема\n"
+#~ "Кому\n"
+#~ "Копия\n"
+#~ "Группы новостей\n"
+#~ "Message-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Если x установлено, отображает expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Содержимое сообщения\n"
+#~ "Содержимое сообщения со знаком цитаты\n"
+#~ "Содержимое сообщения без подписи\n"
+#~ "Содержимое сообщения без подписи со знаком цитаты\n"
+#~ "Символ '%'"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Символ '\\'\n"
+#~ "Символ '?'\n"
+#~ "Символ '{'\n"
+#~ "Символ '}'"
+
+#~ msgid "Key bindings"
+#~ msgstr "Клавиатурные команды"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Выберите одну из стандартных настроек для клавиатурных команд.\n"
+#~ "Чтобы назначить или изменить комбинацию клавиш для команды меню,\n"
+#~ "нажмите эту клавишу (или комбинацию клавиш), установив указатель\n"
+#~ "на нужную команду в меню."
+
+#~ msgid "Default"
+#~ msgstr "По умолчанию"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Старая Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Выбор шрифта"
 
diff --git a/po/sk.po b/po/sk.po
index 3bf8e8ae..5153af39 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -16,13 +16,397 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Načítavam nastavenia pre všetky kontá...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "nepodarilo sa zapísať nastavenie do súboru\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Priečinok serveru IMAP"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "vytváram IMAP4 spojenie k %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Nedá sa vytvoriť TLS spojenie.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Odosielam správu (%d / %d bajtov)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Kopírujem správu %s%c%d do %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopírujem správu %s%c%d do %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Prijímam správy z %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "nedá sa nastaviť príznak zmazania: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "nedá sa odstrániť\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Prijímam správy z %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "priečinok sa nedá zatvoriť\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "koreňový priečinok %s neexistuje\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "pri príkaze LIST sa vyskytla chyba.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Nedá sa vytvoriť '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "nedá sa vytvoriť schránka\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "nedá sa premenovať schránka: %s na %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "schránka sa nedá odstrániť \n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "obálka sa nedá načítať\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Odosielam správu (%d / %d bajtov)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "pri získavaní obálky sa vyskytla chyba.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "obálka sa nedá prečítať: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "nedá sa nájsť obálka\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "priečinok sa nedá vytvoriť: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 autentizácia bola neúspešná.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "neúspešné prihlásenie k IMAP4.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "nedá sa napojiť %s k %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(posielam súbor...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "nedá sa napojiť správa k %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "nedá sa kopírovať %s do %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "chyba pri IMAP príkaze: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "nemôžem kopírovať správu %s do %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Nemôžem označiť súbor so značkami.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopírujem správu %s%c%d do %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Posledné číslo v priečinku %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Súbor '%s' už existuje.\n"
+"Priečinok sa nedá vytvoriť."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP spojenie k %s:%d bolo prerušené. Obnovujem spojenie...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "článok %d už je v medzipamäti.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "prijímam článok %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "nemôžem prečítať článok %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "nemôžem získať zoznam diskusných skupín\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "nemôžem odoslať článok.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "nemôžem prijať článok %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "nemôžem vybrať skupinu %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "neplatný rozsah článkov: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "žiadne nové články.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "prijímam xover %d - %d v %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "nemôžem prijať xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "pri prijímaní xover sa vyskytla chyba.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "neplatný xover riadok: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "nemôžem prijať xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "pri prijímaní xhdr sa vyskytla chyba.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "chyba protokolu: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "chyba protokolu\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Pri odosielaní sa vyskytla chyba\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Pri odosielaní správy nastala chyba."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "V pozdrave nebola nájdená vyžadovaná APOP časová značka\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Chybná časová značka v pozdrave\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Chyba protokolu POP3\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "neplatný xover riadok: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Odstraňujem starú správu %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Preskakujem správu %d (%d bajtov)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "mailbox je zamknutý\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "čas spojenia vypršal\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "nemôžem vytvoriť TLS reláciu\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "vyskytla sa chyba v autentizácii\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "príkaz nie je podporovaný\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "vyskytla sa chyba pri POP3 spojení\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -32,6 +416,53 @@ msgstr "Nájdené %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavenie uložené.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Priečinok"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "nemôžem otvoriť súbor so značkami\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "nedá sa prijať správa %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Nedá sa získať časť textu\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "pri prijímaní dát sa vyskytla chyba.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Do súboru sa nedá zapisovať.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH nie je dostupné\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "neplatná odozva SMTP\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "vyskytla sa chyba pri SMTP spojení\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nie je dostupné\n"
@@ -163,78 +594,6 @@ msgstr ""
 "programom. Ak to tak nie je, napíšte na adresu Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Načítavam nastavenia pre všetky kontá...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Sú otvorené okná s rozpísanými správami.\n"
-"Prosím zatvorte všetky tieto okná predtým, ako začnete meniť nastavenia kônt."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Otváram okno pre nastavenie konta...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Vytváram okno pre nastavenie konta...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Úprava kônt"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nové správy budú kontrolované v tomto poradí. Ak má byť konto kontrolované\n"
-"pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Meno"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Upraviť"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr "Nastaviť ako východzie konto"
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Naozaj chcete zmazať toto konto?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Bez názvu"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Zmazať konto"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -334,6 +693,14 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Meno"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -348,8 +715,8 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Súbor"
 
@@ -370,9 +737,9 @@ msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
@@ -388,7 +755,7 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
@@ -420,8 +787,8 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
@@ -429,13 +796,13 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
@@ -452,17 +819,17 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
@@ -474,7 +841,7 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -484,14 +851,14 @@ msgstr "Meno:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Zmazať"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -502,11 +869,11 @@ msgid "Lookup"
 msgstr "Vyhľadať"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Kópia:"
 
@@ -532,7 +899,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -646,7 +1013,7 @@ msgstr "Chyba pri konverzii adresára"
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Ovládanie"
 
@@ -666,8 +1033,7 @@ msgstr "E-mailová adresa"
 msgid "Group"
 msgstr "Skupina"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -691,15 +1057,15 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Chyba"
 
@@ -754,8 +1120,8 @@ msgstr "/_Pridať..."
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -799,8 +1165,8 @@ msgstr "/Úp_ravy"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
@@ -808,7 +1174,7 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
@@ -820,7 +1186,7 @@ msgstr "/Úp_ravy/_Prilepiť"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
@@ -837,7 +1203,7 @@ msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Zobraziť"
@@ -859,9 +1225,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
@@ -877,7 +1243,7 @@ msgstr "/_Zobraziť/P_ravítko"
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
@@ -889,127 +1255,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
@@ -1017,14 +1383,14 @@ msgstr "/_Nástroje/_Adresár"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
@@ -1048,10 +1414,6 @@ msgstr "/Sp_ráva/_Zašifrovať"
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Nedá sa získať časť textu\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
@@ -1128,7 +1490,7 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
@@ -1220,8 +1582,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Odoslať"
 
@@ -1261,8 +1622,7 @@ msgstr "Pripojiť"
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1270,7 +1630,7 @@ msgstr "Podpis"
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1467,7 +1827,7 @@ msgstr "Zmeniť"
 msgid "Clear"
 msgstr "Vyčistiť"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Hodnota"
 
@@ -1500,7 +1860,6 @@ msgid " Check File "
 msgstr "Testovať súbor"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Súbor"
 
@@ -1557,12 +1916,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -1579,7 +1938,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1643,7 +2002,7 @@ msgstr "Timeout (v sekundách)"
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Základné"
 
@@ -1701,7 +2060,6 @@ msgid "Exporting file:"
 msgstr "Exportovaný súbor:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "Zvoľte..."
 
@@ -1725,163 +2083,163 @@ msgstr "Prepísať existujúci súbor?"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Zmazať priečinok"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Vy_hľadať v správach..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žiadne neprečítané správy."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prih_lásiť sa do diskusnej skupiny"
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Odstrániť _diskusnú skupinu"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Vytváram náhľad pre priečinok...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nový"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Nastavujem informácie o priečinku...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1891,21 +2249,21 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1916,21 +2274,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1939,34 +2297,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2027,7 +2385,7 @@ msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Predmet:"
 
@@ -2051,160 +2409,6 @@ msgstr "Vytváram náhľad obrázku...\n"
 msgid "Can't load the image."
 msgstr "Nedá sa načítať obrázok."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Priečinok serveru IMAP"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "vytváram IMAP4 spojenie k %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Nedá sa vytvoriť TLS spojenie.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "nedá sa nastaviť príznak zmazania: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "nedá sa odstrániť\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "priečinok sa nedá zatvoriť\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "koreňový priečinok %s neexistuje\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "pri príkaze LIST sa vyskytla chyba.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Nedá sa vytvoriť '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "nedá sa vytvoriť schránka\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "nedá sa premenovať schránka: %s na %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "schránka sa nedá odstrániť \n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "obálka sa nedá načítať\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "pri získavaní obálky sa vyskytla chyba.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "obálka sa nedá prečítať: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "nedá sa nájsť obálka\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "priečinok sa nedá vytvoriť: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 autentizácia bola neúspešná.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "neúspešné prihlásenie k IMAP4.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "nedá sa napojiť %s k %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(posielam súbor...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "nedá sa napojiť správa k %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "nedá sa kopírovať %s do %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "chyba pri IMAP príkaze: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importovať"
@@ -2302,7 +2506,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2318,144 +2522,144 @@ msgstr "Atribúty"
 msgid "Finish"
 msgstr "Dokončiť"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Starší Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2464,28 +2668,28 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2494,11 +2698,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2507,16 +2711,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -2534,29 +2738,20 @@ msgstr "Zadajte heslo"
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Súbor '%s' už existuje.\n"
-"Priečinok sa nedá vytvoriť."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2567,23 +2762,23 @@ msgstr ""
 "uvedenými\n"
 "                         súbormi"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2591,25 +2786,25 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version                zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2623,19 +2818,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Máte rozpísanú správu. Naozaj ukončiť?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2644,654 +2839,654 @@ msgstr ""
 "Podpora OpenPGP je vypnutá."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Odstrániť schránku"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Súbor/P_riečinok/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Súbor/P_riečinok/Pri_jať nové správy vo všetkých priečinkoch"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Súbor/P_racovať odpojený"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Ikony _a text"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Zobraziť/_Triediť/podľa pr_ečítania"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďa_lšiu správu s návestím"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Sp_ráva/_Odoslať"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mením typ oddeľovača okien z %d na %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3301,16 +3496,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3320,153 +3515,152 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
@@ -3584,32 +3778,32 @@ msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Vytváram zobrazenie správy...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Prílohy"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3618,7 +3812,7 @@ msgstr ""
 "Zadajte príkazový riadok tlače:\n"
 "('%s' bude nahradené názvom súboru)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3627,41 +3821,6 @@ msgstr ""
 "Príkazový riadok tlače je neplatný:\n"
 "'%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "nemôžem kopírovať správu %s do %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Nemôžem označiť súbor so značkami.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopírujem správu %s%c%d do %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Posledné číslo v priečinku %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Otvoriť"
@@ -3748,116 +3907,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Príkazový riadok prehliadača MIME je neplatný: '%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP spojenie k %s:%d bolo prerušené. Obnovujem spojenie...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "článok %d už je v medzipamäti.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "prijímam článok %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "nemôžem prečítať článok %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "nemôžem získať zoznam diskusných skupín\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "nemôžem odoslať článok.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "nemôžem prijať článok %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "nemôžem vybrať skupinu %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "neplatný rozsah článkov: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "žiadne nové články.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "prijímam xover %d - %d v %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "nemôžem prijať xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "pri prijímaní xover sa vyskytla chyba.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "neplatný xover riadok: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "nemôžem prijať xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "pri prijímaní xhdr sa vyskytla chyba.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "chyba protokolu: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "chyba protokolu\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Pri odosielaní sa vyskytla chyba\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Pri odosielaní správy nastala chyba."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[žiadny user id]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3870,7 +3928,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3878,455 +3936,6 @@ msgstr ""
 "Neplatné heslo! Skúste znova...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "V pozdrave nebola nájdená vyžadovaná APOP časová značka\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Chybná časová značka v pozdrave\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Chyba protokolu POP3\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "neplatný xover riadok: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Odstraňujem starú správu %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Preskakujem správu %d (%d bajtov)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "mailbox je zamknutý\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "čas spojenia vypršal\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "nemôžem vytvoriť TLS reláciu\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "vyskytla sa chyba v autentizácii\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "príkaz nie je podporovaný\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "vyskytla sa chyba pri POP3 spojení\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Otváram okno nastavenia konta...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Konto%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Nastavenie nového konta"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Nastavenie konta"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Vytváram okno nastavenia konta...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Prijať"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Súkromie"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Rozšírené"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Názov tohto konta"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Nastaviť ako východzie"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Osobné informácie"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Celé meno"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-mailová adresa"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizácia"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informácie o serveri"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Žiadne (lokálne)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Tento server vyžaduje autentizáciu"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "News server"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server pre prijímanie"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP server (odosielanie)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Prihlasovacie meno"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Heslo"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Tento server vyžaduje autentizáciu"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Vymazať správy na serveri po ich prijatí"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Vymazať po"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dňoch"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dní: zmazať ihneď)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Prijať všetky správy na serveri"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Obmedzenie veľkosti správy pre príjem"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrovať správy pri prijatí"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Východzí inbox"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Metóda autentizácie"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatická"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Diskusné skupiny"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maximálny počet príspevkov na stiahnutie\n"
-"(0 pre neobmedzený počet)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Nie je určený príjemca."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Hlavička"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Pridať dátum do hlavičky"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generovať Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Pridať uživateľom definované hlavičky"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Upresniť... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autentizácia"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP Autentizácia (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Ak necháte tieto polia prázdne, bude použité to isté\n"
-"prihlasovacie meno a heslo ako pri prijímaní."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autentizovať cez POP3 pred odosielaním"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Výstup príkazu"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Automaticky nastaviť nasledujúce adresy"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Kópia"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Slepá kópia"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Odpovedať komu"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Implicitne podpísať správu"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Implicitne zašifrovať správu"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Šifrovať do ASCII-armored tvaru"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Podpísať čistým textom"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Kľúč pre podpis"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Použiť východzí kľúč GnuPG"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Zadať kľúč ručne"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "User alebo key ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Nepoužívať SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Použiť SSL pre POP3 spojenie"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Použiť SSL pre IMAP4 spojenie"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Použiť SSL pre NNTP spojenie"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Odoslať (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Použiť SSL pre SMTP spojenie"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Používať non-blocking SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Určiť SMTP port"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Určiť POP3 port"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Určiť IMAP4 port"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Určiť NNTP port"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Určiť názov domény"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Priečinok serveru IMAP"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Uložiť odoslané správy do"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Uložiť koncepty do"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Uložiť vymazané správy do"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Nebol zadaný názov konta."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Nebola zadaná e-mailová adresa."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Nebol zadaný SMTP server."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Nebol zadaný user ID."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Nebol zadaný POP3 server."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Nebol zadaný IMAP4 server."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Nebol zadaný NNTP server."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Nedoporučuje sa používať starý spôsob šifrovania správ\n"
-"v ASCII-armored formáte. Nevyhovuje totiž špecifikácii\n"
-"RFC 3156 - Bezpečnosť MIME s OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Nastavenie akcií"
@@ -4391,17 +4000,17 @@ msgstr " Nápoveda syntaxe "
 msgid "Registered actions"
 msgstr "Registrované akcie"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Nahor"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Nadol"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nové)"
 
@@ -4444,835 +4053,31 @@ msgstr "Zmazať akciu"
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Priečinok"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Vytváram okno všeobecných nastavení...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Všeobecné nastavenia"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citát"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Zobrazenie"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Správa"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Ostatné"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Použiť externý program pre prijímanie lokálnej pošty"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Príkaz"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Prijať lokálnu poštu zo spoolu"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrovať pri prijímaní lokálnej pošty"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Automaticky zisťovať novú poštu"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "každých"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minút"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Zistiť novú poštu pri spustení"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Získavam počet nových správ (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Pre odosielanie použiť externý program"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Uložiť odoslané správy"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Výstupné kódovanie znakov"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatické (doporučené)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Západná Európa (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Západná Európa (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Stredná Európa (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Pobaltie (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Pobaltie (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grécko (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grécko (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Cyrilika (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turecko (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrilika (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrilika (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cyrilika (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrilika (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonsko (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonsko (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonsko (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Zjednodušená čínština (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Zjednodušená čínština (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradičná čínština (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradičná čínština (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Čínština (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Kórea (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thajsko (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thajsko (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Po zvolení 'Automatické' bude zvolené optimálne kódovanie\n"
-"pre súčasnú lokalizáciu."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Kódovanie pri prenose"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá,\n"
-"keď bude správa obsahovať iné znaky ako ASCII."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Oddeľovač podpisu"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Vložiť automaticky"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Automaticky spustiť externý editor"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Počet spätných krokov"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Zalomiť správy na"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "znakoch"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Zalomiť citáciu"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Zalamovať pri písaní"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Zalomiť pred odoslaním"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Automaticky zvoliť konto pri odpovedaní"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Pri odpovedaní citovať správu"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Formát odpovede"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Značka citácie"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Formát posielania ďalej"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Popis znakov "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Písmo"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Preložiť názov hlavičky (ako napríklad 'From:', 'Subject:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Skrátiť diskusné skupiny dlhšie ako"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "písmen"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Zoznam správ"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Rozbaliť vlákna"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Formát dátumu"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Povoliť farby v správe"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "Zobraziť viacbajtovú abecedu a čísla ako ASCII znaky (len Japonsko)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Zobraziť panel s hlavičkami nad správou"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Zobraziť vybrané hlavičky v správe"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Zobraziť vybrané hlavičky v správe"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Medzera medzi riadkami"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(ov)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Posúvanie"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Pol stránky"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Plynulé posúvanie"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Posun"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "Prispôsobiť veľkosť priložených obrázkov"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Zobrazované hlavičky"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Vykonať"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Vykonať"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Priečinok"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrovať správy pri prijatí"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automaticky overovať podpisy"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Zobraziť výsledok overenia ako upozornenie"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Uložiť heslo dočasne v pamäti"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Vymazať z pamäte za"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minút "
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Nastavte na '0', ak chcete uložiť heslo do pamäte\n"
-" až do ukončenia)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Zachytiť vstup počas zadávania hesla"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Otvoriť správu hneď pri zvolení v zozname"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Správy budú označené až do vykonania,\n"
-" ak je táto možnosť vypnutá)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Okno prijímania"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Zobraziť okno prijímania"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Vždy"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Len pri manuálnom prijímaní"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nikdy"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Po skončení zavrieť okno prijímania"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Nastaviť klávesové skratky... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Webový prehliadač"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Pri ukončení"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Potvrdiť ukončenie"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Vyprázdniť kôš pri ukončení"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Opýtať sa pred vyprázdnením"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Upozorniť, ak sú správy vo fronte"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Časový limit spojení:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "sekúnd"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "skrátený názov dňa v týždni"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "názov dňa v týždni"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "skrátený názov mesiaca"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "názov mesiaca"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "storočie (rok/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "deň v mesiaci"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "číslo hodiny pri použití 24-hodinového času"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "číslo hodiny pri použití 12-hodinového času"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "číslo dňa v roku"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "číslo mesiaca"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minúty"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM alebo PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekundy"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "poradie dňa v týždni"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "posledné dve číslice roku"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "rok"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "časová zóna, jej názov alebo skratka"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Symbol"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Popis"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Príklad"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Nastaviť farby správy"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Farby"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Citovaný text - Prvá úroveň"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Citovaný text - Druhá úroveň"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Citovaný text - Tretia úroveň"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI odkaz"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Opakovať farby"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Vyberte farbu pre 1. úroveň citácie"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Vyberte farbu pre 2. úroveň citácie"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Vyberte farbu pre 3. úroveň citácie"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Vyberte farbu pre URI odkazy"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Popis symbolov"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Dátum\n"
-"Od\n"
-"Plné meno odosielateľa\n"
-"Prvé meno odosielateľa\n"
-"Iniciály odosielateľa\n"
-"Predmet\n"
-"Komu\n"
-"Kópia\n"
-"Diskusné skupiny\n"
-"Message-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Ak je x zadané, zobrazí expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Telo správy\n"
-"Telo citovanej správy\n"
-"Telo správy bez podpisu\n"
-"Telo citovanej správy bez podpisu\n"
-"Znak %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Spätné lomítko\n"
-"Otáznik\n"
-"Ľavá zložená zátvorka\n"
-"Pravá zložená zátvorka"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Klávesové skratky"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Vyberte sadu klávesových skratiek.\n"
-"Môžete modifikovať skratky každého menu stlačením\n"
-"požadovanej skratky po ukázaní myšou na položku."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Štandardné"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Starší Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Nastavenie vlastných hlavičiek"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Hlavička"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr "Zmazať"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Vlastné hlavičky"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Zmazať hlavičku"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Naozaj chcete zmazať túto hlavičku?"
 
@@ -5320,12 +4125,21 @@ msgstr "Nastavenie filtra"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Upraviť"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naozaj chcete zmazať toto pravidlo?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Bez názvu"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Zmazať pravidlo"
 
@@ -5414,6 +4228,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5555,6 +4373,10 @@ msgstr "Zmazať [...] alebo (...) na začiatku názvu v zozname správ"
 msgid "Apply to subfolders"
 msgstr "Platí aj pre podpriečinky"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Automaticky nastaviť nasledujúce adresy"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "použiť aj pri odpovedaní"
@@ -5629,64 +4451,46 @@ msgstr "Zobrazené položky"
 msgid " Revert to default "
 msgstr " Vrátiť na východzie "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Názov šablóny"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registrovať"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Nahradiť "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Symboly "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrované šablóny"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Šablóna"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Chyba formátu šablóny."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Zmazať šablónu"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "nemôžem otvoriť súbor so značkami\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "nedá sa prijať správa %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Vytváram stavové okno...\n"
@@ -5695,29 +4499,21 @@ msgstr "Vytváram stavové okno...\n"
 msgid "Status"
 msgstr "Stav"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "pri prijímaní dát sa vyskytla chyba.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Do súboru sa nedá zapisovať.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Nemôžem nájsť user ID pre tento kľúč."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpísané dňa %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Chyba pri overovaní podpisu"
 
@@ -5743,6 +4539,10 @@ msgstr "Key ID"
 msgid "Val"
 msgstr "Hodnota"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Ostatné"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Pridať kľúč"
@@ -5763,84 +4563,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Hlavička správy vo fronte je poškodená.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Vykonať"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Pripájam sa k serveru SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Posielam HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Autentizácia"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Odosielam správu..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Posielam EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Posielam MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Posielam"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Posielam RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Posielam DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5942,32 +4742,20 @@ msgstr "CHYBNÝ podpis"
 msgid "No public key to verify the signature"
 msgstr "Nemôžem nájsť verejný kľúč pre overenie podpisu"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH nie je dostupné\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "neplatná odozva SMTP\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "vyskytla sa chyba pri SMTP spojení\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Vytváram okno zdroja správy...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Zdroj správy"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Zobrazujem zdroj %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Zdroj"
@@ -6363,6 +5151,920 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Sú otvorené okná s rozpísanými správami.\n"
+#~ "Prosím zatvorte všetky tieto okná predtým, ako začnete meniť nastavenia "
+#~ "kônt."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Otváram okno pre nastavenie konta...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Vytváram okno pre nastavenie konta...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Úprava kônt"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nové správy budú kontrolované v tomto poradí. Ak má byť konto "
+#~ "kontrolované\n"
+#~ "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokol"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr "Nastaviť ako východzie konto"
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Naozaj chcete zmazať toto konto?"
+
+#~ msgid "Delete account"
+#~ msgstr "Zmazať konto"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Otváram okno nastavenia konta...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Konto%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Nastavenie nového konta"
+
+#~ msgid "Account preferences"
+#~ msgstr "Nastavenie konta"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Vytváram okno nastavenia konta...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Prijať"
+
+#~ msgid "Privacy"
+#~ msgstr "Súkromie"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Rozšírené"
+
+#~ msgid "Name of this account"
+#~ msgstr "Názov tohto konta"
+
+#~ msgid "Set as default"
+#~ msgstr "Nastaviť ako východzie"
+
+#~ msgid "Personal information"
+#~ msgstr "Osobné informácie"
+
+#~ msgid "Full name"
+#~ msgstr "Celé meno"
+
+#~ msgid "Mail address"
+#~ msgstr "E-mailová adresa"
+
+#~ msgid "Organization"
+#~ msgstr "Organizácia"
+
+#~ msgid "Server information"
+#~ msgstr "Informácie o serveri"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Žiadne (lokálne)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Tento server vyžaduje autentizáciu"
+
+#~ msgid "News server"
+#~ msgstr "News server"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server pre prijímanie"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP server (odosielanie)"
+
+#~ msgid "User ID"
+#~ msgstr "Prihlasovacie meno"
+
+#~ msgid "Password"
+#~ msgstr "Heslo"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Tento server vyžaduje autentizáciu"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Vymazať správy na serveri po ich prijatí"
+
+#~ msgid "Remove after"
+#~ msgstr "Vymazať po"
+
+#~ msgid "days"
+#~ msgstr "dňoch"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dní: zmazať ihneď)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Prijať všetky správy na serveri"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Obmedzenie veľkosti správy pre príjem"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrovať správy pri prijatí"
+
+#~ msgid "Default inbox"
+#~ msgstr "Východzí inbox"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Metóda autentizácie"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatická"
+
+#~ msgid "News"
+#~ msgstr "Diskusné skupiny"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maximálny počet príspevkov na stiahnutie\n"
+#~ "(0 pre neobmedzený počet)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Nie je určený príjemca."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Pridať dátum do hlavičky"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generovať Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Pridať uživateľom definované hlavičky"
+
+#~ msgid " Edit... "
+#~ msgstr " Upresniť... "
+
+#~ msgid "Authentication"
+#~ msgstr "Autentizácia"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP Autentizácia (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Ak necháte tieto polia prázdne, bude použité to isté\n"
+#~ "prihlasovacie meno a heslo ako pri prijímaní."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autentizovať cez POP3 pred odosielaním"
+
+#~ msgid "Command output"
+#~ msgstr "Výstup príkazu"
+
+#~ msgid "Cc"
+#~ msgstr "Kópia"
+
+#~ msgid "Bcc"
+#~ msgstr "Slepá kópia"
+
+#~ msgid "Reply-To"
+#~ msgstr "Odpovedať komu"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Implicitne podpísať správu"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Implicitne zašifrovať správu"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Šifrovať do ASCII-armored tvaru"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Podpísať čistým textom"
+
+#~ msgid "Sign key"
+#~ msgstr "Kľúč pre podpis"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Použiť východzí kľúč GnuPG"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Zadať kľúč ručne"
+
+#~ msgid "User or key ID:"
+#~ msgstr "User alebo key ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Nepoužívať SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Použiť SSL pre POP3 spojenie"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Použiť SSL pre IMAP4 spojenie"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Použiť SSL pre NNTP spojenie"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Odoslať (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Použiť SSL pre SMTP spojenie"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Používať non-blocking SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Určiť SMTP port"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Určiť POP3 port"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Určiť IMAP4 port"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Určiť NNTP port"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Určiť názov domény"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Priečinok serveru IMAP"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Uložiť odoslané správy do"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Uložiť koncepty do"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Uložiť vymazané správy do"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Nebol zadaný názov konta."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Nebola zadaná e-mailová adresa."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Nebol zadaný SMTP server."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Nebol zadaný user ID."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Nebol zadaný POP3 server."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Nebol zadaný IMAP4 server."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Nebol zadaný NNTP server."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Nedoporučuje sa používať starý spôsob šifrovania správ\n"
+#~ "v ASCII-armored formáte. Nevyhovuje totiž špecifikácii\n"
+#~ "RFC 3156 - Bezpečnosť MIME s OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Vytváram okno všeobecných nastavení...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Všeobecné nastavenia"
+
+#~ msgid "Quote"
+#~ msgstr "Citát"
+
+#~ msgid "Display"
+#~ msgstr "Zobrazenie"
+
+#~ msgid "Message"
+#~ msgstr "Správa"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Použiť externý program pre prijímanie lokálnej pošty"
+
+#~ msgid "Command"
+#~ msgstr "Príkaz"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Prijať lokálnu poštu zo spoolu"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrovať pri prijímaní lokálnej pošty"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Automaticky zisťovať novú poštu"
+
+#~ msgid "every"
+#~ msgstr "každých"
+
+#~ msgid "minute(s)"
+#~ msgstr "minút"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Zistiť novú poštu pri spustení"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Získavam počet nových správ (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Pre odosielanie použiť externý program"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Uložiť odoslané správy"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Výstupné kódovanie znakov"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatické (doporučené)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Západná Európa (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Západná Európa (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Stredná Európa (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Pobaltie (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Pobaltie (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grécko (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grécko (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Cyrilika (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turecko (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cyrilika (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cyrilika (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cyrilika (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cyrilika (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonsko (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonsko (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonsko (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Zjednodušená čínština (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Zjednodušená čínština (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradičná čínština (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradičná čínština (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Čínština (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Kórea (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thajsko (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thajsko (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Po zvolení 'Automatické' bude zvolené optimálne kódovanie\n"
+#~ "pre súčasnú lokalizáciu."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Kódovanie pri prenose"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá,\n"
+#~ "keď bude správa obsahovať iné znaky ako ASCII."
+
+#~ msgid "Signature separator"
+#~ msgstr "Oddeľovač podpisu"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Vložiť automaticky"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Automaticky spustiť externý editor"
+
+#~ msgid "Undo level"
+#~ msgstr "Počet spätných krokov"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Zalomiť správy na"
+
+#~ msgid "characters"
+#~ msgstr "znakoch"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Zalomiť citáciu"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Zalamovať pri písaní"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Zalomiť pred odoslaním"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Automaticky zvoliť konto pri odpovedaní"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Pri odpovedaní citovať správu"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
+
+#~ msgid "Reply format"
+#~ msgstr "Formát odpovede"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Značka citácie"
+
+#~ msgid "Forward format"
+#~ msgstr "Formát posielania ďalej"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Popis znakov "
+
+#~ msgid "Font"
+#~ msgstr "Písmo"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Preložiť názov hlavičky (ako napríklad 'From:', 'Subject:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Skrátiť diskusné skupiny dlhšie ako"
+
+#~ msgid "letters"
+#~ msgstr "písmen"
+
+#~ msgid "Summary View"
+#~ msgstr "Zoznam správ"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
+
+#~ msgid "Expand threads"
+#~ msgstr "Rozbaliť vlákna"
+
+#~ msgid "Date format"
+#~ msgstr "Formát dátumu"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Povoliť farby v správe"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "Zobraziť viacbajtovú abecedu a čísla ako ASCII znaky (len Japonsko)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Zobraziť panel s hlavičkami nad správou"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Zobraziť vybrané hlavičky v správe"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Zobraziť vybrané hlavičky v správe"
+
+#~ msgid "Line space"
+#~ msgstr "Medzera medzi riadkami"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(ov)"
+
+#~ msgid "Scroll"
+#~ msgstr "Posúvanie"
+
+#~ msgid "Half page"
+#~ msgstr "Pol stránky"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Plynulé posúvanie"
+
+#~ msgid "Step"
+#~ msgstr "Posun"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Prispôsobiť veľkosť priložených obrázkov"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Zobrazované hlavičky"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Vykonať"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Vykonať"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Priečinok"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrovať správy pri prijatí"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Automaticky overovať podpisy"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Zobraziť výsledok overenia ako upozornenie"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Uložiť heslo dočasne v pamäti"
+
+#~ msgid "Expired after"
+#~ msgstr "Vymazať z pamäte za"
+
+#~ msgid "minute(s) "
+#~ msgstr "minút "
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Nastavte na '0', ak chcete uložiť heslo do pamäte\n"
+#~ " až do ukončenia)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Zachytiť vstup počas zadávania hesla"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Otvoriť správu hneď pri zvolení v zozname"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Správy budú označené až do vykonania,\n"
+#~ " ak je táto možnosť vypnutá)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Okno prijímania"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Zobraziť okno prijímania"
+
+#~ msgid "Always"
+#~ msgstr "Vždy"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Len pri manuálnom prijímaní"
+
+#~ msgid "Never"
+#~ msgstr "Nikdy"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Po skončení zavrieť okno prijímania"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Nastaviť klávesové skratky... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Webový prehliadač"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
+
+#~ msgid "On exit"
+#~ msgstr "Pri ukončení"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Potvrdiť ukončenie"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Vyprázdniť kôš pri ukončení"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Opýtať sa pred vyprázdnením"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Upozorniť, ak sú správy vo fronte"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Časový limit spojení:"
+
+#~ msgid "second(s)"
+#~ msgstr "sekúnd"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "skrátený názov dňa v týždni"
+
+#~ msgid "the full weekday name"
+#~ msgstr "názov dňa v týždni"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "skrátený názov mesiaca"
+
+#~ msgid "the full month name"
+#~ msgstr "názov mesiaca"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "storočie (rok/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "deň v mesiaci"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "číslo hodiny pri použití 24-hodinového času"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "číslo hodiny pri použití 12-hodinového času"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "číslo dňa v roku"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "číslo mesiaca"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minúty"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM alebo PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekundy"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "poradie dňa v týždni"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "posledné dve číslice roku"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "rok"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "časová zóna, jej názov alebo skratka"
+
+#~ msgid "Specifier"
+#~ msgstr "Symbol"
+
+#~ msgid "Description"
+#~ msgstr "Popis"
+
+#~ msgid "Example"
+#~ msgstr "Príklad"
+
+#~ msgid "Set message colors"
+#~ msgstr "Nastaviť farby správy"
+
+#~ msgid "Colors"
+#~ msgstr "Farby"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Citovaný text - Prvá úroveň"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Citovaný text - Druhá úroveň"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Citovaný text - Tretia úroveň"
+
+#~ msgid "URI link"
+#~ msgstr "URI odkaz"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Opakovať farby"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Vyberte farbu pre 1. úroveň citácie"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Vyberte farbu pre 2. úroveň citácie"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Vyberte farbu pre 3. úroveň citácie"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Vyberte farbu pre URI odkazy"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Popis symbolov"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Dátum\n"
+#~ "Od\n"
+#~ "Plné meno odosielateľa\n"
+#~ "Prvé meno odosielateľa\n"
+#~ "Iniciály odosielateľa\n"
+#~ "Predmet\n"
+#~ "Komu\n"
+#~ "Kópia\n"
+#~ "Diskusné skupiny\n"
+#~ "Message-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Ak je x zadané, zobrazí expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Telo správy\n"
+#~ "Telo citovanej správy\n"
+#~ "Telo správy bez podpisu\n"
+#~ "Telo citovanej správy bez podpisu\n"
+#~ "Znak %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Spätné lomítko\n"
+#~ "Otáznik\n"
+#~ "Ľavá zložená zátvorka\n"
+#~ "Pravá zložená zátvorka"
+
+#~ msgid "Key bindings"
+#~ msgstr "Klávesové skratky"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Vyberte sadu klávesových skratiek.\n"
+#~ "Môžete modifikovať skratky každého menu stlačením\n"
+#~ "požadovanej skratky po ukázaní myšou na položku."
+
+#~ msgid "Default"
+#~ msgstr "Štandardné"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Starší Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Voľba písma"
 
diff --git a/po/sl.po b/po/sl.po
index a88162b0..7c1a5835 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -14,13 +14,404 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Berem vse nastavitve za vsak račun...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspešen poskus zapisa konfiguracije v datoteko\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "Povezava IMAP4 do %s%d se je prekinila. Povezujem se znova...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Imenik strežnika IMAP"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "delam povezavo IMAP4 do %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Ne morem pričeti seje TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Pošiljam sporočilo (%d / %d zlogov)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Prestavljam sporočilo %s%c%d v %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Sprejemam sporočila iz %s v %s...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "ne morem izbrisati\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Sprejemam sporočila iz %s v %s...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "ne morem izbrati mape: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Datoteka z oznakami ni bila najdena.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "med dobivanjem LIST je prišlo do napake.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Ne morem narediti '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "ne morem narediti poštnega predala\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "ne morem preimenovati poštnega predala: %s v %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "ne morem izbrisati poštnega predala\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "ne morem dobiti ovojnice\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Pošiljam sporočilo (%d / %d zlogov)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "ne morem razčleniti ovojnice: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Ne morem se povezati s strežnikom IMAP4: %s%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "ne morem dobiti imenskega prostora\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "ne morem izbrati mape: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Overovitvena metoda"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Prijava na IMAP4 ni uspela.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "ne morem pripeti %s na %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(pošiljam datoteko...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "ne morem dodati sporočila %s\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "ne morem kopirati %d na %s\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv ne more pretvoriti %s v UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "ne morem prepisati sporočila %s v %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Ne morem odpreti označene datoteke.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "Izvorna mapa je identična ciljni.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Zadnja številka v imeniku %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Datoteka `%s' že obstaja.\n"
+"Ne morem narediti imenika."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "ustvarjam povezavo NNTP do %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "Povezava NNTP do %s:%d je bila prekinjena. Povezujem se znova...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "članek %d je že v predpomnilniku.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "sprejemam članek %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "ne morem prebrati članka %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "ne morem sprejeti seznama novičarskih skupin\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "ne morem poslati članka.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "ne morem sprejeti članka %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "ne morem izbrati skupine %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "neveljavno območje člankov: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "ni novih člankov.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "sprejemam xover %d - %d v %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "ne morem prejeti xoverja\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "med prejemanjem xoverja je prišlo do napake.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "neveljavna vrstica xover: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "ne morem prejeti xhdr-ja\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "med prejemanjem xhdr-ja je prišlo do napake.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Ne morem se povezati s strežnikom NNTP: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "napaka v protokolu: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "napaka v protokolu\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Med pošiljanjem je prišlo do napake\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Med obdelavo pošte je prišlo do napake."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "V pozdravu ni bila najdena zahtevana časovna značka APOP\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Skladenjska napaka časovne značke v pozdravu\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Napaka v protokolu POP3\n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "neveljavna vrstica xover: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: brišem poteklo sporočilo %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Izpuščam sporočilo %d (%d zlogov)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "poštni predal je zaklenjen\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "ne morem pričeti seje TLS\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Ukaz"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +421,54 @@ msgstr "Najden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je shranjena.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Mapa"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "Ne morem odpreti datoteke z oznakami.\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "ne morem prenesti sporočila %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Ne morem dobiti tekstovnega dela\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "med popravljanjem podatkov je prišlo do napake.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Ne morem pisati v datoteko.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH ni na razpolago\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ni na razpolago\n"
@@ -163,78 +602,6 @@ msgstr ""
 "programom; če ga niste, pišite na Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, ZDA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Berem vse nastavitve za vsak račun...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Nekatera okna za sestavljanje sporočila so odprta.\n"
-"Pred urejanjem računov zaprite vsa okna za sestavljanje sporočil."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Odpiram okno za urejanje računa...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Ustvarjam okno za urejanje računa...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Urejanje računov"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nova sporočila bodo iskana v tem vrstnem redu. Označite izbirnike\n"
-"v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Ime"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Strežnik"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Urejanje"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Nastavi kot privzet račun "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Ali resnično želite izbrisati ta račun?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Brez naslova"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Brisanje računa"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -332,6 +699,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Ime"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -346,8 +721,8 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datoteka"
 
@@ -368,9 +743,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -386,7 +761,7 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
@@ -418,8 +793,8 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Orodja"
 
@@ -427,13 +802,13 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
@@ -450,17 +825,17 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
@@ -472,7 +847,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -482,14 +857,14 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Izbriši"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -500,11 +875,11 @@ msgid "Lookup"
 msgstr "Poišči"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Kp:"
 
@@ -530,7 +905,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -643,7 +1018,7 @@ msgstr "Napaka pri pretvorbi imenika naslovov"
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Vmesnik"
 
@@ -663,8 +1038,7 @@ msgstr "Elektronski naslov"
 msgid "Group"
 msgstr "Skupina"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Mapa"
 
@@ -688,15 +1062,15 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Napaka"
 
@@ -751,8 +1125,8 @@ msgstr "/_Dodaj"
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
@@ -797,8 +1171,8 @@ msgstr "/_Uredi/_Razveljavi"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
@@ -806,7 +1180,7 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
@@ -818,7 +1192,7 @@ msgstr "/_Uredi/_Prilepi"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
@@ -835,7 +1209,7 @@ msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pogled"
@@ -857,9 +1231,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
@@ -875,7 +1249,7 @@ msgstr "/_Pogled/R_avnilo"
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
@@ -887,127 +1261,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
@@ -1015,14 +1389,14 @@ msgstr "/_Orodja/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
@@ -1046,10 +1420,6 @@ msgstr "/_Sporočilo/_Enkripcija"
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Ne morem dobiti tekstovnega dela\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
@@ -1126,7 +1496,7 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
@@ -1217,8 +1587,7 @@ msgstr "Tip MIME"
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Pošlji"
 
@@ -1258,8 +1627,7 @@ msgstr "Pripni"
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1267,7 +1635,7 @@ msgstr "Podpis"
 msgid "Insert signature"
 msgstr "Vstavi podpis"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Urejevalnik"
 
@@ -1465,7 +1833,7 @@ msgstr "Spremeni"
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Vrednost"
 
@@ -1498,7 +1866,6 @@ msgid " Check File "
 msgstr " Preveri Datoteko "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Datoteka"
 
@@ -1554,12 +1921,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -1576,7 +1943,7 @@ msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1640,7 +2007,7 @@ msgstr "Čas izteka (sek.)"
 msgid "Maximum Entries"
 msgstr "Največje št. vnosov"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -1697,7 +2064,6 @@ msgid "Exporting file:"
 msgstr "Izvozi datoteko:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Izberi... "
 
@@ -1721,164 +2087,164 @@ msgstr "Naj povozim obstoječo datoteko"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 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:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Naredi _novo mapo..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/I_zbriši mapo..."
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Iskanje sporočil..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ni neprebranih sporočil."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Vpis na novičarsko skupino..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/_Odstrani skupino novic"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1888,21 +2254,21 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1913,21 +2279,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1936,34 +2302,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2024,7 +2390,7 @@ msgstr "%d sprejetih novičarskih skupin (%s prebranih)"
 msgid "Newsgroups:"
 msgstr "Novičarske skupine:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Zadeva:"
 
@@ -2048,165 +2414,6 @@ msgstr "Delam gledanje slike...\n"
 msgid "Can't load the image."
 msgstr "Ne morem naložiti slike."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Povezava IMAP4 do %s%d se je prekinila. Povezujem se znova...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Imenik strežnika IMAP"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "delam povezavo IMAP4 do %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Ne morem pričeti seje TLS.\n"
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "ne morem izbrisati\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "ne morem izbrati mape: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Datoteka z oznakami ni bila najdena.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "med dobivanjem LIST je prišlo do napake.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Ne morem narediti '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "ne morem narediti poštnega predala\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "ne morem preimenovati poštnega predala: %s v %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "ne morem izbrisati poštnega predala\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "ne morem dobiti ovojnice\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "ne morem razčleniti ovojnice: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Ne morem se povezati s strežnikom IMAP4: %s%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "ne morem dobiti imenskega prostora\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "ne morem izbrati mape: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Overovitvena metoda"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Prijava na IMAP4 ni uspela.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "ne morem pripeti %s na %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(pošiljam datoteko...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "ne morem dodati sporočila %s\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "ne morem kopirati %d na %s\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv ne more pretvoriti %s v UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Uvozi"
@@ -2304,7 +2511,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2320,200 +2527,200 @@ msgstr "Atributi"
 msgid "Finish"
 msgstr "Končaj"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Opravljeno (ni novih sporočil)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -2531,29 +2738,20 @@ msgstr "Vnesite geslo"
 msgid "Protocol log"
 msgstr "Dnevnik protokola"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Datoteka `%s' že obstaja.\n"
-"Ne morem narediti imenika."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread ni podprt v glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [naslov]     odpri okno za sestavljanje novega sporočila"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2563,48 +2761,48 @@ msgstr ""
 "                         odpri okno za sestavljanje s pripetimi\n"
 "                         podanimi datotekami"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              poberi nova sporočila"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          poberi nova sporočila z vseh računov"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošlji vsa čakajoča sporočila"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaži to pomoč in končaj"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikaži informacijo o različici in končaj"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izhodni nabor znakov"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2618,19 +2816,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Še vedno sestavljate sporočilo. Ali naj res končam?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Čakajoča sporočila"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2639,661 +2837,661 @@ msgstr ""
 "Podpora za OpenPGP je izključena."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Mapa/Naredi _novo mapo..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Mapa/I_zbriši mapo"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odstrani poštni pre_dal"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Datoteka/_Preveri nova sporočila v vseh imenikih"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Uvozi datoteko mbox..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvozi v datoteko mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Izprazni sme_tnjak"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Natisni..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Datoteka/Vr_ini datoteko"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/_Končaj"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Izberi _nit"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Urejanje/_Iskanje v trenutnem sporočilu..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Urejanje/Iskanje _sporočil"
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Pogled/Pri_kaži ali skrij"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Drevo map"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Ogled sporočila"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/Ikone in besedi_lo"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Besedilo"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Orodjarna/_Nič"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pogled/_Razvrščanje/po š_tevilu"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pogled/_Razvrščanje/po _velikosti"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pogled/_Razvrščanje/po naslovnik_u"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pogled/_Razvrščanje/po _zadevi"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pogled/_Razvrščanje/po _barvi oznak"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pogled/_Razvrščanje/po _oznaki"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pogled/_Razvrščanje/po _neprebranih"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pogled/_Razvrščanje/po pri_logi"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pogled/_Razvrščanje/Ne raz_vrsti"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Pogled/_Razvrščanje/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pogled/_Razvrščanje/N_araščajoče"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pogled/_Razvrščanje/Pri_vlači po zadevi"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Pogled/Ogled _niti"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pogled/Razširi _vse niti"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pogled/Skrči vse _niti"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Pogled/Nastavi kos za _prikaz..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Pogled/_Pojdi na"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pogled/_Pojdi na/_Prejšnje sporočilo"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pogled/_Pojdi na/_Naslednje sporočilo"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Pogled/_Pojdi na/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pogled/_Pojdi na/Pre_jšnje neprebrano sporočilo"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pogled/_Pojdi na/Nas_lednje neprebrano sporočilo"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje no_vo sporočilo"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pogled/_Pojdi na/Nasled_nje novo sporočilo"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje _označeno sporočilo"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pogled/_Pojdi na/Naslednje o_značeno sporočilo"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje sporočilo z ozna_ko"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Pogled/Pokaži vsa _zaglavja"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Spreminjam tip ločevanja oken z %d na %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3303,16 +3501,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3321,153 +3519,152 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
@@ -3585,32 +3782,32 @@ msgstr "Dosežen je konec sporočila. Naj nadaljujem z začetka?"
 msgid "Search finished"
 msgstr "Iskanje končano"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Ustvarjam videz sporočila...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Besedilo"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Priloge"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3619,7 +3816,7 @@ msgstr ""
 "Vnesite ukazno vrstico za tiskanje:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3628,41 +3825,6 @@ msgstr ""
 "Ukazna vrstica za tiskanje je neveljavna:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "ne morem prepisati sporočila %s v %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Ne morem odpreti označene datoteke.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "Izvorna mapa je identična ciljni.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Zadnja številka v imeniku %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Odpri"
@@ -3749,116 +3911,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Ukazna vrstica pregledovalnika MIME je neveljavna: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "ustvarjam povezavo NNTP do %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "Povezava NNTP do %s:%d je bila prekinjena. Povezujem se znova...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "članek %d je že v predpomnilniku.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "sprejemam članek %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "ne morem prebrati članka %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "ne morem sprejeti seznama novičarskih skupin\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "ne morem poslati članka.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "ne morem sprejeti članka %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "ne morem izbrati skupine %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "neveljavno območje člankov: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "ni novih člankov.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "sprejemam xover %d - %d v %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "ne morem prejeti xoverja\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "med prejemanjem xoverja je prišlo do napake.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "neveljavna vrstica xover: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "ne morem prejeti xhdr-ja\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "med prejemanjem xhdr-ja je prišlo do napake.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Ne morem se povezati s strežnikom NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "napaka v protokolu: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "napaka v protokolu\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Med pošiljanjem je prišlo do napake\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Med obdelavo pošte je prišlo do napake."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Šifrirna fraza"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[ni uporabnikovega id]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3871,7 +3932,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3879,457 +3940,6 @@ msgstr ""
 "Napačna šifrirna fraza! Poskusite znova...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "V pozdravu ni bila najdena zahtevana časovna značka APOP\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Skladenjska napaka časovne značke v pozdravu\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Napaka v protokolu POP3\n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "neveljavna vrstica xover: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: brišem poteklo sporočilo %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Izpuščam sporočilo %d (%d zlogov)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "poštni predal je zaklenjen\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "ne morem pričeti seje TLS\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Ukaz"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Odpiram okno za nastavitve računa...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Račun%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Nastavitve novega računa"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Nastavitve računa"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Ustvarjam okno za nastavitve računa...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Sprejmi"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Zasebnost"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Napredno"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Ime tega računa"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Nastavi kot privzeto"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Osebni podatki"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Polno ime"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Poštni naslov"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizacija"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Podatki o strežniku"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Novice (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Noben (lokalen)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Ta strežnik zahteva overovitev"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Novičarski strežnik"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Strežnik za sprejemanje"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Strežnik SMTP (pošiljanje)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Uporabniško ime"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Geslo"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Ta strežnik zahteva overovitev"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Ob sprejemu odstrani sporočila s strežnika"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Odstrani po"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dneh"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dnevih: odstrani nemudoma)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Naloži vsa sporočila na strežniku"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Omejitev dolžine pri sprejemanju"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtriranje sporočil ob sprejemu"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Privzeta mapa za prejeto pošto"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Overovitvena metoda"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Samodejno"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Novice"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Največje število člankov za nalaganje\n"
-"(neomejeno, če podate 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Naslovnik ni določen."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Poberi vsa' preveri novo pošto na tem računu"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Zaglavje"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Dodaj polje z datumom v zaglavje"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generiran ID sporočila"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Dodaj uporabniško definirano zaglavje"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Uredi... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Overovitev"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Avtentikacija SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Če pustite te vnose prazne, bosta uporabljena\n"
-"isti uporabnški ID in geslo kot pri sprejemu."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Pred pošiljanjem avtenticiraj s POP3"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Ukaz"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Samodejno nastavi sledeče naslove"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Kp:"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Skp:"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Odgovor za"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Privzeto podpiši sporočilo"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "privzeto zakodiraj sporočio"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Uporabi jasen tekstovni podpis"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Ključ za podpisovanje"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Uporabi privzet ključ GnuPG"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Izberi ključ glede na vaš el. naslov"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Ročno določi ključ"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Uporabnik ali ID ključa"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Ne uporabljaj SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Uporabi SSL za povezavo POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Uporabi ukaz STARTTLS za pričetek seje SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Uporabi SSL za povezavo IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Uporabi SSL za povezavo NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Pošlji (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Uporabi SSL za povezavo SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Vnesite vrata SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Vnesite vrata POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Vnesite vrata IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Vnesite vrata NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Vnesite ime domene"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Imenik strežnika IMAP"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Postavi poslana sporočila v"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Postavi osnutke sporočil v"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Postavi izbrisana sporočila v"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Ime računa ni vnešeno."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Elektronski naslov ni naveden."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Strežnik SMTP ni naveden."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Uporabnikov ID ni vnešen."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Strežnik POP3 ni vnešen."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Strežnik IMAP4 ni naveden."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Strežnik NNTP ni naveden."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Uporaba starega načina oklopljen ASCII za\n"
-"enkripcijo ni priporočljiva. Ni združljiv z\n"
-"RFC 3156 MIME Security z Open PGP"
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4392,17 +4002,17 @@ msgstr " Pomoč pri skladnji "
 msgid "Registered actions"
 msgstr "Registrirana dejanja"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Gor"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Dol"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Nov)"
 
@@ -4445,836 +4055,31 @@ msgstr "Izbriši dejanje"
 msgid "Do you really want to delete this action?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Mapa"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Ustvarjam okno za splošne nastavitve...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Splošne nastavitve"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Prikaz"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Sporočila"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Ostalo"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Uporabi zunanji program za vključitev"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Ukaz"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Pripoji iz spoola"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtriranje ob pripojitvi"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Samodejno preverjanje nove pošte"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "vsak"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minut(e)"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Preveri novo pošto ob zagonu"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Posodobi vse lokalne mape po pripojitvi"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Ugotavljam število novih sporočil (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Uporabi zunanji program za pošiljanje"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Shrani poslana sporočila v izhodno mapo"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Izhodni nabor znakov"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Samodejno (priporočeno)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7-bitni ASCII (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Zahodnoevropski (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Zahodnoevropski (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Srednjeevropski (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltski (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltski (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grški (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grški (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Cirilica (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turški (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirilica (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirilica (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Cirilica (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirilica (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonski (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonski (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonski (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Poenostavljena kitajščina (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Poenostavljena kitajščina (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradicionalna kitajščina (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradicionalna kitajščina (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Kitajski (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korejski (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tajski (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tajski (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Če je izbrano `Samodejno', bo uporabljeno\n"
-"optimalno kodiranje za trenutni locale."
-
-#: src/prefs_common.c:1287
-#, fuzzy
-msgid "Transfer encoding"
-msgstr "Prelomi pred pošiljanjem"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Ločilo podpisa"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Vrini samodejno"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Samodejni zaženi zunanji urejevalnik"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Razveljavi nivo"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Prelom sporočila ob"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "znakov"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Prelom citata"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Prelomi ob vnosu"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Prelomi pred pošiljanjem"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Samodejno izberi račun za odgovore"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citiraj sporočila ob odgovarjanju"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Oblika odgovora"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Znak za citiranje"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Oblika posredovanja"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr "Opis simbolov"
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Pisava"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Prevedi ime zaglavja (kot `From:', `Subject:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Prikaži število neprebranih poleg imena mape"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Skrajšaj novičarske skupine daljše od"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "Izbriši"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Ogled povzetka"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Prikaži naslovnika v stolpcu `Od', če ste pošiljatelj vi"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Razširi niti"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Oblika datuma"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr "Nastavi del za prikaz povzetka..."
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Omogoči barvanje sporočila"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Prikaži večzložno abecedo in števila kot\n"
-"znake ASCII (samo japonščina)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Prikaži zaglavje nad ogledom sporočila"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Prostor za vrstico"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "točk(e)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Drsenje"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Polovica strani"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Nadzor gladkosti"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Korak"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-#, fuzzy
-msgid "Resize attached large images to fit in the window"
-msgstr "Spremeni velikost pripetim slikam"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Nastavitev prikaza zaglavja"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Izvedi"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Izvedi"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Mapa"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtriranje sporočil ob sprejemu"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Samodejno preveri podpise"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Začasno shrani prepustno frazo v pomnilnik"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Poteče po"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minut(e) "
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Nastavitev na '0' bo shranila prepustno frazo\n"
-" za celotno sejo)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Zagrabi vnos med vnašanjem gesla"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Prikaži opozorilo ob zagonu, če GnuPG ne deluje"
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "Nobena datoteka s sporočilom ni izbrana."
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Odpri prvo neprebrano sporočilo ob vstopu v mapo"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Označi sporočilo kot prebrano samo, ko je odprto v novem oknu"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Ob prejemu novih sporočil pojdi v mapo Prejeto"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Sporočila bodo označena do izvršitve,\n"
-"če je to izklopljeno)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Dialog za sprejem"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Prikaži pogovorno okno za sprejem"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Vedno"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nikoli"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Ob napaki pri sprejemanju ne prikaži okna z napako"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Na koncu zapri pogovorno okno za sprejemanje"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Nastavi povezave na tipke... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Spletni brskalnik"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Ob dvojnem kliku dodaj naslov na cilj"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Ob izhodu"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Potrdi ob izhodu"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Izprazni smetnjak ob izhodu"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Vprašaj pred izpranjenjem"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Opozori, če so čakajoča sporočila"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Pišem povzetek predpomnilnika (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "polno okrajšano ime dneva v tednu"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "polno ime dneva v tednu"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "okrajšano ime meseca"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "polno ime meseca"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "najustreznejša oblika datuma in časa za trenutni locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "številka stoletja (leto/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "dan v mesecu kot desetiško število"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "ura kot desetiško število s 24-urnim prikazom"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "ura kot desteiško število z 12-urnim prikazom"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "dan v letu kot desetiško število"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "mesec kot desetiško število"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minute kot desetiško število"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM oz. PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekunde kot desetiško število"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "dan v tednu kot desetiško število"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "najustreznejši datum za trenutni locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "zadnji dve števki leta"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "leto kot desetiško število"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "časovni pas ali ime ali okrajšava"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Določevalec"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Opis"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Primer"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Nastavi barve sporočila"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Barve"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Citirano besedilo - prvi nivo"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Citirano besedilo - drugi nivo"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Citirano besedilo - tretji nivo"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "povezava URI"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Obnovi barve za citiranje"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Izberite barvo za citiranje na prvem nivoju"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Izberite barvo za citiranje na drugem nivoju"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Izberite barvo za citiranje na tretjem nivoju"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Izberite barvo za URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Opis simbolov"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Datum\n"
-"Od\n"
-"Pošiljateljevo polno ime\n"
-"Pošiljateljevo ime\n"
-"Pošiljateljeve začetnice\n"
-"Zadeva\n"
-"Do\n"
-"Kp\n"
-"Novičarske skupine\n"
-"ID sporočila"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Če je x nastavljen, prikaži expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Telo sporočila\n"
-"Telo citiranega sporočila\n"
-"Telo sporočila brez podpisa\n"
-"Telo citiranega sporočila brez podpisa\n"
-"Dobesedno %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Dobesedna povratna poševnica\n"
-"Dobesedni vprašaj\n"
-"Dobesedni zaviti oklepaj\n"
-"Dobesedni zaviti zaklepaj"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Povezave na tipke"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Izberite prednastavitev povezav na tipke.\n"
-"Lahko tudi spremenite bližnjice do vsakega menija, čepritisnete katerokoli "
-"tipko, ko na kos kaže miškin kazalec"
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Privzeto"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Stari Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Nastavitev prikrojenega zaglavja"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Zaglavje"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Brisanje "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Prikrojeno zaglavje"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Ime zaglavja ni nastavljeno."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Izbriši zaglavje"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Ali resnično želite izbrisati to zaglavje?"
 
@@ -5322,12 +4127,21 @@ msgstr "Nastavitev filtra"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Urejanje"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Ali res želite izbrisati to pravilo?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Brez naslova"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Izbriši pravilo"
 
@@ -5416,6 +4230,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5558,6 +4376,10 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr "Udejani na podmapah"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Samodejno nastavi sledeče naslove"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "uporabi tudi ob odgovoru"
@@ -5631,64 +4453,46 @@ msgstr "Prikazani kosi"
 msgid " Revert to default "
 msgstr "Povrni privzeto"
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Ime predloge"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "_Pogledriraj"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Zamenjaj "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrirane predloge"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Predloge"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Predloga"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Napaka pri oblikovanju predloge."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Izbriši predlogo"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Ali res želite izbrisati to predlogo?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "Ne morem odpreti datoteke z oznakami.\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "ne morem prenesti sporočila %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Ustvarjam pogovorno okno napredka...\n"
@@ -5697,29 +4501,21 @@ msgstr "Ustvarjam pogovorno okno napredka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "med popravljanjem podatkov je prišlo do napake.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Ne morem pisati v datoteko.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Ne morem najti uporabnikovega ID za ta ključ."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpis narejen v %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Napaka ob overovljanju podpisa"
 
@@ -5745,6 +4541,10 @@ msgstr "ID ključa"
 msgid "Val"
 msgstr "Vrednost"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Ostalo"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj ključ"
@@ -5765,85 +4565,85 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavje čakajočega sporočila je razbito.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne morem pognati zunanjega ukaza: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Povezovanje"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Povezujem se s strežnikom SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Pošiljam HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Overovljam"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Pošiljam EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Pošiljam MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Pošiljanje"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Pošiljam RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Pošiljam DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Zapuščam..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Med pošiljanjem sporočila je prišlo do napake."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5943,33 +4743,20 @@ msgstr "SLAB podpis"
 msgid "No public key to verify the signature"
 msgstr "Ni javnega ključa za overovitev podpisa"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH ni na razpolago\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Izdelujem izvirniško okno...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Izvirnik sporočila"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Prikazujem izvirnik %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Izvirnik"
@@ -6367,6 +5154,899 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Nekatera okna za sestavljanje sporočila so odprta.\n"
+#~ "Pred urejanjem računov zaprite vsa okna za sestavljanje sporočil."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Odpiram okno za urejanje računa...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Ustvarjam okno za urejanje računa...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Urejanje računov"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nova sporočila bodo iskana v tem vrstnem redu. Označite izbirnike\n"
+#~ "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokol"
+
+#~ msgid "Server"
+#~ msgstr "Strežnik"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Nastavi kot privzet račun "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Ali resnično želite izbrisati ta račun?"
+
+#~ msgid "Delete account"
+#~ msgstr "Brisanje računa"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Odpiram okno za nastavitve računa...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Račun%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Nastavitve novega računa"
+
+#~ msgid "Account preferences"
+#~ msgstr "Nastavitve računa"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Ustvarjam okno za nastavitve računa...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Sprejmi"
+
+#~ msgid "Privacy"
+#~ msgstr "Zasebnost"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Name of this account"
+#~ msgstr "Ime tega računa"
+
+#~ msgid "Set as default"
+#~ msgstr "Nastavi kot privzeto"
+
+#~ msgid "Personal information"
+#~ msgstr "Osebni podatki"
+
+#~ msgid "Full name"
+#~ msgstr "Polno ime"
+
+#~ msgid "Mail address"
+#~ msgstr "Poštni naslov"
+
+#~ msgid "Organization"
+#~ msgstr "Organizacija"
+
+#~ msgid "Server information"
+#~ msgstr "Podatki o strežniku"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Novice (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Noben (lokalen)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Ta strežnik zahteva overovitev"
+
+#~ msgid "News server"
+#~ msgstr "Novičarski strežnik"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Strežnik za sprejemanje"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Strežnik SMTP (pošiljanje)"
+
+#~ msgid "User ID"
+#~ msgstr "Uporabniško ime"
+
+#~ msgid "Password"
+#~ msgstr "Geslo"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Ta strežnik zahteva overovitev"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Ob sprejemu odstrani sporočila s strežnika"
+
+#~ msgid "Remove after"
+#~ msgstr "Odstrani po"
+
+#~ msgid "days"
+#~ msgstr "dneh"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dnevih: odstrani nemudoma)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Naloži vsa sporočila na strežniku"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Omejitev dolžine pri sprejemanju"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtriranje sporočil ob sprejemu"
+
+#~ msgid "Default inbox"
+#~ msgstr "Privzeta mapa za prejeto pošto"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Overovitvena metoda"
+
+#~ msgid "Automatic"
+#~ msgstr "Samodejno"
+
+#~ msgid "News"
+#~ msgstr "Novice"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Največje število člankov za nalaganje\n"
+#~ "(neomejeno, če podate 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Naslovnik ni določen."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Poberi vsa' preveri novo pošto na tem računu"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Dodaj polje z datumom v zaglavje"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generiran ID sporočila"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Dodaj uporabniško definirano zaglavje"
+
+#~ msgid " Edit... "
+#~ msgstr " Uredi... "
+
+#~ msgid "Authentication"
+#~ msgstr "Overovitev"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Avtentikacija SMTP (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Če pustite te vnose prazne, bosta uporabljena\n"
+#~ "isti uporabnški ID in geslo kot pri sprejemu."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Pred pošiljanjem avtenticiraj s POP3"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Ukaz"
+
+#~ msgid "Cc"
+#~ msgstr "Kp:"
+
+#~ msgid "Bcc"
+#~ msgstr "Skp:"
+
+#~ msgid "Reply-To"
+#~ msgstr "Odgovor za"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Privzeto podpiši sporočilo"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "privzeto zakodiraj sporočio"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Uporabi jasen tekstovni podpis"
+
+#~ msgid "Sign key"
+#~ msgstr "Ključ za podpisovanje"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Uporabi privzet ključ GnuPG"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Izberi ključ glede na vaš el. naslov"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Ročno določi ključ"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Uporabnik ali ID ključa"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Ne uporabljaj SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Uporabi SSL za povezavo POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Uporabi ukaz STARTTLS za pričetek seje SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Uporabi SSL za povezavo IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Uporabi SSL za povezavo NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Pošlji (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Uporabi SSL za povezavo SMTP"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Vnesite vrata SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Vnesite vrata POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Vnesite vrata IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Vnesite vrata NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Vnesite ime domene"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Imenik strežnika IMAP"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Postavi poslana sporočila v"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Postavi osnutke sporočil v"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Postavi izbrisana sporočila v"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Ime računa ni vnešeno."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Elektronski naslov ni naveden."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Strežnik SMTP ni naveden."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Uporabnikov ID ni vnešen."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Strežnik POP3 ni vnešen."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Strežnik IMAP4 ni naveden."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Strežnik NNTP ni naveden."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Uporaba starega načina oklopljen ASCII za\n"
+#~ "enkripcijo ni priporočljiva. Ni združljiv z\n"
+#~ "RFC 3156 MIME Security z Open PGP"
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Ustvarjam okno za splošne nastavitve...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Splošne nastavitve"
+
+#~ msgid "Quote"
+#~ msgstr "Citat"
+
+#~ msgid "Display"
+#~ msgstr "Prikaz"
+
+#~ msgid "Message"
+#~ msgstr "Sporočila"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Uporabi zunanji program za vključitev"
+
+#~ msgid "Command"
+#~ msgstr "Ukaz"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Pripoji iz spoola"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtriranje ob pripojitvi"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Samodejno preverjanje nove pošte"
+
+#~ msgid "every"
+#~ msgstr "vsak"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut(e)"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Preveri novo pošto ob zagonu"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Posodobi vse lokalne mape po pripojitvi"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Ugotavljam število novih sporočil (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Uporabi zunanji program za pošiljanje"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Shrani poslana sporočila v izhodno mapo"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Izhodni nabor znakov"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Samodejno (priporočeno)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7-bitni ASCII (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Zahodnoevropski (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Zahodnoevropski (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Srednjeevropski (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltski (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltski (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grški (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grški (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Cirilica (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turški (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Cirilica (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Cirilica (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Cirilica (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Cirilica (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonski (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonski (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonski (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Poenostavljena kitajščina (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Poenostavljena kitajščina (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradicionalna kitajščina (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradicionalna kitajščina (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Kitajski (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korejski (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tajski (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tajski (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Če je izbrano `Samodejno', bo uporabljeno\n"
+#~ "optimalno kodiranje za trenutni locale."
+
+#, fuzzy
+#~ msgid "Transfer encoding"
+#~ msgstr "Prelomi pred pošiljanjem"
+
+#~ msgid "Signature separator"
+#~ msgstr "Ločilo podpisa"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Vrini samodejno"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Samodejni zaženi zunanji urejevalnik"
+
+#~ msgid "Undo level"
+#~ msgstr "Razveljavi nivo"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Prelom sporočila ob"
+
+#~ msgid "characters"
+#~ msgstr "znakov"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Prelom citata"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Prelomi ob vnosu"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Prelomi pred pošiljanjem"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Samodejno izberi račun za odgovore"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citiraj sporočila ob odgovarjanju"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
+
+#~ msgid "Reply format"
+#~ msgstr "Oblika odgovora"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Znak za citiranje"
+
+#~ msgid "Forward format"
+#~ msgstr "Oblika posredovanja"
+
+#~ msgid " Description of symbols "
+#~ msgstr "Opis simbolov"
+
+#~ msgid "Font"
+#~ msgstr "Pisava"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Prevedi ime zaglavja (kot `From:', `Subject:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Prikaži število neprebranih poleg imena mape"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Skrajšaj novičarske skupine daljše od"
+
+#~ msgid "letters"
+#~ msgstr "Izbriši"
+
+#~ msgid "Summary View"
+#~ msgstr "Ogled povzetka"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Prikaži naslovnika v stolpcu `Od', če ste pošiljatelj vi"
+
+#~ msgid "Expand threads"
+#~ msgstr "Razširi niti"
+
+#~ msgid "Date format"
+#~ msgstr "Oblika datuma"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr "Nastavi del za prikaz povzetka..."
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Omogoči barvanje sporočila"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Prikaži večzložno abecedo in števila kot\n"
+#~ "znake ASCII (samo japonščina)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Prikaži zaglavje nad ogledom sporočila"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
+
+#~ msgid "Line space"
+#~ msgstr "Prostor za vrstico"
+
+#~ msgid "pixel(s)"
+#~ msgstr "točk(e)"
+
+#~ msgid "Scroll"
+#~ msgstr "Drsenje"
+
+#~ msgid "Half page"
+#~ msgstr "Polovica strani"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Nadzor gladkosti"
+
+#~ msgid "Step"
+#~ msgstr "Korak"
+
+#, fuzzy
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Spremeni velikost pripetim slikam"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Nastavitev prikaza zaglavja"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Izvedi"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Izvedi"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Mapa"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtriranje sporočil ob sprejemu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Samodejno preveri podpise"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Začasno shrani prepustno frazo v pomnilnik"
+
+#~ msgid "Expired after"
+#~ msgstr "Poteče po"
+
+#~ msgid "minute(s) "
+#~ msgstr "minut(e) "
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Nastavitev na '0' bo shranila prepustno frazo\n"
+#~ " za celotno sejo)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Zagrabi vnos med vnašanjem gesla"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Prikaži opozorilo ob zagonu, če GnuPG ne deluje"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Nobena datoteka s sporočilom ni izbrana."
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Odpri prvo neprebrano sporočilo ob vstopu v mapo"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Označi sporočilo kot prebrano samo, ko je odprto v novem oknu"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Ob prejemu novih sporočil pojdi v mapo Prejeto"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Sporočila bodo označena do izvršitve,\n"
+#~ "če je to izklopljeno)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Dialog za sprejem"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Prikaži pogovorno okno za sprejem"
+
+#~ msgid "Always"
+#~ msgstr "Vedno"
+
+#~ msgid "Never"
+#~ msgstr "Nikoli"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Ob napaki pri sprejemanju ne prikaži okna z napako"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Na koncu zapri pogovorno okno za sprejemanje"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Nastavi povezave na tipke... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Spletni brskalnik"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Ob dvojnem kliku dodaj naslov na cilj"
+
+#~ msgid "On exit"
+#~ msgstr "Ob izhodu"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Potrdi ob izhodu"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Izprazni smetnjak ob izhodu"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Vprašaj pred izpranjenjem"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Opozori, če so čakajoča sporočila"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Pišem povzetek predpomnilnika (%s)..."
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "polno okrajšano ime dneva v tednu"
+
+#~ msgid "the full weekday name"
+#~ msgstr "polno ime dneva v tednu"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "okrajšano ime meseca"
+
+#~ msgid "the full month name"
+#~ msgstr "polno ime meseca"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "najustreznejša oblika datuma in časa za trenutni locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "številka stoletja (leto/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "dan v mesecu kot desetiško število"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "ura kot desetiško število s 24-urnim prikazom"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "ura kot desteiško število z 12-urnim prikazom"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "dan v letu kot desetiško število"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "mesec kot desetiško število"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minute kot desetiško število"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM oz. PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekunde kot desetiško število"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "dan v tednu kot desetiško število"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "najustreznejši datum za trenutni locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "zadnji dve števki leta"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "leto kot desetiško število"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "časovni pas ali ime ali okrajšava"
+
+#~ msgid "Specifier"
+#~ msgstr "Določevalec"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "Example"
+#~ msgstr "Primer"
+
+#~ msgid "Set message colors"
+#~ msgstr "Nastavi barve sporočila"
+
+#~ msgid "Colors"
+#~ msgstr "Barve"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Citirano besedilo - prvi nivo"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Citirano besedilo - drugi nivo"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Citirano besedilo - tretji nivo"
+
+#~ msgid "URI link"
+#~ msgstr "povezava URI"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Obnovi barve za citiranje"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Izberite barvo za citiranje na prvem nivoju"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Izberite barvo za citiranje na drugem nivoju"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Izberite barvo za citiranje na tretjem nivoju"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Izberite barvo za URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Opis simbolov"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Datum\n"
+#~ "Od\n"
+#~ "Pošiljateljevo polno ime\n"
+#~ "Pošiljateljevo ime\n"
+#~ "Pošiljateljeve začetnice\n"
+#~ "Zadeva\n"
+#~ "Do\n"
+#~ "Kp\n"
+#~ "Novičarske skupine\n"
+#~ "ID sporočila"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Če je x nastavljen, prikaži expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Telo sporočila\n"
+#~ "Telo citiranega sporočila\n"
+#~ "Telo sporočila brez podpisa\n"
+#~ "Telo citiranega sporočila brez podpisa\n"
+#~ "Dobesedno %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Dobesedna povratna poševnica\n"
+#~ "Dobesedni vprašaj\n"
+#~ "Dobesedni zaviti oklepaj\n"
+#~ "Dobesedni zaviti zaklepaj"
+
+#~ msgid "Key bindings"
+#~ msgstr "Povezave na tipke"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Izberite prednastavitev povezav na tipke.\n"
+#~ "Lahko tudi spremenite bližnjice do vsakega menija, čepritisnete "
+#~ "katerokoli tipko, ko na kos kaže miškin kazalec"
+
+#~ msgid "Default"
+#~ msgstr "Privzeto"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Stari Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Izbira pisave"
 
@@ -6722,9 +6402,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Nastavljam gradnike..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Prestavljam sporočilo %s%c%d v %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tOznačujem sporočila..."
 
diff --git a/po/sr.po b/po/sr.po
index 94b019e2..94d972c7 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -15,13 +15,404 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Čitanje konfiguracije za svaki nalog...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
 
+#: libsylph/imap.c:463
+#, fuzzy, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Direktorijum IMAP servera"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Ne mogu pokrenuti TLS sesiju.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Šaljem poruku (%d / %d bajtova)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Pomeram poruke %s%c%d u %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopiram poruke %s%c%d u %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Primam poruke sa %s u %s...\n"
+
+#: libsylph/imap.c:1455
+#, fuzzy, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "ne mogu postaviti obrisane oznake: %d\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "ne mogu obrisati\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Primam poruke sa %s u %s...\n"
+
+#: libsylph/imap.c:1552
+#, fuzzy
+msgid "can't set deleted flags: 1:*\n"
+msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
+
+#: libsylph/imap.c:1597
+#, fuzzy
+msgid "can't close folder\n"
+msgstr "ne mogu odabrati direktorijum: %s\n"
+
+#: libsylph/imap.c:1675
+#, fuzzy, c-format
+msgid "root folder %s not exist\n"
+msgstr "Označena datoteka ne postoji.\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+#, fuzzy
+msgid "error occurred while getting LIST.\n"
+msgstr "došlo je do greške prilikom dohvatanja LISTe.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "ne mogu kreirati '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "ne mogu kreirati '%s' ispod INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "ne mogu kreirati sanduče: LIST nije uspeo\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "ne mogu kreirati sanduče\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "ne mogu promeniti ime sandučeta %s u %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "ne mogu obrisati sanduče\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "ne mogu dobiti omot\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Šaljem poruku (%d / %d bajtova)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "došlo je do greške prilikom dobijanja omota.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "ne mogu analizirati omot: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Ne mogu se povezati sa IMAP4 serverom: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "ne mogu dobiti namespace\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "ne mogu odabrati direktorijum: %s\n"
+
+#: libsylph/imap.c:3239
+#, fuzzy
+msgid "IMAP4 authentication failed.\n"
+msgstr "Način provere identieta"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 login nije uspeo.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "ne mogu dodati %s na %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(šaljem datoteku...)"
+
+#: libsylph/imap.c:3621
+#, fuzzy, c-format
+msgid "can't append message to %s\n"
+msgstr "ne mogu dodati poruku %s\n"
+
+#: libsylph/imap.c:3653
+#, fuzzy, c-format
+msgid "can't copy %s to %s\n"
+msgstr "ne mogu kopirati %d u %s\n"
+
+#: libsylph/imap.c:3677
+#, fuzzy, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "grečka prilikom imap naredbe: STORE %d:%d %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "greška prilikom imap naredbe: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+#, fuzzy
+msgid "error while imap command: CLOSE\n"
+msgstr "greška prilikom imap naredbe: EXPUNGE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv ne može prebaciti UTF-7 to %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv ne može prebaciti %s to UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "ne mogu kopirati poruku %s u %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Ne mogu otvoriti označenu datoteku.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "izvorni direktorijum jednak je destinaciji.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopiram poruke %s%c%d u %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Posednji broj u direktoriju %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Datoteka `%s' već postoji.\n"
+"Ne mogu napraviti direktorijum."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "uspostavljam NNTP vezu sa %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP veza sa %s:%d je prekinuta. Povezujem se ponovo...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "članak %d već je pohranjen.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "primam članak %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "ne mogu pročitati članak %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "ne mogu primiti listu news grupa\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "ne mogu poslati članak.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "ne mogu primiti članak %d\n"
+
+#: libsylph/news.c:741
+#, fuzzy, c-format
+msgid "can't select group: %s\n"
+msgstr "ne mogu odabrati grupu %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "pogrešan opseg članaka: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "nema novih članaka.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "primam xover %d - %d u %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "ne mogu primiti xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "došlo je do greške prilikom primanja xovera.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "pogrešna xover linija: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "ne mogu dobiti xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "došlo je do greške prilikom primanja xhdra.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Ne mogu uspostaviti vezu sa NNTP serverom: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protokol greška: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protokol greška\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Došlo je do greške prilikom slanja\n"
+
+#: libsylph/nntp.c:363
+#, fuzzy
+msgid "Error occurred while sending command\n"
+msgstr "Došlo je do greške pri radu s poštom."
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Potrebni APOP timestamp nije pronađen u pozdravu\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Syntax greška u timestampu kod pozdrava\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "greška POP3 protokola \n"
+
+#: libsylph/pop.c:254
+#, fuzzy, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "pogrešna xover linija: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Brianje pouka koje su istekle %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Preskakanje poruke %d (%d byte-ova)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "sanduče je zaključano\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr ""
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "ne mogu pokrenuti TLS sesiju\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "greška prilikom provere identiteta\n"
+
+#: libsylph/pop.c:676
+#, fuzzy
+msgid "command not supported\n"
+msgstr "Naredba"
+
+#: libsylph/pop.c:680
+#, fuzzy
+msgid "error occurred on POP3 session\n"
+msgstr "greška prilikom provere identiteta\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -31,6 +422,54 @@ msgstr "Pronađeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Direktorijum"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "ne mogu otvoriti obeleženu datoteku\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "ne mogu dohvatiti poruku %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Ne mogu dobiti deo teksta\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Naredba za štampanje nije dobra: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "došlo je do greške prilikom dohvatanja podataka.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Ne mogu pisati u datoteku.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH nije dostupan\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr ""
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+#, fuzzy
+msgid "error occurred on SMTP session\n"
+msgstr "greška prilikom provere identiteta\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nije dostupan\n"
@@ -163,78 +602,6 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Čitanje konfiguracije za svaki nalog...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Neki prozori za pisanje pisma su otvoreni.\n"
-"Molim, zatvorite sve prozore pre izmena naloga."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Otvaranje prozora za izmenu naloga...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Stvaranje prozora za izmenu naloga...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Izmeni naloge"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nove poruke biti će proveravane ovim redom. Označite pod\n"
-"`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Ime"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Izmeni"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr "Postavi kao uobičajeni nalog "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Želite li zaista obrisati ovaj nalog?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neimenovano"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Obriši nalog"
-
 #: src/action.c:331
 #, fuzzy, c-format
 msgid "Could not get message file %d"
@@ -332,6 +699,14 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Ime"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -346,8 +721,8 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Datoteka"
 
@@ -368,9 +743,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -386,7 +761,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -418,8 +793,8 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/_Alati"
 
@@ -427,13 +802,13 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
@@ -450,17 +825,17 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
@@ -472,7 +847,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adresar"
 
@@ -482,14 +857,14 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Obriši"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -500,11 +875,11 @@ msgid "Lookup"
 msgstr "Potraži"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -531,7 +906,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -637,7 +1012,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Izgled programa"
 
@@ -657,8 +1032,7 @@ msgstr "Adresa e-pošte"
 msgid "Group"
 msgstr "Grupa"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -682,15 +1056,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Greška"
 
@@ -745,8 +1119,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -791,8 +1165,8 @@ msgstr "/_Izmeni/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
 
@@ -800,7 +1174,7 @@ msgstr "/_Izmeni/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
@@ -812,7 +1186,7 @@ msgstr "/_Izmeni/U_baci"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
@@ -829,7 +1203,7 @@ msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pregled"
@@ -851,9 +1225,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -869,7 +1243,7 @@ msgstr "/_Pregled/Len_jir"
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
@@ -881,127 +1255,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
@@ -1009,14 +1383,14 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
@@ -1040,10 +1414,6 @@ msgstr "/_Poruka/_Enkriptuj"
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Ne mogu dobiti deo teksta\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
@@ -1120,7 +1490,7 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
@@ -1212,8 +1582,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Pošalji"
 
@@ -1253,8 +1622,7 @@ msgstr "Prikači"
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Potpis"
 
@@ -1262,7 +1630,7 @@ msgstr "Potpis"
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Editor"
 
@@ -1460,7 +1828,7 @@ msgstr "Izmeni"
 msgid "Clear"
 msgstr "Očisti"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Iznos"
 
@@ -1493,7 +1861,6 @@ msgid " Check File "
 msgstr " Proveri datoteku "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Datoteka"
 
@@ -1549,12 +1916,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -1571,7 +1938,7 @@ msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1635,7 +2002,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -1692,7 +2059,6 @@ msgid "Exporting file:"
 msgstr "Izvozim datoteku:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Odaberite... "
 
@@ -1716,164 +2082,164 @@ msgstr "Prepisati postojeću datoteku?"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Obriši direktorijum"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Traži poruke..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prijavi se na _news grupu..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1883,21 +2249,21 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1908,21 +2274,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1931,34 +2297,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2019,7 +2385,7 @@ msgstr "%d news grupa primljeno (%s pročitano)"
 msgid "Newsgroups:"
 msgstr "News grupe:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -2043,165 +2409,6 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/imap.c:461
-#, fuzzy, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Direktorijum IMAP servera"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Ne mogu pokrenuti TLS sesiju.\n"
-
-#: src/imap.c:1421
-#, fuzzy, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "ne mogu postaviti obrisane oznake: %d\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "ne mogu obrisati\n"
-
-#: src/imap.c:1515
-#, fuzzy
-msgid "can't set deleted flags: 1:*\n"
-msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
-
-#: src/imap.c:1560
-#, fuzzy
-msgid "can't close folder\n"
-msgstr "ne mogu odabrati direktorijum: %s\n"
-
-#: src/imap.c:1638
-#, fuzzy, c-format
-msgid "root folder %s not exist\n"
-msgstr "Označena datoteka ne postoji.\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-#, fuzzy
-msgid "error occurred while getting LIST.\n"
-msgstr "došlo je do greške prilikom dohvatanja LISTe.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "ne mogu kreirati '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "ne mogu kreirati '%s' ispod INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "ne mogu kreirati sanduče: LIST nije uspeo\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "ne mogu kreirati sanduče\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "ne mogu promeniti ime sandučeta %s u %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "ne mogu obrisati sanduče\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "ne mogu dobiti omot\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "došlo je do greške prilikom dobijanja omota.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "ne mogu analizirati omot: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Ne mogu se povezati sa IMAP4 serverom: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "ne mogu dobiti namespace\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "ne mogu odabrati direktorijum: %s\n"
-
-#: src/imap.c:3181
-#, fuzzy
-msgid "IMAP4 authentication failed.\n"
-msgstr "Način provere identieta"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 login nije uspeo.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "ne mogu dodati %s na %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(šaljem datoteku...)"
-
-#: src/imap.c:3563
-#, fuzzy, c-format
-msgid "can't append message to %s\n"
-msgstr "ne mogu dodati poruku %s\n"
-
-#: src/imap.c:3595
-#, fuzzy, c-format
-msgid "can't copy %s to %s\n"
-msgstr "ne mogu kopirati %d u %s\n"
-
-#: src/imap.c:3619
-#, fuzzy, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "grečka prilikom imap naredbe: STORE %d:%d %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "greška prilikom imap naredbe: EXPUNGE\n"
-
-#: src/imap.c:3646
-#, fuzzy
-msgid "error while imap command: CLOSE\n"
-msgstr "greška prilikom imap naredbe: EXPUNGE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv ne može prebaciti UTF-7 to %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv ne može prebaciti %s to UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Uvezi"
@@ -2299,7 +2506,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Sled."
 
@@ -2315,200 +2522,200 @@ msgstr "Atributi"
 msgid "Finish"
 msgstr "Gotovo"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:577
+#: src/inc.c:576
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -2526,29 +2733,20 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Datoteka `%s' već postoji.\n"
-"Ne mogu napraviti direktorijum."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib ne podržava g_thread.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2558,48 +2756,48 @@ msgstr ""
 "                         otvara prozor za pisanje sa navedenim datotekama\n"
 "                         dodato"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primi sve poruke sa svih naloga"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 šalje sve odložene poruke"
 
-#: src/main.c:329
+#: src/main.c:339
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:330
+#: src/main.c:340
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaž ovu pomoć izađi"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2613,19 +2811,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Napisana poruka postoji. Zaista prekinuti?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2634,662 +2832,662 @@ msgstr ""
 "OpenPGP podrška je onemogućena."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Direktorijum/Kreiraj _novi direktorijum..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Direktorijum/_Obriši direktorijum"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datoteka/_Proveri nove poruke u svim direktorijumima"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unos mbox datoteku..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvoz u mbox datoteku..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Štampanje..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Izmene/Odaberi _thread"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Izmne/P_retraga u trenutnoj poruci..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Izmene/_Traži poruke..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži ili s_kloni"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Drvo direktorijuma"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Pregled poruka"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka za alat"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/Ikon_e i text"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo direktorijuma"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Pregled/_Složi"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pregled/_Složi/po _broju"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pregled/_Složi/po _pošiljaocu"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pregled/_Složi/po _temi"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pregled/_Složi/po oznaci bo_je"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pregled/_Složi/po _oznaci"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pregled/_Složi/po _nepročitanom"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pregled/_Složi/po dodat_ku"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pregled/_Složi/Nemoj složiti"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Složi/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/_Složi/Rastuće"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pregled/_Složi/Privuci po te_mi"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/Th_read izgled"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pregled/Proširi kompletan t_hread"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Skupi komp_letan thread"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Pregled/Postavi po_jedinosti prikaza..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Idi do"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pregled/_Idi do/_Prethodne poruke"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pregled/_Idi do/_Sledeće poruke"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Idi do/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pregled/_Idi do/Prethodne _nepročitane poruke"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pregled/_Idi do/S_ledeće nepročitane poruke"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pregled/_Idi do/Prethodne n_ove poruke"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pregled/_Idi do/Sledeće no_ve poruke"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pregled/_Idi do/Prethodne oz_načene poruke"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pregled/_Idi do/Sledeće o_značene poruke"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pregled/_Idi do/Prethodne etiketirane poruke"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži kompletno _zaglavlje"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Premeštanje..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Označi"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_znači/_Označi"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_znači/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duple poruke"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/_Alati/_Izvrši"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Šablon..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_FAQ/_Engleski"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_FAQ/_Nemački"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_FAQ/_Španski"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_FAQ/_Francuski"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Menjanje vrste podele prozora iz %d u %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3299,16 +3497,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3317,153 +3515,152 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3581,32 +3778,32 @@ msgstr "Kraj liste dosegnut; nastaviti od početka?"
 msgid "Search finished"
 msgstr "Pretraga završena"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Pravljenje pregleda poruka...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Dodatak"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3615,7 +3812,7 @@ msgstr ""
 "Unesite naredbu za štampanje:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3624,41 +3821,6 @@ msgstr ""
 "Naredba za štampanje je pogrešna:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "ne mogu kopirati poruku %s u %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Ne mogu otvoriti označenu datoteku.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "izvorni direktorijum jednak je destinaciji.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopiram poruke %s%c%d u %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Posednji broj u direktoriju %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Otvori"
@@ -3745,116 +3907,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Naredba MIME nije ispravna: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "uspostavljam NNTP vezu sa %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP veza sa %s:%d je prekinuta. Povezujem se ponovo...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "članak %d već je pohranjen.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "primam članak %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "ne mogu pročitati članak %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "ne mogu primiti listu news grupa\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "ne mogu poslati članak.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "ne mogu primiti članak %d\n"
-
-#: src/news.c:744
-#, fuzzy, c-format
-msgid "can't select group: %s\n"
-msgstr "ne mogu odabrati grupu %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "pogrešan opseg članaka: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "nema novih članaka.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "primam xover %d - %d u %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "ne mogu primiti xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "došlo je do greške prilikom primanja xovera.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "pogrešna xover linija: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "ne mogu dobiti xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "došlo je do greške prilikom primanja xhdra.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Ne mogu uspostaviti vezu sa NNTP serverom: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protokol greška: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protokol greška\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Došlo je do greške prilikom slanja\n"
-
-#: src/nntp.c:363
-#, fuzzy
-msgid "Error occurred while sending command\n"
-msgstr "Došlo je do greške pri radu s poštom."
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Lozinka"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[nema ID korinika]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3867,7 +3928,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3875,457 +3936,6 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Potrebni APOP timestamp nije pronađen u pozdravu\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Syntax greška u timestampu kod pozdrava\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "greška POP3 protokola \n"
-
-#: src/pop.c:254
-#, fuzzy, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "pogrešna xover linija: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Brianje pouka koje su istekle %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Preskakanje poruke %d (%d byte-ova)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "sanduče je zaključano\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr ""
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "ne mogu pokrenuti TLS sesiju\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "greška prilikom provere identiteta\n"
-
-#: src/pop.c:676
-#, fuzzy
-msgid "command not supported\n"
-msgstr "Naredba"
-
-#: src/pop.c:680
-#, fuzzy
-msgid "error occurred on POP3 session\n"
-msgstr "greška prilikom provere identiteta\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Otvaram prozor za svojstva naloga...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Nalog%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Podešavanja za novi nalog"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Podešavanje naloga"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Stvaranje prozora za podešavanje naloga...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Primanje"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privatnost"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Napredno"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Ime ovog naloga"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Postavi kao uobičajeni"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Lične informacije"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Puno ime"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Adresa e-pošte"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organizacija"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Informacije o serveru"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Ništa (lokalno)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Ovaj server zahteva proveru identiteta"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "News server"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server za primanje"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP server (slanje)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "ID korisnika"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Lozinka"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Ovaj server zahteva proveru identiteta"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Ukloni poruke sa servera nakon primanja"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Ukloni posle"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dana"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dana: odmah ukloni)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Preuzmi sve poruke sa servera"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Ograničenje u veličini za primanje"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtriraj poruke pri primanju"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Uobičajeno sanduče"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Način provere identieta"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatski"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "News"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maksimalni broj članaka za preuzimanje\n"
-"(0 je za neograničeno)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Primalac nije upisan."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "`Primi sve' proverava poruke za ovaj nalog"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Zaglavlje"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Dodaj polje Datum u zaglavlje"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Generiši ID poruke"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Dodaj zaglavlje korisnika"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Izmeni... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Provera identiteta"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP identifikacija (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Ako ostaviš ove unose prazne, isti\n"
-"koririsnički ID i lozinka će biti korišćeni."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Proveri identitet sa POP3 pre slanja"
-
-#: src/prefs_account.c:1419
-#, fuzzy
-msgid "Command output"
-msgstr "Naredba"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Automatski postavi sledeće adrese"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Odvovori-Na"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Uvek potpiši poruke"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Uvek šifruj poruke"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Koristi ASCII-armored format za šifrovanje"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Koristi prazan tekst za potpis"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Ključ potpisa"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Koristi uobičajeni GnuPG ključ"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Odaberi ključ po adresi e-pošte"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Navedi neki drugi ključ"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "ID ključa ili korisnika:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Ne koristi SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Koristi SSL za POP3 veze"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Koristi SSL za IMAP4 veze"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Koristi SSL za NNTP veze"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Slanje (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Koristi SSL za SMTP veze"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr ""
-
-#: src/prefs_account.c:1735
-msgid "Turn this off if you have problems in SSL connection."
-msgstr ""
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Navedi SMTP port"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Navedi POP3 port"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Navedi IMAP4 port"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Navedi NNTP port"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Navedi ime domena"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Direktorijum IMAP servera"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Stavi poslate poruke u"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Stavi nedovršene poruke u"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Stavi obrisane poruke u"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Ime naloga nije upisano."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Adresa e-pošte nije upisana."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP server nije upisan."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "ID korisnika nije upisan."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3 server nije upisan."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4 server nije upisan."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP server nije upisan."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Ne preporučuje se korišćenje starog ASCII-armored\n"
-"načina za šifrovanje poruka. On nije saglasan sa\n"
-"RFC 3156 - MIME Sigurnost sa OpenPGP-om."
-
 #: src/prefs_actions.c:172
 #, fuzzy
 msgid "Actions configuration"
@@ -4388,17 +3998,17 @@ msgstr "Sintaksna pomoć"
 msgid "Registered actions"
 msgstr "Registrovane akcije"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Gore"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Dole"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -4441,835 +4051,31 @@ msgstr "Obriši akciju"
 msgid "Do you really want to delete this action?"
 msgstr "Želite li zaista obrisati ovu akciju?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Direktorijum"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Stvaranje prozor za uobičajena podešavanja...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Uobičajena podešavanja"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Prikaz"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Poruka"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Drugo"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Koristi spoljni program za prihvatanje"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Naredba"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Prihvati sa spoola"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtriraj pri prihvataju"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr ""
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Auto-provera nove pošte"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "svakih"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuta"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Proveri poštu prilikom starta"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Osveži sve direktorijume posle prihvatanja"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Preuzimam broj novih poruka (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Koristi spoljni program za slanje"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Sačuvaj poslate poruke u poslato"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Izlazni charset"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatsko (preporučeno)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Zapadno-Evropski (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Zapadno-Europski (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Srednje-Evropski (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Blatički (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Blatički (ISO'8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grčki (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grčki (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Ćirilica (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turski (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Ćirilica (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Ćirilica (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Ćirilica (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Ćirilica (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japanski (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japanski (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japanski (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Pojednostavljeni Kineski (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Pojednostavljeni Kineski (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Tradicionalni Kineski (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Tradicionalni Kineski (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Kineski (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korejski (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Ako je `Automatski' odabrano, optimalni charset\n"
-"za locale će biti korišćen."
-
-#: src/prefs_common.c:1287
-#, fuzzy
-msgid "Transfer encoding"
-msgstr "Sažmi pre slanja"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Odvaja potpis"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Ubaci automatski"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Automatski pokreni spoljašnji editor"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Undo nivo"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Sažmi poruke na"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "znakova"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Sažmi citat"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Sažmi pri unosu"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Sažmi pre slanja"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Automatski odaberi nalog za odgovore"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citiraj poruku pri odgovaranju"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Taster za odgovor povlači odgovor za listu"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Format odgovora"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Oznaka citata"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Format proseđivanja"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Objašnjenje simbola "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Font"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Skrati news grupe duže od"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "slova"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Pregled održavanja"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Raširi stablo"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Format datuma"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Postavljanje pojedinosti prikaza... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Omogući poruke u boji"
-
-#: src/prefs_common.c:1814
-#, fuzzy
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "Prikaži 2-byte abecedu i brojeve sa 1-byte znakovima"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Prikaži zaglavlje iznad poruke"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Prikaži kratko zaglavlje na pregledu poruka"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Prikaži kratko zaglavlje na pregledu poruka"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Razmak linija"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "pixel(a)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Scroll"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Pola stranice"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Miran scroll"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Korak"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr ""
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Prikaz podešavanje zaglavlja"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Izvrši"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Izvrši"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "Direktorijum"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtriraj poruke pri primanju"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Automatski proveri potpis"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Prikaži potpis u popup prozoru"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Smesti lozinku privremeno u memoriju"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Ističe posle"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minut(a)"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Postavljanje na '0' će smestiti loyinku\n"
-"u toku cele sesije)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Uhvati unos pri upisivanju lozinke"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
-
-#: src/prefs_common.c:2204
-#, fuzzy
-msgid "Always open messages in summary when selected"
-msgstr "Nijedna datoteka poruke nije odabrana."
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Otvori prvu nepročitanu poruku pri ulasku u direktorijum"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Samo označi poruke kao pročitane pri otvaranju novog prozora"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Idi u sanduče posle primanja pošte"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Poruke će samo biti označene do izvršenja\n"
-" ako je ovo isključeno)"
-
-#: src/prefs_common.c:2239
-#, fuzzy
-msgid "Receive dialog"
-msgstr "Prikaži dijalog primanja"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Prikaži dijalog primanja"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Uvek"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr ""
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Nikada"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Ne izbacuj prozor sa porukom o grešci u primanju"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Zatvori dijalog primanja kada se završi"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Podešavanje prečica na tastaturi..."
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Spoljašnje naredbe (%s će biti zamenjeno imenom datoteke / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Web čitač"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Dodaj adresu u odredište kada se dva put klikne"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Na izlazu"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Potvrdi izlaz"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Isprazni smeće pri izlazu"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Pitaj pre pražnjenja"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Upozori ako ima odloženih poruka"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Pišenje pohranu pregleda (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr ""
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr ""
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "pojednostavljeno ime dana u nedelji"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "puno ime dana u nedelji"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "skraćeno ime meseca"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "puno ime meseca"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "željeni datum i vreme za trenutni locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "broj veka (godina/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "dan u mesecu kao decimalni broj"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "sat kao decimalni broj koristeći 24 satno vreme"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "sat kao decimalni broj koristeći 12 satno vreme"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "dan u godini kao decimalni broj"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "mesec kao decimalni broj"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minuti kao decimalni broj"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM ili PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekunde kao decimalni broj"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "dan u nedelji kao decimalni broj"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "željeni datum za trenutni locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "posljednje dve cifre godine"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "godina kao decimalni broj"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "vremenska zona ili ime ili skraćenica"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Specifier"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Opis"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Primer"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Podesi boje poruka"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Boje"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Citirani tekst - prvi nivo"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Citirani tekst - drugi nivo"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Citirani tekst - treći nivo"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI link"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Ciklično menjaj boje citata"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Odaberite boju za citat 1. stepena"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Odaberite boju za citat 2. stepena"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Odaberite boju za citat 3. tepena"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Odaberite boju za URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Obajšnjenje znakova"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Datum\n"
-"Od\n"
-"Puno ime pošiljaoca\n"
-"Ime pošiljaoca\n"
-"Inicijali pošiljaoca\n"
-"Tema\n"
-"Za\n"
-"Cc\n"
-"News grupe\n"
-"ID poruke"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Ako je x odabrano, prikazuje expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Telo poruke\n"
-"Citirano telo poruke\n"
-"Telo poruke sa potpisom\n"
-"Citirano telo poruke sa potpisom\n"
-"Literal %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Literal backslash\n"
-"Literal znak pitanja\n"
-"Literal početna zagrada\n"
-"Literal završna zagrada"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Prečice sa tastature"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Odaberite već našesten set prečica sa testature.\n"
-"Takođe možete menjati prečice svakog menija pritiskom na\n"
-"bilo koji taster kada postavite kursor miša na pojedinu stvar."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Uobičajeno"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Stari Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Podešavanje određenog zaglavlja"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Zaglavlje"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Obriši "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Određeno zaglavlje"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Ime zaglavlja nije podešeno."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Obriši zaglavlje"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Zaista želite obrisati ovo zaglavlje?"
 
@@ -5317,12 +4123,21 @@ msgstr "Podešavanje filtera"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Izmeni"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Zaista obrisati pravilo?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neimenovano"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
@@ -5411,6 +4226,10 @@ msgstr ""
 msgid "is shorter than"
 msgstr ""
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
@@ -5553,6 +4372,10 @@ msgstr ""
 msgid "Apply to subfolders"
 msgstr "Primeni na poddirektorijume"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Automatski postavi sledeće adrese"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "koristi i prilikom odovora"
@@ -5626,64 +4449,46 @@ msgstr "Prikazane pojedinosti"
 msgid " Revert to default "
 msgstr " Vrati na uobičajeno "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Ime šablona"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Unesi"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Zameni "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrovani šabloni"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Šabloni"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Šablon"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Greška formata šablona."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Briši šablon"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Zaista želite obrisati ovaj šablon?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "ne mogu otvoriti obeleženu datoteku\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "ne mogu dohvatiti poruku %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Naredba za štampanje nije dobra: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Stvaranje dijaloga napretka...\n"
@@ -5692,29 +4497,21 @@ msgstr "Stvaranje dijaloga napretka...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "došlo je do greške prilikom dohvatanja podataka.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Ne mogu pisati u datoteku.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Ne mogu naći ID korisnika za ovaj ključ."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Potpis napravljen %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Greška pri potvrđivanju potpisa"
 
@@ -5740,6 +4537,10 @@ msgstr "ID ključa"
 msgid "Val"
 msgstr "Oznaka"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Drugo"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj ključ"
@@ -5760,88 +4561,88 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Ne mogu izvršiti spoljašnu naredbu: %s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP server: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 #, fuzzy
 msgid "Authenticating"
 msgstr "Provera identiteta"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Završavnje..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5941,33 +4742,20 @@ msgstr "LOŠ potpis"
 msgid "No public key to verify the signature"
 msgstr "Nema javnog ključa za potvrdu potpisa"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH nije dostupan\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr ""
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-#, fuzzy
-msgid "error occurred on SMTP session\n"
-msgstr "greška prilikom provere identiteta\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Stvaranje prozora za izvor...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Izvorna poruka"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Prikazujem izvor od %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Izvor"
@@ -6364,6 +5152,895 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Neki prozori za pisanje pisma su otvoreni.\n"
+#~ "Molim, zatvorite sve prozore pre izmena naloga."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Otvaranje prozora za izmenu naloga...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Stvaranje prozora za izmenu naloga...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Izmeni naloge"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nove poruke biti će proveravane ovim redom. Označite pod\n"
+#~ "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokol"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr "Postavi kao uobičajeni nalog "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Želite li zaista obrisati ovaj nalog?"
+
+#~ msgid "Delete account"
+#~ msgstr "Obriši nalog"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Otvaram prozor za svojstva naloga...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Nalog%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Podešavanja za novi nalog"
+
+#~ msgid "Account preferences"
+#~ msgstr "Podešavanje naloga"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Stvaranje prozora za podešavanje naloga...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Primanje"
+
+#~ msgid "Privacy"
+#~ msgstr "Privatnost"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Name of this account"
+#~ msgstr "Ime ovog naloga"
+
+#~ msgid "Set as default"
+#~ msgstr "Postavi kao uobičajeni"
+
+#~ msgid "Personal information"
+#~ msgstr "Lične informacije"
+
+#~ msgid "Full name"
+#~ msgstr "Puno ime"
+
+#~ msgid "Mail address"
+#~ msgstr "Adresa e-pošte"
+
+#~ msgid "Organization"
+#~ msgstr "Organizacija"
+
+#~ msgid "Server information"
+#~ msgstr "Informacije o serveru"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "News (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Ništa (lokalno)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Ovaj server zahteva proveru identiteta"
+
+#~ msgid "News server"
+#~ msgstr "News server"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server za primanje"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP server (slanje)"
+
+#~ msgid "User ID"
+#~ msgstr "ID korisnika"
+
+#~ msgid "Password"
+#~ msgstr "Lozinka"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Ovaj server zahteva proveru identiteta"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Ukloni poruke sa servera nakon primanja"
+
+#~ msgid "Remove after"
+#~ msgstr "Ukloni posle"
+
+#~ msgid "days"
+#~ msgstr "dana"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dana: odmah ukloni)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Preuzmi sve poruke sa servera"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Ograničenje u veličini za primanje"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtriraj poruke pri primanju"
+
+#~ msgid "Default inbox"
+#~ msgstr "Uobičajeno sanduče"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Način provere identieta"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatski"
+
+#~ msgid "News"
+#~ msgstr "News"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maksimalni broj članaka za preuzimanje\n"
+#~ "(0 je za neograničeno)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Primalac nije upisan."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "`Primi sve' proverava poruke za ovaj nalog"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Dodaj polje Datum u zaglavlje"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Generiši ID poruke"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Dodaj zaglavlje korisnika"
+
+#~ msgid " Edit... "
+#~ msgstr " Izmeni... "
+
+#~ msgid "Authentication"
+#~ msgstr "Provera identiteta"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP identifikacija (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Ako ostaviš ove unose prazne, isti\n"
+#~ "koririsnički ID i lozinka će biti korišćeni."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Proveri identitet sa POP3 pre slanja"
+
+#, fuzzy
+#~ msgid "Command output"
+#~ msgstr "Naredba"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Odvovori-Na"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Uvek potpiši poruke"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Uvek šifruj poruke"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Koristi ASCII-armored format za šifrovanje"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Koristi prazan tekst za potpis"
+
+#~ msgid "Sign key"
+#~ msgstr "Ključ potpisa"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Koristi uobičajeni GnuPG ključ"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Odaberi ključ po adresi e-pošte"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Navedi neki drugi ključ"
+
+#~ msgid "User or key ID:"
+#~ msgstr "ID ključa ili korisnika:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Ne koristi SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Koristi SSL za POP3 veze"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Koristi SSL za IMAP4 veze"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Koristi SSL za NNTP veze"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Slanje (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Koristi SSL za SMTP veze"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Navedi SMTP port"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Navedi POP3 port"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Navedi IMAP4 port"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Navedi NNTP port"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Navedi ime domena"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Direktorijum IMAP servera"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Stavi poslate poruke u"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Stavi nedovršene poruke u"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Stavi obrisane poruke u"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Ime naloga nije upisano."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Adresa e-pošte nije upisana."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP server nije upisan."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "ID korisnika nije upisan."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3 server nije upisan."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4 server nije upisan."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP server nije upisan."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Ne preporučuje se korišćenje starog ASCII-armored\n"
+#~ "načina za šifrovanje poruka. On nije saglasan sa\n"
+#~ "RFC 3156 - MIME Sigurnost sa OpenPGP-om."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Stvaranje prozor za uobičajena podešavanja...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Uobičajena podešavanja"
+
+#~ msgid "Quote"
+#~ msgstr "Citat"
+
+#~ msgid "Display"
+#~ msgstr "Prikaz"
+
+#~ msgid "Message"
+#~ msgstr "Poruka"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Koristi spoljni program za prihvatanje"
+
+#~ msgid "Command"
+#~ msgstr "Naredba"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Prihvati sa spoola"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtriraj pri prihvataju"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Auto-provera nove pošte"
+
+#~ msgid "every"
+#~ msgstr "svakih"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuta"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Proveri poštu prilikom starta"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Osveži sve direktorijume posle prihvatanja"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Preuzimam broj novih poruka (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Koristi spoljni program za slanje"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Sačuvaj poslate poruke u poslato"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Izlazni charset"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatsko (preporučeno)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Zapadno-Evropski (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Zapadno-Europski (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Srednje-Evropski (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Blatički (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Blatički (ISO'8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grčki (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grčki (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Ćirilica (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turski (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Ćirilica (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Ćirilica (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Ćirilica (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Ćirilica (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japanski (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japanski (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japanski (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Pojednostavljeni Kineski (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Pojednostavljeni Kineski (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Tradicionalni Kineski (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Tradicionalni Kineski (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Kineski (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korejski (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Ako je `Automatski' odabrano, optimalni charset\n"
+#~ "za locale će biti korišćen."
+
+#, fuzzy
+#~ msgid "Transfer encoding"
+#~ msgstr "Sažmi pre slanja"
+
+#~ msgid "Signature separator"
+#~ msgstr "Odvaja potpis"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Ubaci automatski"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Automatski pokreni spoljašnji editor"
+
+#~ msgid "Undo level"
+#~ msgstr "Undo nivo"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Sažmi poruke na"
+
+#~ msgid "characters"
+#~ msgstr "znakova"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Sažmi citat"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Sažmi pri unosu"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Sažmi pre slanja"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Automatski odaberi nalog za odgovore"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citiraj poruku pri odgovaranju"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Taster za odgovor povlači odgovor za listu"
+
+#~ msgid "Reply format"
+#~ msgstr "Format odgovora"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Oznaka citata"
+
+#~ msgid "Forward format"
+#~ msgstr "Format proseđivanja"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Objašnjenje simbola "
+
+#~ msgid "Font"
+#~ msgstr "Font"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Skrati news grupe duže od"
+
+#~ msgid "letters"
+#~ msgstr "slova"
+
+#~ msgid "Summary View"
+#~ msgstr "Pregled održavanja"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
+
+#~ msgid "Expand threads"
+#~ msgstr "Raširi stablo"
+
+#~ msgid "Date format"
+#~ msgstr "Format datuma"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Postavljanje pojedinosti prikaza... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Omogući poruke u boji"
+
+#, fuzzy
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "Prikaži 2-byte abecedu i brojeve sa 1-byte znakovima"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Prikaži zaglavlje iznad poruke"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Prikaži kratko zaglavlje na pregledu poruka"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Prikaži kratko zaglavlje na pregledu poruka"
+
+#~ msgid "Line space"
+#~ msgstr "Razmak linija"
+
+#~ msgid "pixel(s)"
+#~ msgstr "pixel(a)"
+
+#~ msgid "Scroll"
+#~ msgstr "Scroll"
+
+#~ msgid "Half page"
+#~ msgstr "Pola stranice"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Miran scroll"
+
+#~ msgid "Step"
+#~ msgstr "Korak"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Prikaz podešavanje zaglavlja"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Izvrši"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Izvrši"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "Direktorijum"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtriraj poruke pri primanju"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Automatski proveri potpis"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Prikaži potpis u popup prozoru"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Smesti lozinku privremeno u memoriju"
+
+#~ msgid "Expired after"
+#~ msgstr "Ističe posle"
+
+#~ msgid "minute(s) "
+#~ msgstr "minut(a)"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Postavljanje na '0' će smestiti loyinku\n"
+#~ "u toku cele sesije)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Uhvati unos pri upisivanju lozinke"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
+
+#, fuzzy
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Nijedna datoteka poruke nije odabrana."
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Otvori prvu nepročitanu poruku pri ulasku u direktorijum"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Samo označi poruke kao pročitane pri otvaranju novog prozora"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Idi u sanduče posle primanja pošte"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Poruke će samo biti označene do izvršenja\n"
+#~ " ako je ovo isključeno)"
+
+#, fuzzy
+#~ msgid "Receive dialog"
+#~ msgstr "Prikaži dijalog primanja"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Prikaži dijalog primanja"
+
+#~ msgid "Always"
+#~ msgstr "Uvek"
+
+#~ msgid "Never"
+#~ msgstr "Nikada"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Ne izbacuj prozor sa porukom o grešci u primanju"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Zatvori dijalog primanja kada se završi"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Podešavanje prečica na tastaturi..."
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Spoljašnje naredbe (%s će biti zamenjeno imenom datoteke / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Web čitač"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Dodaj adresu u odredište kada se dva put klikne"
+
+#~ msgid "On exit"
+#~ msgstr "Na izlazu"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Potvrdi izlaz"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Isprazni smeće pri izlazu"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Pitaj pre pražnjenja"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Upozori ako ima odloženih poruka"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Pišenje pohranu pregleda (%s)..."
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "pojednostavljeno ime dana u nedelji"
+
+#~ msgid "the full weekday name"
+#~ msgstr "puno ime dana u nedelji"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "skraćeno ime meseca"
+
+#~ msgid "the full month name"
+#~ msgstr "puno ime meseca"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "željeni datum i vreme za trenutni locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "broj veka (godina/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "dan u mesecu kao decimalni broj"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "sat kao decimalni broj koristeći 24 satno vreme"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "sat kao decimalni broj koristeći 12 satno vreme"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "dan u godini kao decimalni broj"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "mesec kao decimalni broj"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minuti kao decimalni broj"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM ili PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekunde kao decimalni broj"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "dan u nedelji kao decimalni broj"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "željeni datum za trenutni locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "posljednje dve cifre godine"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "godina kao decimalni broj"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "vremenska zona ili ime ili skraćenica"
+
+#~ msgid "Specifier"
+#~ msgstr "Specifier"
+
+#~ msgid "Description"
+#~ msgstr "Opis"
+
+#~ msgid "Example"
+#~ msgstr "Primer"
+
+#~ msgid "Set message colors"
+#~ msgstr "Podesi boje poruka"
+
+#~ msgid "Colors"
+#~ msgstr "Boje"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Citirani tekst - prvi nivo"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Citirani tekst - drugi nivo"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Citirani tekst - treći nivo"
+
+#~ msgid "URI link"
+#~ msgstr "URI link"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Ciklično menjaj boje citata"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Odaberite boju za citat 1. stepena"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Odaberite boju za citat 2. stepena"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Odaberite boju za citat 3. tepena"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Odaberite boju za URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Obajšnjenje znakova"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Datum\n"
+#~ "Od\n"
+#~ "Puno ime pošiljaoca\n"
+#~ "Ime pošiljaoca\n"
+#~ "Inicijali pošiljaoca\n"
+#~ "Tema\n"
+#~ "Za\n"
+#~ "Cc\n"
+#~ "News grupe\n"
+#~ "ID poruke"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Ako je x odabrano, prikazuje expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Telo poruke\n"
+#~ "Citirano telo poruke\n"
+#~ "Telo poruke sa potpisom\n"
+#~ "Citirano telo poruke sa potpisom\n"
+#~ "Literal %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Literal backslash\n"
+#~ "Literal znak pitanja\n"
+#~ "Literal početna zagrada\n"
+#~ "Literal završna zagrada"
+
+#~ msgid "Key bindings"
+#~ msgstr "Prečice sa tastature"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Odaberite već našesten set prečica sa testature.\n"
+#~ "Takođe možete menjati prečice svakog menija pritiskom na\n"
+#~ "bilo koji taster kada postavite kursor miša na pojedinu stvar."
+
+#~ msgid "Default"
+#~ msgstr "Uobičajeno"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Stari Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Izbor fonta"
 
@@ -6723,9 +6400,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "Postavljanje widgeta..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "Pomeram poruke %s%c%d u %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tOznavanje poruke..."
 
diff --git a/po/sv.po b/po/sv.po
index 85a2b49b..5f5fda9e 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -15,13 +15,396 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Läser all konfiguration för varje konto...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "misslyckades skriva konfiguration till fil\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "IMAP4-förbindelse till %s har avbrutits. Återuppkopplar...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP-servermapp"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "skapar IMAP4-förbindelse till %s:%d...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Kan inte starta TLS-session.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Skickar meddelande (%d / %d byte)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Kopierar meddelande %s%c%d till %s...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Kopierar meddelande %s%c%d till %s...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Hämtar meddelanden från %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "kan inte sätta borttaget-flaggor: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "kan inte utplåna\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Hämtar meddelanden från %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "kan inte stänga mapp\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "rotmapp %s finns inte\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "fel uppstod vid hämtning av LIST.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Kan inte skapa \"%s\"\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "kan inte skapa \"%s\" under INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "kan inte skapa brevlåda\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "kan inte byta namn på brevlåda %s till %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "kan inte ta bort brevlåda\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "kan inte hämta kuvert\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Skickar meddelande (%d / %d byte)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "fel uppstod vid hämtning av kuvert.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "kan inte tolka kuvert: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "kan inte hämta namnutrymme\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "kan inte välja mapp: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4-autentisering misslyckades.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4-inloggning misslyckades.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "kan inte lägga till %s till %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(skickar fil...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "kan inte lägga till meddelande till %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "kan inte kopiera %s till %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "fel vid imapkommando: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "fel vid imapkommando: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "fel vid imapkommando: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv kan inte konvertera UTF-7 till %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv kan inte konvertera %s till UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "kan inte kopiera meddelande %s till %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Kan inte öppna markeringsfil.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "ursprungsmappen är identisk med dest.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Kopierar meddelande %s%c%d till %s...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Sista tal i mapp %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Filen \"%s\" finns redan.\n"
+"Kan inte skapa mapp."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "skapar NNTP-förbindelse till %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "NNTP-förbindelse till %s:%d har avbrutits. Återuppkopplar...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "inlägget %d har redan cachats.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "hämtar inlägg %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "kan inte läsa inlägg %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "kan inte hämta diskussionsgruppslistan\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "kan inte posta inlägg.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "kan inte hämta inlägg %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "kan inte välja grupp %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "felaktigt inläggsomfång: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "inga nya inlägg.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "hämtar xover %d - %d i %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "kan inte hämta xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "fel uppstod vid hämtning av xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "felaktig xover-rad: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "kan inte hämta xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "fel uppstod vid hämtning av xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protokollfel: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protokollfel\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Fel uppstod vid postning\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Fel uppstod när kommandot skickades\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Nödvändig APOP-tidsmarkering inte funnen i hälsning\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Syntaxfel på tidsmarkering i hälsning\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3-protokollfel\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "felaktigt UIDL-svar: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Tar bort utgånget meddelande %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Hoppar över meddelande %d (%d byte)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "brevlådan är låst\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "sessionens väntetid tog slut\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "kan inte starta TLS-session\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "fel uppstod vid autentisering\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "kommando är inte stött\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "fel uppstod vid POP3-session\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -31,6 +414,53 @@ msgstr "Fann %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurationen är sparad.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "mapp"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "kan inte öppna markeringsfil\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "kan inte hämta meddelande %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Kan inte läsa textdel\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "fel uppstod vid inhämtning av data.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Kan inte skriva till fil.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH ej tillgängligt\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "felaktigt SMTP-svar\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "fel uppstod vid SMTP-session\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ej tillgängligt\n"
@@ -164,79 +594,6 @@ msgstr ""
 "program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place "
 "- Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Läser all konfiguration för varje konto...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Några skrivfönster är öppna.\n"
-"Stäng alla skrivfönster innan du redigerar kontona."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Öppnar kontoredigeringsfönstret...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Skapar kontoredigeringsfönster...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Redigera konton"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Nya meddelanden kommer att kontrolleras i denna ordning.\n"
-"Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
-"via \"Hämta alla\""
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Namn"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Server"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Redigera"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Använd som förvalt konto "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Vill du verkligen ta bort detta konto?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Namnlös"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Ta bort konto"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -336,6 +693,14 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Namn"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -350,8 +715,8 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Arkiv"
 
@@ -372,9 +737,9 @@ msgid "/_File/New _Server"
 msgstr "/_Arkiv/Ny _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
@@ -390,7 +755,7 @@ msgstr "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
@@ -422,8 +787,8 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
@@ -431,13 +796,13 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
@@ -454,17 +819,17 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Redigera"
 
@@ -476,7 +841,7 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -486,14 +851,14 @@ msgstr "Namn:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Ta bort"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -504,11 +869,11 @@ msgid "Lookup"
 msgstr "Slå upp"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Kopia:"
 
@@ -535,7 +900,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:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -643,7 +1008,7 @@ msgstr "Fel vid konvertering av adressbok"
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Gränssnitt"
 
@@ -663,8 +1028,7 @@ msgstr "E-postadress"
 msgid "Group"
 msgstr "Grupp"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Mapp"
 
@@ -688,15 +1052,15 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Notera"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Fel"
 
@@ -751,8 +1115,8 @@ msgstr "/_Lägg till..."
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
@@ -792,8 +1156,8 @@ msgstr "/_Redigera/_Ångra"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
@@ -801,7 +1165,7 @@ msgstr "/_Redigera/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
@@ -813,7 +1177,7 @@ msgstr "/_Redigera/Klistra _in"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
@@ -829,7 +1193,7 @@ msgstr "/_Redigera/Bryt _långa rader"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Visa"
@@ -851,9 +1215,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
@@ -869,7 +1233,7 @@ msgstr "/_Visa/_Linjal"
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Sortera/Nedstigande"
@@ -881,127 +1245,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Kodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Kodning/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Kodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Kodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Kodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Kodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Kodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Kodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Kodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Kodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Kodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Kodning/Thai (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Kodning/Thai (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
@@ -1009,14 +1373,14 @@ msgstr "/V_erktyg/_Adressbok"
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
@@ -1037,10 +1401,6 @@ msgstr "/V_erktyg/_Kryptera"
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Kan inte läsa textdel\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
@@ -1117,7 +1477,7 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
@@ -1210,8 +1570,7 @@ msgstr "MIME-typ"
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Skicka"
 
@@ -1251,8 +1610,7 @@ msgstr "Bifoga"
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Signatur"
 
@@ -1260,7 +1618,7 @@ msgstr "Signatur"
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Redigerare"
 
@@ -1457,7 +1815,7 @@ msgstr "Ändra"
 msgid "Clear"
 msgstr "Töm"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Värde"
 
@@ -1490,7 +1848,6 @@ msgid " Check File "
 msgstr " Kontrollera fil "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Fil"
 
@@ -1546,12 +1903,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -1568,7 +1925,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1632,7 +1989,7 @@ msgstr "Väntetid (sek)"
 msgid "Maximum Entries"
 msgstr "Maximalt antal poster"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -1689,7 +2046,6 @@ msgid "Exporting file:"
 msgstr "Exporterar fil:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Välj... "
 
@@ -1713,161 +2069,161 @@ msgstr "Skriv över befintlig fil?"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/_Ny mapp..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/_Byt namn..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Byt namn..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/_Ta bort"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Töm _papperskorgen"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Ta emot nya _meddelanden"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/_Uppdatera mappträd"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/_Sök meddelanden..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/_Hämta"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prenumerera på _diskussionsgrupp"
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/T_a bort diskussionsgrupp"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Olästa"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Ställer in mappinfo...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1877,21 +2233,21 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1902,21 +2258,21 @@ msgstr ""
 "Alla mappar och meddelanden under \"%s\" kommer att tas bort.\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Töm alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1925,34 +2281,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2013,7 +2369,7 @@ msgstr "%d diskussionsgrupper mottagna (%s lästa)"
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Ämne:"
 
@@ -2037,160 +2393,6 @@ msgstr "Skapar bildvy...\n"
 msgid "Can't load the image."
 msgstr "Kan inte öppna bilden."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "IMAP4-förbindelse till %s har avbrutits. Återuppkopplar...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP-servermapp"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "skapar IMAP4-förbindelse till %s:%d...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Kan inte starta TLS-session.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "kan inte sätta borttaget-flaggor: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "kan inte utplåna\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "kan inte stänga mapp\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "rotmapp %s finns inte\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "fel uppstod vid hämtning av LIST.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Kan inte skapa \"%s\"\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "kan inte skapa \"%s\" under INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "kan inte skapa brevlåda\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "kan inte byta namn på brevlåda %s till %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "kan inte ta bort brevlåda\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "kan inte hämta kuvert\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "fel uppstod vid hämtning av kuvert.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "kan inte tolka kuvert: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "kan inte hämta namnutrymme\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "kan inte välja mapp: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4-autentisering misslyckades.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4-inloggning misslyckades.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "kan inte lägga till %s till %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(skickar fil...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "kan inte lägga till meddelande till %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "kan inte kopiera %s till %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "fel vid imapkommando: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "fel vid imapkommando: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "fel vid imapkommando: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv kan inte konvertera UTF-7 till %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv kan inte konvertera %s till UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Importera"
@@ -2288,7 +2490,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Nästa"
 
@@ -2304,143 +2506,143 @@ msgstr "Attribut"
 msgid "Finish"
 msgstr "Avsluta"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Gamla Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Färdig (inga nya meddelanden)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hämtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2449,28 +2651,28 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2479,11 +2681,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2492,15 +2694,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -2518,29 +2720,20 @@ msgstr "Skriv in lösenord"
 msgid "Protocol log"
 msgstr "Protokollogg"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Filen \"%s\" finns redan.\n"
-"Kan inte skapa mapp."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread stöds inte av glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]    öppna skrivfönster"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2550,23 +2743,23 @@ msgstr ""
 "                         öppna skrivfönster med angivna filer\n"
 "                         bifogade"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive             ta emot nya meddelanden"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all         ta emot nya meddelanden från alla konton"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                skicka alla köade meddelanden"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...    visar det totala antalet meddelanden"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2574,24 +2767,24 @@ msgstr ""
 "  --status-full [mapp]...\n"
 "                          visa status för varje mapp"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                visa denna hjälp och avsluta"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version             skriv ut versionsinformation och avsluta"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Utgående kodning"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2605,19 +2798,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Ett skrivet meddelande finns. Avsluta ändå?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2626,643 +2819,643 @@ msgstr ""
 "OpenPGP-stöd avstängt."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Åtgärdskonfiguration"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Arkiv/_Mapp"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Arkiv/_Mapp/_Ny mapp..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arkiv/_Mapp/_Ta bort"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Arkiv/_Brevlåda..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arkiv/_Brevlåda/_Lägg till..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arkiv/_Brevlåda/_Ta bort"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arkiv/_Brevlåda/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya _meddelanden"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya meddelanden i _alla brevlådor"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arkiv/_Brevlåda/_Uppdatera mappträd"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arkiv/_Importera mbox-fil..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arkiv/_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Arkiv/Töm alla _papperskorgar"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Arkiv/Skriv _ut..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Arkiv/Arbeta _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Arkiv/_Avsluta"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigera/Välj _tråd"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigera/Sök _i aktuellt meddelande..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redigera/_Sök meddelanden..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Visa/_Visa eller dölj"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visa/_Visa eller dölj/_Mappträd"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visa/_Visa eller dölj/Me_ddelandevy"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/Ikoner _och text"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Text"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/I_ngetdera"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visa/_Sortera/efter _nummer"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visa/_Sortera/efter stor_lek"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visa/_Sortera/efter _datum"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visa/_Sortera/efter _mottagare"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visa/_Sortera/efter _ämne"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visa/_Sortera/efter fä_rgmarkering"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visa/_Sortera/efter mar_kering"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visa/_Sortera/efter _oläst"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visa/_Sortera/efter _bilaga"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visa/_Sortera/_inte alls"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Visa/_Sortera/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visa/_Sortera/Uppstigande"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visa/_Sortera/_Attrahera efter ärende"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Visa/_Trådvy"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visa/E_xpandera alla trådar"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visa/Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Visa/_Poster i summeringsvyn..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Visa/_Gå till"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visa/_Gå till/_Föreg. meddelande"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visa/_Gå till/_Nästa meddelande"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Visa/_Gå till/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visa/_Gå till/F_öreg. olästa meddelande"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visa/_Gå till/N_ästa olästa meddelande"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visa/_Gå till/Föreg. n_ya meddelande"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visa/_Gå till/Näs_ta nya meddelande"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visa/_Gå till/Föreg. _markerade meddelande"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visa/_Gå till/Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visa/_Gå till/_Föreg. _färgade meddelande"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Kodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Kodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Kodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Kodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Kodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Kodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Byter fönsterseparationstyp från %d till %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Töm alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3272,16 +3465,16 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3290,150 +3483,149 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Använd som förvalt konto"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Du är frånkopplad. Klicka på ikonen för att ansluta."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Du är ansluten. Klicka på ikonen för att koppla från."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -3551,32 +3743,32 @@ msgstr "Slutet av meddelandet nått; fortsätta från början?"
 msgid "Search finished"
 msgstr "Sökning klar"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Skapar meddelandevy...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3585,7 +3777,7 @@ msgstr ""
 "Skriv in utskriftskommando:\n"
 "(\"%s\" kommer att ersättas med filnamnet)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3594,41 +3786,6 @@ msgstr ""
 "Utskriftskommandot är felaktigt:\n"
 "\"%s\""
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "kan inte kopiera meddelande %s till %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Kan inte öppna markeringsfil.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "ursprungsmappen är identisk med dest.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Kopierar meddelande %s%c%d till %s...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Sista tal i mapp %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Öppna"
@@ -3715,115 +3872,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME-visningskommandot är felaktigt:\"%s\""
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "skapar NNTP-förbindelse till %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "NNTP-förbindelse till %s:%d har avbrutits. Återuppkopplar...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "inlägget %d har redan cachats.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "hämtar inlägg %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "kan inte läsa inlägg %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "kan inte hämta diskussionsgruppslistan\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "kan inte posta inlägg.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "kan inte hämta inlägg %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "kan inte välja grupp %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "felaktigt inläggsomfång: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "inga nya inlägg.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "hämtar xover %d - %d i %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "kan inte hämta xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "fel uppstod vid hämtning av xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "felaktig xover-rad: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "kan inte hämta xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "fel uppstod vid hämtning av xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protokollfel: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protokollfel\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Fel uppstod vid postning\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Fel uppstod när kommandot skickades\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[inget användarid]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3836,7 +3893,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3844,454 +3901,6 @@ msgstr ""
 "Fel lösenfras! Försök igen...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Nödvändig APOP-tidsmarkering inte funnen i hälsning\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Syntaxfel på tidsmarkering i hälsning\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3-protokollfel\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "felaktigt UIDL-svar: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Tar bort utgånget meddelande %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Hoppar över meddelande %d (%d byte)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "brevlådan är låst\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "sessionens väntetid tog slut\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "kan inte starta TLS-session\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "fel uppstod vid autentisering\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "kommando är inte stött\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "fel uppstod vid POP3-session\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Öppnar fönster för kontoinställningar...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Konto%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Inställningar för nytt konto"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Kontoinställningar"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Skapar fönster för kontoinställningar...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Ta emot"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Integritet"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Avancerat"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Detta kontos namn"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Använd som förvalt konto"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Personlig information"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Fullst. namn"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-postadress"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Organisation"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Serverinformation"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Diskussionsgrupper (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Inget (lokalt)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Denna server kräver autentisering"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Diskussionsgruppsserver"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Server för mottagning"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Server att skicka med (SMTP)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Användar-ID"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Lösenord"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Använd säker autentisering (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Ta bort meddelanden på server när de mottagits"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Ta bort efter"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "dagar"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 dagar: ta bort direkt)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Hämta alla meddelanden från server"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Gräns för mottagningsstorlek"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Filtrera meddelanden vid mottagning"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Förvald inkorg"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Autentiseringsmetod"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Diskussionsgrupper"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Maximalt antal inlägg att hämta\n"
-"(obegränsat om 0 angivits)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Mottagare är inte angiven."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "\"Hämta allt\" hämtar post på detta konto"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Brevhuvud"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Lägg till datumfält i brevhuvud"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Skapa Meddelande-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Lägg till användardefinierat brevhuvud"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr "Redigera..."
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP-Autentisering (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Om du lämnar dessa poster tomma, kommer samma\n"
-"användar-ID och lösenord som vid hämtning att användas."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Autentisera med POP3 innan brev skickas"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Kommandoutdata"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Sätt automatiskt följande adresser"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Kopia"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Dold kopia"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Svara till"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Signera alla meddelanden"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Kryptera alla meddelanden"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Använd ASCII-pansar för kryptering"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Använd klartextsignatur"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Signaturnyckel"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Använd förvald GnuPG-nyckel"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Välj nyckel genom din e-postadress"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Ange nyckel manuellt"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Användar- eller nyckel-ID:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Använd inte SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Använd SSL för POP3-förbindelse"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Använd STARTTLS-kommando för att starta SSL-session"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Använd SSL för IMAP4-förbindelse"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Använd SSL för NNTP-förbindelse"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Skicka (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Använd SSL för SMTP-förbindelse"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Använd icke-blockerande SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(Slå av detta om du har problem med SSL-förbindelsen)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Ange SMTP-port"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Ange POP3-port"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Ange IMAP4-port"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Ange NNTP-port"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Ange domännamn"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP-servermapp"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Lägg skickade meddelanden i"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Lägg utkast i"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Lägg borttagna meddelanden i"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Kontonamn har inte angivits."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "E-postadress har inte angivits."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP-server har inte angivits."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Användar-ID har inte angivits."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3-server har inte angivits."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4-server har inte angivits."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP-server har inte angivits."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Det är inte rekommenderat att använda det föråldrade\n"
-"ASCII-pansar-läget för krypterade meddelanden.\n"
-"Det följer inte RCF 3156 - MIME Security with OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Åtgärdskonfiguration"
@@ -4356,17 +3965,17 @@ msgstr " Syntaxhjälp "
 msgid "Registered actions"
 msgstr "Registrerade åtgärder"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Upp"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Ner"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Ny)"
 
@@ -4409,837 +4018,31 @@ msgstr "Ta bort åtgärd"
 msgid "Do you really want to delete this action?"
 msgstr "Vill du verkligen ta bort denna åtgärd?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "mapp"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Skapar fönster för allmänna inställningar...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Allmänna inställningar"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Citat"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Visa"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Meddelande"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Övrigt"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Använd externt program för hämtning"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Kommando"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Inkorporera från spole"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Filtrera vid inkorporering"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Sökväg till spole"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Hämta ny post automatiskt"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "med"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "minuters mellanrum"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Hämta ny post vid uppstart"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Uppdatera alla lokala mappar efter att ny post hämtats"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Tar emot meddelandenas antal (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Skicka med externt program"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Spara skickade meddelanden i kö-mappen"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Utgående kodning"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Automatisk (Rekommenderad)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7 bitars ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Västeuropeisk (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Västeuropeisk (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Centraleuropeisk (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltisk (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltisk (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Grekisk (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Grekisk (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Kyrillisk (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turkisk (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Kyrillisk (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Kyrillisk (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Kyrillisk (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kyrillisk (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japansk (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japansk (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japansk (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Förenklad kinesisk (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Förenklad kinesisk (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Traditionell kinesisk (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Traditionell kinesisk (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Kinesisk (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Koreansk (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Thai (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Om \"Automatisk\" är vald, kommer den optimala\n"
-"kodningen för det nuvarande språket att användas."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Kodning för överföring"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Ange vilken kodning för överföring meddelandetexten\n"
-"ska ha när det innehåller icke-ASCII-tecken."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Signaturseparator"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Infoga automatiskt"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Starta automatiskt extern redigerare"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Ångranivå"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Radbryt meddelanden vid"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "tecken"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Radbryt citering"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Radbryt vid indata"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Radbryt innan brevet skickas"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Välj automatiskt konto för svar"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Citera meddelande vid svar"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Svara-knappen ger svar till e-postlista"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Svarsformat"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Citationstecken"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Vidarebefordringsformat"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Beskrivning av symboler "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Typsnitt"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Översätt brevhuvudsnamn (t.ex. \"Från:\", \"Ärende:\")"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Visa antal olästa bredvid mappnamn"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Förkorta diskussionsgrupper längre än"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "bokstäver"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Summeringsvy"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Visa mottagare i \"Från\"-kolumnen om du själv är avsändaren"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Expandera trådar"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Datumformat"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Ställ in fält att visa i summeringen... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Aktivera färgläggning av meddelande"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Visa multi-byte-alfabet och -siffror som\n"
-"ASCII-tecken (endast Japanska)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Visa brevhuvudspanel ovanför meddelandevy"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Visa korta brevhuvuden i meddelandevy"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Visa korta brevhuvuden i meddelandevy"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Radavstånd"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "bildpunkter"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Rulla"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Halvsida"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Mjuk rullning"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Steg"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Ändra storlek på bifogade stora bilder så att de ryms i fönstret"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Brevhuvudsinställning"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Kör kommando"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Kör kommando"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "mapp"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Filtrera meddelanden vid mottagning"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Undersök signaturer automatiskt"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Visa resultat av signaturundersökning i ett extrafönster"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Lagra lösenfras temporärt i minnet"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Utgår efter"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "minut(er)"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Lösenfrasen kommer att lagras hela sessionen\n"
-"om 0 angivits)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Håll fokus under inskrivning av lösenfas"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Visa varning vid start om GnuPG inte fungerar"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Öppna alltid meddelanden i summering, när de valts"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Öppna första olästa meddelande vid öppning av mapp"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Markera endast meddelande som läst, när det öppnats i nytt fönster"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Gå till inkorgen efter att ny post kommit"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Meddelanden kommer endast vara markerade tills du väljer\n"
-" \"Utför köade meddelanden\" om detta är avstängt)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Mottagningsdialog"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Visa mottagningsdialog"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Alltid"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Bara vid manuell mottagning"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Aldrig"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Visa inte feldialog vid hämtningsfel"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Stäng mottagningsdialog efteråt"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr "Ställ in tangentbindningar..."
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externa kommandon (%s kommer att ersättas med filnamn / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Webbläsare"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Lägg till adress till destination vid dubbelklick"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Vid avslut"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Bekräfta avslut"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Töm papperskorg vid avslut"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Fråga innan tömning"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Varna om det finns köade meddelanden"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Skriver summeringscache (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Väntetid för uttags-I/O (socket I/O):"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "sekunder"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "förkortat veckodagsnamn"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "fullständigt veckodagsnamn"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "förkortat månadsnamn"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "fullständigt månadsnamn"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "datum och tid gällande lokalt"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "århundradetal (årtal/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "dagen i månaden som decimaltal"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "timmen som decimaltal enligt 24-timmarsräkning"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "timmen som decimaltal enligt 12-timmarsräkning"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "dagen på året som ett decimaltal"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "månaden som ett decimaltal"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "minuten som ett decimaltal"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "antingen AM eller PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "sekunden som ett decimaltal"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "veckodagen som ett decimaltal"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "datum gällande lokalt"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "de sista två siffrorna av ett årtal"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "årtalet som ett decimaltal"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "tidszon eller namn eller förkortning"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Symbol"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Beskrivning"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Exempel"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Ställ in meddelandefärger"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Färger"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Citerad text - Första nivån"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Citerad text - Andra nivån"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Citerad text - Tredje nivån"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI-länk"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Återanvänd citeringsfärger"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Välj färg för citeringsnivå 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Välj färg för citeringsnivå 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Välj färg för citeringsnivå 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Välj färg för URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Beskrivning av symboler"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Datum\n"
-"Från\n"
-"Fullständigt avsändarnamn\n"
-"Avsändarens förnamn\n"
-"Avsändarens initialer\n"
-"Ärende\n"
-"Till\n"
-"Kopia\n"
-"Diskussionsgrupper\n"
-"Meddelande-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Om x är inställd, visas expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Meddelandetext\n"
-"Citerad meddelandetext\n"
-"Meddelandetext utan signatur\n"
-"Citerad meddelandetext utan signatur\n"
-"Bokstavligt %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Bokstavligt bakåtsnedstreck\n"
-"Bokstavligt frågetecken\n"
-"Bokstavlig öppnande klammerparentes\n"
-"Bokstavlig avslutande klammerparentes"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Tangentbindningar"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Välj förinställda tangentbindningar.\n"
-"Du kan också ändra varje menys genvägar genom\n"
-"att trycka valfri tangent eller tangentkombination\n"
-"när muspekaren är över genvägen."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Standard"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Gamla Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Egendefinierat brevhuvud"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Brevhuvud"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Ta bort "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Egna brevhuvuden"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Brevhuvudsnamn är inte angivet."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Ta bort brevhuvud"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Vill du verkligen ta bort detta brevhuvud?"
 
@@ -5287,12 +4090,21 @@ msgstr "Filterinställningar"
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Redigera"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Vill du verkligen ta bort denna regel?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Namnlös"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
@@ -5376,6 +4188,10 @@ msgstr "är längre än"
 msgid "is shorter than"
 msgstr "är kortare än"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Flytta till"
@@ -5498,6 +4314,10 @@ msgstr "Ta bort [...] eller (...) i början av ärendet vid svar"
 msgid "Apply to subfolders"
 msgstr "Gäller även undermappar"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Sätt automatiskt följande adresser"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "använd också vid svar"
@@ -5572,64 +4392,46 @@ msgstr "Visade poster"
 msgid " Revert to default "
 msgstr " Återgå till standardinställning "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Mallnamn"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Registrera"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Byt ut "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Symboler "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Registrerade mallar"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Mall"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Mallformatfel"
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Ta bort mall"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Vill du verkligen ta bort denna mall?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "kan inte öppna markeringsfil\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "kan inte hämta meddelande %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Skapar förloppsdialog...\n"
@@ -5638,29 +4440,21 @@ msgstr "Skapar förloppsdialog...\n"
 msgid "Status"
 msgstr "Status"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "fel uppstod vid inhämtning av data.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Kan inte skriva till fil.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Kan inte finna användar-ID för denna nyckel."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Signatur skapad %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Fel vid verifikation av signatur"
 
@@ -5686,6 +4480,10 @@ msgstr "Nyckel-ID"
 msgid "Val"
 msgstr "Värde"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Övrigt"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Lägg till nyckel"
@@ -5706,84 +4504,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Brevhuvud i köat meddelande är trasigt.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Kör kommando"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fel uppstod när kommandot skickades\n"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Upprättar förbindelse"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Upprättar förbindelse med SMTP-server: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Skickar HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "Fel uppstod när meddelandet skickades."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5885,32 +4683,20 @@ msgstr "FELAKTIG signatur"
 msgid "No public key to verify the signature"
 msgstr "Ingen publik nyckel att verifiera signaturen med"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH ej tillgängligt\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "felaktigt SMTP-svar\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "fel uppstod vid SMTP-session\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Skapar källkodsfönster...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Meddelandets källkod"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Visar källkoden till %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Källkod"
@@ -6306,6 +5092,923 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Några skrivfönster är öppna.\n"
+#~ "Stäng alla skrivfönster innan du redigerar kontona."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Öppnar kontoredigeringsfönstret...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Skapar kontoredigeringsfönster...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Redigera konton"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Nya meddelanden kommer att kontrolleras i denna ordning.\n"
+#~ "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
+#~ "via \"Hämta alla\""
+
+#~ msgid "Protocol"
+#~ msgstr "Protokoll"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Använd som förvalt konto "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Vill du verkligen ta bort detta konto?"
+
+#~ msgid "Delete account"
+#~ msgstr "Ta bort konto"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Öppnar fönster för kontoinställningar...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Konto%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Inställningar för nytt konto"
+
+#~ msgid "Account preferences"
+#~ msgstr "Kontoinställningar"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Skapar fönster för kontoinställningar...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Ta emot"
+
+#~ msgid "Privacy"
+#~ msgstr "Integritet"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancerat"
+
+#~ msgid "Name of this account"
+#~ msgstr "Detta kontos namn"
+
+#~ msgid "Set as default"
+#~ msgstr "Använd som förvalt konto"
+
+#~ msgid "Personal information"
+#~ msgstr "Personlig information"
+
+#~ msgid "Full name"
+#~ msgstr "Fullst. namn"
+
+#~ msgid "Mail address"
+#~ msgstr "E-postadress"
+
+#~ msgid "Organization"
+#~ msgstr "Organisation"
+
+#~ msgid "Server information"
+#~ msgstr "Serverinformation"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Diskussionsgrupper (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Inget (lokalt)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Denna server kräver autentisering"
+
+#~ msgid "News server"
+#~ msgstr "Diskussionsgruppsserver"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Server för mottagning"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Server att skicka med (SMTP)"
+
+#~ msgid "User ID"
+#~ msgstr "Användar-ID"
+
+#~ msgid "Password"
+#~ msgstr "Lösenord"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Använd säker autentisering (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Ta bort meddelanden på server när de mottagits"
+
+#~ msgid "Remove after"
+#~ msgstr "Ta bort efter"
+
+#~ msgid "days"
+#~ msgstr "dagar"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 dagar: ta bort direkt)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Hämta alla meddelanden från server"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Gräns för mottagningsstorlek"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Filtrera meddelanden vid mottagning"
+
+#~ msgid "Default inbox"
+#~ msgstr "Förvald inkorg"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Autentiseringsmetod"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatisk"
+
+#~ msgid "News"
+#~ msgstr "Diskussionsgrupper"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Maximalt antal inlägg att hämta\n"
+#~ "(obegränsat om 0 angivits)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Mottagare är inte angiven."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "\"Hämta allt\" hämtar post på detta konto"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Lägg till datumfält i brevhuvud"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Skapa Meddelande-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Lägg till användardefinierat brevhuvud"
+
+#~ msgid " Edit... "
+#~ msgstr "Redigera..."
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP-Autentisering (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Om du lämnar dessa poster tomma, kommer samma\n"
+#~ "användar-ID och lösenord som vid hämtning att användas."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Autentisera med POP3 innan brev skickas"
+
+#~ msgid "Command output"
+#~ msgstr "Kommandoutdata"
+
+#~ msgid "Cc"
+#~ msgstr "Kopia"
+
+#~ msgid "Bcc"
+#~ msgstr "Dold kopia"
+
+#~ msgid "Reply-To"
+#~ msgstr "Svara till"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Signera alla meddelanden"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Kryptera alla meddelanden"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Använd ASCII-pansar för kryptering"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Använd klartextsignatur"
+
+#~ msgid "Sign key"
+#~ msgstr "Signaturnyckel"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Använd förvald GnuPG-nyckel"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Välj nyckel genom din e-postadress"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Ange nyckel manuellt"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Användar- eller nyckel-ID:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Använd inte SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Använd SSL för POP3-förbindelse"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Använd STARTTLS-kommando för att starta SSL-session"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Använd SSL för IMAP4-förbindelse"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Använd SSL för NNTP-förbindelse"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Skicka (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Använd SSL för SMTP-förbindelse"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Använd icke-blockerande SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(Slå av detta om du har problem med SSL-förbindelsen)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Ange SMTP-port"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Ange POP3-port"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Ange IMAP4-port"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Ange NNTP-port"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Ange domännamn"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP-servermapp"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Lägg skickade meddelanden i"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Lägg utkast i"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Lägg borttagna meddelanden i"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Kontonamn har inte angivits."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "E-postadress har inte angivits."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP-server har inte angivits."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Användar-ID har inte angivits."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3-server har inte angivits."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4-server har inte angivits."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP-server har inte angivits."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Det är inte rekommenderat att använda det föråldrade\n"
+#~ "ASCII-pansar-läget för krypterade meddelanden.\n"
+#~ "Det följer inte RCF 3156 - MIME Security with OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Skapar fönster för allmänna inställningar...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Allmänna inställningar"
+
+#~ msgid "Quote"
+#~ msgstr "Citat"
+
+#~ msgid "Display"
+#~ msgstr "Visa"
+
+#~ msgid "Message"
+#~ msgstr "Meddelande"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Använd externt program för hämtning"
+
+#~ msgid "Command"
+#~ msgstr "Kommando"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Inkorporera från spole"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Filtrera vid inkorporering"
+
+#~ msgid "Spool path"
+#~ msgstr "Sökväg till spole"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Hämta ny post automatiskt"
+
+#~ msgid "every"
+#~ msgstr "med"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuters mellanrum"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Hämta ny post vid uppstart"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Uppdatera alla lokala mappar efter att ny post hämtats"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Tar emot meddelandenas antal (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Skicka med externt program"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Spara skickade meddelanden i kö-mappen"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Utgående kodning"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Automatisk (Rekommenderad)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7 bitars ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Västeuropeisk (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Västeuropeisk (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Centraleuropeisk (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltisk (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltisk (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Grekisk (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Grekisk (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Kyrillisk (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Turkisk (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Kyrillisk (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Kyrillisk (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Kyrillisk (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Kyrillisk (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japansk (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japansk (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japansk (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Förenklad kinesisk (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Förenklad kinesisk (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Traditionell kinesisk (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Traditionell kinesisk (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Kinesisk (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Koreansk (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Thai (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Thai (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Om \"Automatisk\" är vald, kommer den optimala\n"
+#~ "kodningen för det nuvarande språket att användas."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Kodning för överföring"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Ange vilken kodning för överföring meddelandetexten\n"
+#~ "ska ha när det innehåller icke-ASCII-tecken."
+
+#~ msgid "Signature separator"
+#~ msgstr "Signaturseparator"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Infoga automatiskt"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Starta automatiskt extern redigerare"
+
+#~ msgid "Undo level"
+#~ msgstr "Ångranivå"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Radbryt meddelanden vid"
+
+#~ msgid "characters"
+#~ msgstr "tecken"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Radbryt citering"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Radbryt vid indata"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Radbryt innan brevet skickas"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Välj automatiskt konto för svar"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Citera meddelande vid svar"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Svara-knappen ger svar till e-postlista"
+
+#~ msgid "Reply format"
+#~ msgstr "Svarsformat"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Citationstecken"
+
+#~ msgid "Forward format"
+#~ msgstr "Vidarebefordringsformat"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Beskrivning av symboler "
+
+#~ msgid "Font"
+#~ msgstr "Typsnitt"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Översätt brevhuvudsnamn (t.ex. \"Från:\", \"Ärende:\")"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Visa antal olästa bredvid mappnamn"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Förkorta diskussionsgrupper längre än"
+
+#~ msgid "letters"
+#~ msgstr "bokstäver"
+
+#~ msgid "Summary View"
+#~ msgstr "Summeringsvy"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Visa mottagare i \"Från\"-kolumnen om du själv är avsändaren"
+
+#~ msgid "Expand threads"
+#~ msgstr "Expandera trådar"
+
+#~ msgid "Date format"
+#~ msgstr "Datumformat"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Ställ in fält att visa i summeringen... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Aktivera färgläggning av meddelande"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Visa multi-byte-alfabet och -siffror som\n"
+#~ "ASCII-tecken (endast Japanska)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Visa brevhuvudspanel ovanför meddelandevy"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Visa korta brevhuvuden i meddelandevy"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Visa korta brevhuvuden i meddelandevy"
+
+#~ msgid "Line space"
+#~ msgstr "Radavstånd"
+
+#~ msgid "pixel(s)"
+#~ msgstr "bildpunkter"
+
+#~ msgid "Scroll"
+#~ msgstr "Rulla"
+
+#~ msgid "Half page"
+#~ msgstr "Halvsida"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Mjuk rullning"
+
+#~ msgid "Step"
+#~ msgstr "Steg"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Ändra storlek på bifogade stora bilder så att de ryms i fönstret"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Brevhuvudsinställning"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Kör kommando"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Kör kommando"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "mapp"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Filtrera meddelanden vid mottagning"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Undersök signaturer automatiskt"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Visa resultat av signaturundersökning i ett extrafönster"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Lagra lösenfras temporärt i minnet"
+
+#~ msgid "Expired after"
+#~ msgstr "Utgår efter"
+
+#~ msgid "minute(s) "
+#~ msgstr "minut(er)"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Lösenfrasen kommer att lagras hela sessionen\n"
+#~ "om 0 angivits)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Håll fokus under inskrivning av lösenfas"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Visa varning vid start om GnuPG inte fungerar"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Öppna alltid meddelanden i summering, när de valts"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Öppna första olästa meddelande vid öppning av mapp"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Markera endast meddelande som läst, när det öppnats i nytt fönster"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Gå till inkorgen efter att ny post kommit"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Meddelanden kommer endast vara markerade tills du väljer\n"
+#~ " \"Utför köade meddelanden\" om detta är avstängt)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Mottagningsdialog"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Visa mottagningsdialog"
+
+#~ msgid "Always"
+#~ msgstr "Alltid"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Bara vid manuell mottagning"
+
+#~ msgid "Never"
+#~ msgstr "Aldrig"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Visa inte feldialog vid hämtningsfel"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Stäng mottagningsdialog efteråt"
+
+#~ msgid " Set key bindings... "
+#~ msgstr "Ställ in tangentbindningar..."
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Externa kommandon (%s kommer att ersättas med filnamn / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Webbläsare"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Lägg till adress till destination vid dubbelklick"
+
+#~ msgid "On exit"
+#~ msgstr "Vid avslut"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Bekräfta avslut"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Töm papperskorg vid avslut"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Fråga innan tömning"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Varna om det finns köade meddelanden"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Skriver summeringscache (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Väntetid för uttags-I/O (socket I/O):"
+
+#~ msgid "second(s)"
+#~ msgstr "sekunder"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "förkortat veckodagsnamn"
+
+#~ msgid "the full weekday name"
+#~ msgstr "fullständigt veckodagsnamn"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "förkortat månadsnamn"
+
+#~ msgid "the full month name"
+#~ msgstr "fullständigt månadsnamn"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "datum och tid gällande lokalt"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "århundradetal (årtal/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "dagen i månaden som decimaltal"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "timmen som decimaltal enligt 24-timmarsräkning"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "timmen som decimaltal enligt 12-timmarsräkning"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "dagen på året som ett decimaltal"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "månaden som ett decimaltal"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "minuten som ett decimaltal"
+
+#~ msgid "either AM or PM"
+#~ msgstr "antingen AM eller PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "sekunden som ett decimaltal"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "veckodagen som ett decimaltal"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "datum gällande lokalt"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "de sista två siffrorna av ett årtal"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "årtalet som ett decimaltal"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "tidszon eller namn eller förkortning"
+
+#~ msgid "Specifier"
+#~ msgstr "Symbol"
+
+#~ msgid "Description"
+#~ msgstr "Beskrivning"
+
+#~ msgid "Example"
+#~ msgstr "Exempel"
+
+#~ msgid "Set message colors"
+#~ msgstr "Ställ in meddelandefärger"
+
+#~ msgid "Colors"
+#~ msgstr "Färger"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Citerad text - Första nivån"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Citerad text - Andra nivån"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Citerad text - Tredje nivån"
+
+#~ msgid "URI link"
+#~ msgstr "URI-länk"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Återanvänd citeringsfärger"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Välj färg för citeringsnivå 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Välj färg för citeringsnivå 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Välj färg för citeringsnivå 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Välj färg för URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Beskrivning av symboler"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Datum\n"
+#~ "Från\n"
+#~ "Fullständigt avsändarnamn\n"
+#~ "Avsändarens förnamn\n"
+#~ "Avsändarens initialer\n"
+#~ "Ärende\n"
+#~ "Till\n"
+#~ "Kopia\n"
+#~ "Diskussionsgrupper\n"
+#~ "Meddelande-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Om x är inställd, visas expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Meddelandetext\n"
+#~ "Citerad meddelandetext\n"
+#~ "Meddelandetext utan signatur\n"
+#~ "Citerad meddelandetext utan signatur\n"
+#~ "Bokstavligt %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Bokstavligt bakåtsnedstreck\n"
+#~ "Bokstavligt frågetecken\n"
+#~ "Bokstavlig öppnande klammerparentes\n"
+#~ "Bokstavlig avslutande klammerparentes"
+
+#~ msgid "Key bindings"
+#~ msgstr "Tangentbindningar"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Välj förinställda tangentbindningar.\n"
+#~ "Du kan också ändra varje menys genvägar genom\n"
+#~ "att trycka valfri tangent eller tangentkombination\n"
+#~ "när muspekaren är över genvägen."
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Gamla Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Typsnittsval"
 
diff --git a/po/tr.po b/po/tr.po
index 29298344..384bcaf0 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -20,13 +20,396 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Her hesap için yapılandırma dosyaları okunuyor...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "Yapılandırma dosyasına kayıt yapılamadı\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "%s adresine yapılmış IMAP4 bağlantısı koptu. Yeniden bağlanılıyor...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP sunucu dizini"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "%s:%d adresine IMAP4 bağlantısı yapılıyor ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "TLS oturumuna bağlantı kurulamadı.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "İleti gönderiliyor (%d / %d bayt)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "%s konumundan iletiler alınıyor..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "silinen işaretler atanamıyor: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "silinemiyor\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "%s konumundan iletiler alınıyor..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "silinen işaretler atanamıyor: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "dizin kapatılamadı\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "%s kök dizini bulunamadı\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "LIST alınırken hata oluştu.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "%s oluşturulamadı\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "%s Gelen altında oluşturulamadı\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "posta kutusu oluşturulamadı\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "%s posta kutusunun adı %s olarak değiştirilemedi \n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "posta kutusu silinemedi\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "zarf alınamadı\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "İleti gönderiliyor (%d / %d bayt)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "zarf alınırken bir hata oluştu.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "zarf ayrıştırılamadı: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "alanadına erişilemedi\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "dizin seçilemedi: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 yetkilendirmesi başarısız.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 girişinde hata.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "%s, %s üzerine eklenemedi\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(dosya gönderiliyor...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "ileti %s'ye eklenemiyor\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "%s, %s konumuna kopyalanamadı\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "imap komutu sırasında hata oluştu: STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "EXPUNGE komutu sırasında hata oluştu\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "mesaj %s dan %s a kopyalanamadı\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "işaretli dosya açılamadı.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "kaynak dizini hedef dizinle aynı.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Dizindeki son numara %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"%s dosyası zaten bulunuyor.\n"
+"Dizin oluşturulamadı."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "%s:%d adresine NNTP bağlantısı yapılıyor...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "%s:%d konumuna yapılan NNTP bağlantısı koptu.Yeniden bağlanılıyor...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "%d iletisi zaten önbelleklendi.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "%d. makale alınıyor...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "%d. makale okunamadı\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "haber grubu listesi alınamıyor\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "makale postalanamıyor.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "makale alınamıyor : %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "grup seçilemiyor: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "geçersiz makale aralığı: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "yeni makale yok.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "%d - %d haber grubu alınıyor (%s)...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "haber grupları alınamadı\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "haber grupları alınırken hata.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "hatalı haber grubu satırı %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "X başlıkları alınamıyor\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "x başlıkları alınırken hata oluştu.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "NNTP sunucuya bağlantı yapılamadı: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "protokol hatası: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "protokol hatası\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Postalama sırasında hata\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "Komut gönderilirken hata oluştu\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "Gerekli olan APOP zaman etiketi görüşmede bulunamadı\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Zaman etiketi yazım hatası\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 protokol hatası\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "hatalı UIDL cevabı: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Eski postalar siliniyor %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Posta atlanıyor %d (%d byte)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "posta kutusu kilitli\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "oturum zaman aşımına uğradı\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "TLS oturumu başlatılamıyor\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "yetkilendirme sırasında hata oluştu\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "komut desteklenmiyor\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "POP3 oturumunda hata oluştu\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -36,6 +419,53 @@ msgstr "%s bulundu\n"
 msgid "Configuration is saved.\n"
 msgstr "Yapılandırma kaydedildi.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "dizin:"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "işaret dosyası açılamadı\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "%d. ileti alınamadı\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Metin bölümü alınamadı\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Yazdırma komutu geçersiz: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "veri alınırken bir hata oluştu.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Dosyaya yazılamadı.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH kullanılamıyor\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "kötü SMTP cevabı\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "SMTP oturumunda hata oluştu\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 kullanılamıyor\n"
@@ -165,79 +595,6 @@ msgstr ""
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA adresine konuyla ilgili "
 "yazınız."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Her hesap için yapılandırma dosyaları okunuyor...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Bazı düzenleme pencereleri açık.\n"
-"Lütfen tüm düzenleme pencerelerini kapattıktan sonra hesapları düzenleyin."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Hesap düzenleme penceresi açılıyor...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Hesap düzenleme penceresi oluşturuluyor...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Hesapları düzenle"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Yeni iletiler bu sıra ile kontrol edilirler. `G' sütunundaki\n"
-"kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
-"etkin duruma getirilebilir."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "İsim"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Sunucu"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Düzenle"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Öntanımlı hesap olarak düzenle "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Bu hesabı silmek istiyor musunuz?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Başlıksız"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Hesabı sil"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -337,6 +694,14 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "İsim"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -351,8 +716,8 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Dosya"
 
@@ -373,9 +738,9 @@ msgid "/_File/New _Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
@@ -391,7 +756,7 @@ msgstr "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
@@ -423,8 +788,8 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
@@ -432,13 +797,13 @@ msgstr "/A_raçlar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
@@ -455,17 +820,17 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
@@ -477,7 +842,7 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -487,14 +852,14 @@ msgstr "İsim:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Sil"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -505,11 +870,11 @@ msgid "Lookup"
 msgstr "Ara"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -536,7 +901,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -647,7 +1012,7 @@ msgstr "Adres Defteri Çevrim Hatası"
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Arayüz"
 
@@ -667,8 +1032,7 @@ msgstr "İleti Adresi"
 msgid "Group"
 msgstr "Grup"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Dizin"
 
@@ -692,15 +1056,15 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Hata"
 
@@ -755,8 +1119,8 @@ msgstr "/_Ekle..."
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
@@ -796,8 +1160,8 @@ msgstr "/Dü_zenle/_Geri al"
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
@@ -805,7 +1169,7 @@ msgstr "/Dü_zenle/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
@@ -817,7 +1181,7 @@ msgstr "/Dü_zenle/_Yapıştır"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
@@ -833,7 +1197,7 @@ msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Görünüm"
@@ -855,9 +1219,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
@@ -873,7 +1237,7 @@ msgstr "/_Görünüm/_Cetvel"
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
@@ -885,127 +1249,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Görünüm/_Kodlama/7 bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
@@ -1013,14 +1377,14 @@ msgstr "/A_raçlar/_Adres defteri"
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
@@ -1041,10 +1405,6 @@ msgstr "/A_raçlar/PGP ile Ş_ifrele"
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Metin bölümü alınamadı\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
@@ -1121,7 +1481,7 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
@@ -1213,8 +1573,7 @@ msgstr "MIME türü"
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Gönder"
 
@@ -1254,8 +1613,7 @@ msgstr "Ekle"
 msgid "Attach file"
 msgstr "Dosya ekle"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "İmza"
 
@@ -1263,7 +1621,7 @@ msgstr "İmza"
 msgid "Insert signature"
 msgstr "İmza ekle"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Düzenleyici"
 
@@ -1460,7 +1818,7 @@ msgstr "Düzenle"
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Değer"
 
@@ -1493,7 +1851,6 @@ msgid " Check File "
 msgstr " Dosyayı Denetle "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Dosya"
 
@@ -1550,12 +1907,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -1572,7 +1929,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1636,7 +1993,7 @@ msgstr "Zaman aşımı (sn) "
 msgid "Maximum Entries"
 msgstr "Azami Girdi Sayısı"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Temel"
 
@@ -1693,7 +2050,6 @@ msgid "Exporting file:"
 msgstr "Dosya aktarılıyor:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Seç... "
 
@@ -1717,161 +2073,161 @@ msgstr "Şimdiki dosyanın üzerine yazılsın mı?"
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Yeni _dizin yarat..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Dizini _sil"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/Çö_pü boşalt"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Y_eni iletileri al"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Dizin ağacını _yeniden yarat"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/İ_letilerda ara..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/İ_ndir"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Haber grubuna üye ol..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/H_aber grubunu sil"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Dizin görüntüsü oluşturuluyor...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlanıyor...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1881,21 +2237,21 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1906,21 +2262,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1929,34 +2285,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2017,7 +2373,7 @@ msgstr "%d haber grubu alındı (%s okundu)"
 msgid "Newsgroups:"
 msgstr "Haber grupları:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Konu:"
 
@@ -2041,160 +2397,6 @@ msgstr "Resim görüntüsü oluşturuluyor...\n"
 msgid "Can't load the image."
 msgstr "Resim yüklenemedi."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "%s adresine yapılmış IMAP4 bağlantısı koptu. Yeniden bağlanılıyor...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP sunucu dizini"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "%s:%d adresine IMAP4 bağlantısı yapılıyor ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "TLS oturumuna bağlantı kurulamadı.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "silinen işaretler atanamıyor: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "silinemiyor\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "silinen işaretler atanamıyor: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "dizin kapatılamadı\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "%s kök dizini bulunamadı\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "LIST alınırken hata oluştu.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "%s oluşturulamadı\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "%s Gelen altında oluşturulamadı\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "posta kutusu oluşturulamadı\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "%s posta kutusunun adı %s olarak değiştirilemedi \n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "posta kutusu silinemedi\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "zarf alınamadı\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "zarf alınırken bir hata oluştu.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "zarf ayrıştırılamadı: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "alanadına erişilemedi\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "dizin seçilemedi: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 yetkilendirmesi başarısız.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 girişinde hata.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "%s, %s üzerine eklenemedi\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(dosya gönderiliyor...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "ileti %s'ye eklenemiyor\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "%s, %s konumuna kopyalanamadı\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "imap komutu sırasında hata oluştu: STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "EXPUNGE komutu sırasında hata oluştu\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Dışarıdan Aktar"
@@ -2292,7 +2494,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2308,143 +2510,143 @@ msgstr "Özellikler"
 msgid "Finish"
 msgstr "Bitir"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Eski Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Tamamlandı (Yeni ileti yok)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Alınıyor (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2453,28 +2655,28 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2483,11 +2685,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2496,15 +2698,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -2522,29 +2724,20 @@ msgstr "Parolayı girin"
 msgid "Protocol log"
 msgstr "Protokol günlüğü"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"%s dosyası zaten bulunuyor.\n"
-"Dizin oluşturulamadı."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread, glib tarafından desteklenmiyor.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]    düzenleme penceresini açar"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2554,23 +2747,23 @@ msgstr ""
 "                         düzenleme penceresini belirtilen dosyalar\n"
 "                         postaya eklenmiş halde açar"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive               yeni mesajları alır"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          tüm hesaplardaki yeni mesajları alır"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 kuyruktaki postaları gönderir"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dizin]...   toplam mesaj sayısını göster"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2578,24 +2771,24 @@ msgstr ""
 "  --status-full [dizin]...\n"
 "                         her dizinin durumunu göster"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 bu yardımı gösterir ve çıkar"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              sürüm bilgisini gösterir ve çıkar"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Giden ileti kod kümesi"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2609,19 +2802,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Mesajı göndermeden çıkmak istediğinizden emin misiniz?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Kuyruktaki iletiler"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2630,644 +2823,644 @@ msgstr ""
 "OpenPGP desteği kapatıldı."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/_Dosya/D_izin"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Dosya/Di_zin/Y_eni dizin oluştur..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Dosya/Di_zin/Dizini _sil"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/_Dosya/_Posta kutusu"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Dosya/_Posta kutusu/Posta kutusu e_kle..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Dosya/_Posta Kutusu/_Posta kutusunu kaldır"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/_Dosya/_Posta Kutusu/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Dosya/_Posta Kutusu/Yeni mesajlar için k_ontrol et"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Dosya/_Posta Kutusu/_Tüm posta kutuları için yeni mesajları kontrol et"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Dosya/_Posta Kutusu/Dizin ağacını _yeniden oluştur"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/_Dosya/Posta k_utusu dosyasını aktar..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Dosya/_Posta kutusu dosyasına gönder..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/_Dosya/Tüm çö_pü boşalt"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Dosya/_Yazdır..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/_Dosya/Çevrimdı_şı çalış"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/_Dosya/Çı_k"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/Dü_zenle/_Sıralı seç"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Dü_zenle/Gü_ncel iletide bul..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/Dü_zenle/_İletilerde ara..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/_Görünüm/Göster veya _gizle"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Görünüm/Göster veya _gizle/_Dizin ağacı"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Görünüm/Göster veya _gizle/İ_leti görünümü"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/Simge _ve metin"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Metin"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Hiçbiri"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/_Görünüm/_Sırala"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/_Görünüm/Sıra_la/_Numaraya göre"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Görünüm/Sıra_la/_Boyuta göre"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/_Görünüm/Sıra_la/_Gönderene göre"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Görünüm/Sıra_la/_Alıcıya göre"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Görünüm/Sıra_la/_Konuya göre"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Görünüm/Sıra_la/_Renge göre"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Görünüm/Sıra_la/İş_arete göre"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Görünüm/Sıra_la/_Okunmamışa göre"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Görünüm/Sıra_la/E_klentiye göre"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Görünüm/Sıra_la/_Sıralama yapma"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/_Görünüm/Sıra_la/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Görünüm/_Sırala/Artan sırala"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Görünüm/Sıra_la/Konuya _göre izle"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/_Görünüm/_Konum görünümü"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/_Görünüm/Tüm _başlıkları genişlet"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Görünüm/Tüm _başlıkları küçült"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/_Görünüm/_Git/"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Görünüm/_Git/Önceki _ileti"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Görünüm/_Git/Sonraki _ileti"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/_Görünüm/_Git/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Görünüm/_Git/Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Görünüm/_Git/_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Görünüm/_Git/Ö_nceki yeni ileti"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Görünüm/Gi_t/Önceki _işaretli ileti"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Görünüm/Gi_t/S_onraki işaretli ileti"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Görünüm/Gi_t/Ö_nceki _etiketli ileti"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Görünüm/Gi_t/Son_raki etiketli ileti"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/Gi_t/_Başka dizine git..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/_Görünüm/Tüm _başlıkları görüntüle"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/İ_leti/_Al/İ_ptal Et"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yapılandırma/F_iltre ayarları..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/_Güncel hesap tercihleri..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/_Güncel hesabı değiştir"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Pencere ayırma tarzı %d den %d e çevriliyor\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3277,16 +3470,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3295,150 +3488,149 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "Çevrimdışısınız. Çevrimiçi olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
@@ -3557,32 +3749,32 @@ msgstr "İletinin sonuna ulaşıldı, başından başlansın mı?"
 msgid "Search finished"
 msgstr "Arama tamamlandı"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "İleti görüntüsü oluşturuluyor...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Metin"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Ekler"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3591,7 +3783,7 @@ msgstr ""
 "Yazdırma komutunu giriniz:\n"
 "('%s' dosya adıyla değiştirilecek)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3600,41 +3792,6 @@ msgstr ""
 "Yazdırma komutu hatalı:\n"
 "'%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "mesaj %s dan %s a kopyalanamadı\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "işaretli dosya açılamadı.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "kaynak dizini hedef dizinle aynı.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Dizindeki son numara %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/_Aç"
@@ -3721,115 +3878,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME görüntüleyici komutu geçersiz: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "%s:%d adresine NNTP bağlantısı yapılıyor...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "%s:%d konumuna yapılan NNTP bağlantısı koptu.Yeniden bağlanılıyor...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "%d iletisi zaten önbelleklendi.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "%d. makale alınıyor...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "%d. makale okunamadı\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "haber grubu listesi alınamıyor\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "makale postalanamıyor.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "makale alınamıyor : %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "grup seçilemiyor: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "geçersiz makale aralığı: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "yeni makale yok.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "%d - %d haber grubu alınıyor (%s)...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "haber grupları alınamadı\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "haber grupları alınırken hata.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "hatalı haber grubu satırı %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "X başlıkları alınamıyor\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "x başlıkları alınırken hata oluştu.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "NNTP sunucuya bağlantı yapılamadı: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "protokol hatası: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "protokol hatası\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Postalama sırasında hata\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "Komut gönderilirken hata oluştu\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Parola"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[kullanıcı adı yok]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3842,7 +3899,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3850,454 +3907,6 @@ msgstr ""
 "Hatalı parola! Yeniden deneyin...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "Gerekli olan APOP zaman etiketi görüşmede bulunamadı\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Zaman etiketi yazım hatası\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 protokol hatası\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "hatalı UIDL cevabı: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Eski postalar siliniyor %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Posta atlanıyor %d (%d byte)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "posta kutusu kilitli\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "oturum zaman aşımına uğradı\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "TLS oturumu başlatılamıyor\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "yetkilendirme sırasında hata oluştu\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "komut desteklenmiyor\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "POP3 oturumunda hata oluştu\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Hesap tercihleri penceresi açılıyor...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Hesap%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Yeni hesap için tercihler"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Hesap tercihleri"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Al"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Gizlilik"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Gelişmiş"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Bu hesabın adı"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Öntanımlı kullan"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Kişisel bilgiler"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Tam adı"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "E-Posta adresi"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Kurum"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Sunucu bilgisi"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Haber grubu (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Hiçbiri (yerel)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Bu sunucu parola istiyor"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Haber grubu sunucusu"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "İletilerin alınacağı sunucu"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Gönderme için SMTP sunucu"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "Kullanıcı adı"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Parola"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "Güvenli yetkilendirme kullan (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Postayı"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "gün sonra sil"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 gün: hemen sil)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Sunucudaki tüm iletileri indir"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Alınan ileti boyutu sınırı"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "İletileri alırken filtrele"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Öntanımlı gelen kutusu"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Kimlik denetim yöntemi"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Otomatik"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Haberler"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Indirilebilecek azami makale sayısı\n"
-"(0 => limitsiz)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Alıcı belirtilmedi."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "'Hepsini Al' seçeneği bu hesaptaki yeni postaları da kontrol etsin"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Başlık"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Tarih başlığını ekle"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "İleti Numarası Oluştur"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Kullanıcı tanımlı başlık ekle"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Düzenle... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Kimlik denetimi"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Eğer bu girdileri boş bırakırsanız, aynı\n"
-"kullanıcı adı ve parolası kullanılır."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Komut çıktısı"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Cc"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Bcc"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Yanıtla"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "İletileri öntanımlı olarak imzala"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "İletileri öntanımlı olarak şifrele"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "ASCII formatında şifrele"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Metin formatlı imza ekle"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "İmza anahtarı"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Öntanımlı GnuPG anahtarını kullan"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Anahtarı e-posta adresine göre seç"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Anahtarı elle seç"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Kullanıcı ya da anahtar numarası:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "SSL kullanma"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "POP3 bağlantısı için SSL kullan"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "SSL oturumuna başlamak için STARTSSL komutunu kullan"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "IMAP4 bağlantısı için SSL kullan"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "NNTP bağlantısı için SSL kullan"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Gönder (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "SMTP bağlantısı için SSL kullan"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Bloklanmamış SSL Kullan"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(SSL bağlantısında sorunlar yaşıyorsanız, bu özelliği kapatın)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "SMTP portu belirt"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "POP3 portu belirt"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "IMAP4 portu belirt"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "NNTP portu belirt"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Alan adı belirt"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP sunucu dizini"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Gönderilen iletileri nerede sakla"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Taslak mesajlarını buraya koy"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Silinen mesajları buraya koy"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Hesap adı girilmemiş."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "İleti adresi girilmemiş."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "SMTP sunucu girilmemiş."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Kullanıcı numarası girilmemiş."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "POP3 sunucu girilmemiş."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "IMAP4 sunucu girilmemiş."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "NNTP sunucu girilmemiş."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"ASCII formatındaki şifrelemeyi kullanmanız önerilmez\n"
-"OpenPGP ile RFC 3156 - MIME Güvenliği ile uyuşmayan eksi\n"
-"bir yöntemdir."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Eylem ayarları"
@@ -4363,17 +3972,17 @@ msgstr " Yazım Yardımı"
 msgid "Registered actions"
 msgstr "Kayıtlı eylemler"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Aşağı"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Yeni)"
 
@@ -4416,835 +4025,31 @@ msgstr "Eylemi sil"
 msgid "Do you really want to delete this action?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "dizin:"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Genel tercihler penceresi oluşturuluyor...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Genel Tercihler"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Alıntı"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Görünüm"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "İleti"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Diğer"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Dağıtım için harici program kullan"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Komut"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Spooldan dağıt"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Dağıtım filtresi"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Makara konumu"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Yeni postaları otomatik denetle"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "her"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "dakikada"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Açılışta yeni e-postaları denetle"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Dağıtımdan sonra tüm yerel dizinleri güncelle"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Postayı silerken ve taşırken çalıştır"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Yeni ileti numaraları alınıyor (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Göndermek için harici program kullan"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Gönderilen iletileri giden kutusuna kaydet"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Giden ileti kod kümesi"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Otomatik (Önerilen)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Batı Avrupa (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Batı Avrupa (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Orta Avrupa (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltık (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltık (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Yunanca (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Yunanca (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Kiril (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Türkçe (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Kiril (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Kiril (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Kiril (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kiril (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonca (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Japonca (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonca (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Basitleştirilmiş Çince (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Basitleştirilmiş Çince (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Geleneksel Çince (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Geleneksel Çince (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Çince (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Korece (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Tayca (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Tayca (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Eğer 'Otomatik' seçili ise yerelde kullanılan kod\n"
-"kümesi kullanılacaktır."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Transfer kod kümesi"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Mesaj gövdesi ASCII karakter içermediği zaman kullanılacak\n"
-"İçerik Transfer Kodlamasını seçiniz."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "İmza ayıracı"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Otomatik ekle"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Harici düzenleyici otomatik çalıştır"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Geri alma seviyesi"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "İletileri kaydır: "
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "karakter"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Alıntı Kaydırması"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Girdide Kaydır"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Göndermeden önce kaydır"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Yanıtlamalarda hesabı otomatik seç"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Yanıtlarken alıntı yap"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Yanıtla tuşu eposta listelerine de yanıtlasın"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Yanıtlama formatı"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Alıntı işareti"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Yönlendirme biçimi"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Sembollerin açıklaması "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Yazıtipi"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Başlık adlarını çevir('Kimden','Konu' gibi)"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Belirtilenden daha uzun olan haber gruplarını kısalt"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "posta"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Özet Görünüm"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Eğer gönderen kendimsem 'Kimden' satırında alıcıyı göster"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Dizileri Genişlet"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Tarih biçimi"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Özetin görüntü nesnesini belirt"
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "İletileri renklendir"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Çok bytelı alfabe veya numaraları \n"
-"ASCII karakter olarak göster(Sadece Japonca)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Postaları gösterirken üst kısımda başlıkları göster"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Postaları gösterirken kısa başlıkları göster"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Postaları gösterirken kısa başlıkları göster"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Satır boşluğu"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "benek"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Kaydır"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Yarım sayfa"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Yumuşak kaydır"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Adım"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Pencereye uyması için eklenmiş büyük resimleri yenşden boyutlandır"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Görüntü başlığı ayarları"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Komut çalıştır"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Komut çalıştır"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "dizin:"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "İletileri alırken filtrele"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "İmzaları otomatik denetle"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "İmza kontrol sonuçlarını ek pencerede göster"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Parolayı geçici olarak hafızada sakla"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Belirtilen süre sonra geçerliliğini yitir"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr " dakikada"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Bu değere '0' atayarak parolanın\n"
-"tüm oturuum süresince saklanmasını sağlayabilirsiniz.)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Parolayı girerken girdiyi yakala"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "GnuPG çalışmazsa başlangıçta uyarı mesajı göster"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Mesajlar seçildiğinde her zaman özet halinda göster"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Bir dizine girildiğinde ilk okunmamış iletiyi aç"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Posta sadece yeni pencerede okunduğunda okunmuş olarak işaretle"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "İleti geldiğinde gelen kutusuna git"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Postayı silerken ve taşırken çalıştır"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Eğer bu özellik kapalı ise işlem bitinceye kadar\n"
-"postalar işaretlenecektir.)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Alma penceresi"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Alma penceresini göster"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Her zaman"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Sadece kullanıcı kendi aldığında"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Hiç bir zaman"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Alma sırasında bir hata oluşursa ek pencerede gösterme"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "İşlemler tamamlandığında alma penceresini kapat"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Tuş kombinasyonları..."
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Harici düzenleyici (%s, dosya adı/URL ile yer değiştirecektir)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Tarayıcı"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Çift tıklandığında adresi hedefe ekle"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "Çıkışta"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Çıkışta sor"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "Çıkışta çöpü boşalt"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Boşaltmadan önce sor"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Kuyrukta ileti varsa uyar"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Özet (%s) önbelleğe yazılıyor..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Soket I/O zaman aşımı:"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "saniye"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "kısa hafta adı"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "tam hafta adı"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "kısa ay adı"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "tam ay adı"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "güncel yerel bilgisi için tercih edilen gün ve saat"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "yüzyıl numarası (yıl/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "sayı değerinde ayın günü"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "24 saatlik format kullanılarak saat"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "12 saatlik format kullanılarak saat"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "yılın gününün sayı değeri"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "ay sayı değerinde"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "dakika"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM veya PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "saniye"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "haftanın günü"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "tercih edilen yerek saat"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "yılın son iki rakamı"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "yıl"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "Zaman dilimi veya adı"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Belirtici"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Tanım"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Örnek"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Posta renklerini belirt"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Renkler"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Birinci derecen alıntı metin"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "İkinci dereceden alıntı metin"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Üçüncü dereceden alıntı metin"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URL bağlantısı"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Alıntı renklerini dönüştür"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Birinci dereceden alıntı rengini seçiniz"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "İkinci dereceden alıntı rengini seçiniz"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Üçüncü dereceden alıntı rengini seçiniz"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "URL için renk seçiniz"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "sembollerin açıklamaları"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Tarih\n"
-"Kimden\n"
-"Gönderenin tam adı\n"
-"Gönderenin baş harfleri\n"
-"Konu\n"
-"Kime\n"
-"Cc\n"
-"Habergrubu\n"
-"Mesaj Nosu"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "Eğer x belirtilmişse expr göster"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Mesaj Gövdesi\n"
-"Alıntı yapılan mesaj\n"
-"İmzasız mesaj gövdesi\n"
-"İmzasız alıntı yapılan metin\n"
-"Tam %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Tam backslash\n"
-"Tam soru işareti\n"
-"Tam <\n"
-"Tam >"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Tuş bağıntıları"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Önceden belirlenmiş tuş kombinasyonlarını seçiniz\n"
-"Ayrıca menüde mousunuzun imleci üzerindeyken herhangi bir tuşa\n"
-"basarak nesnelerin kısayollarını değiştirebilirsiniz."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "Öntanımlı"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Eski Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Özel başlık ayarları"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Başlık"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " Sil "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Özel başlıklar"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Başlık adı belirtilmedi."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Başlığı sil"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Bu başlığı silmek istiyor musunuz?"
 
@@ -5292,12 +4097,21 @@ msgstr "Filtre ayarları"
 msgid "Enabled"
 msgstr "Etkin"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Düzenle"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "B kuralı silmek istiyor musunuz?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Başlıksız"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Kuralı sil"
 
@@ -5381,6 +4195,10 @@ msgstr "uzunsa"
 msgid "is shorter than"
 msgstr "kısaysa"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Taşı"
@@ -5503,6 +4321,10 @@ msgstr "Cevaplarken başlığın başındaki [...] veya (...) işaretlerini sil"
 msgid "Apply to subfolders"
 msgstr "Alt dizinlere uygula"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "ayrıca yanıtlarken kullan"
@@ -5576,64 +4398,46 @@ msgstr "Görüntülenen öğeler"
 msgid " Revert to default "
 msgstr " Öntanımlıya geçiş yap "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Şablon adı"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Kaydol"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Değiştir "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Semboller "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Kayıtlı şablonlar"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Şablon"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Şablon biçim hatası."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Şablonu sil"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Gerçekten bu şablonu silmek istiyor musunuz?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "işaret dosyası açılamadı\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "%d. ileti alınamadı\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Yazdırma komutu geçersiz: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "İşlem durum penceresi oluşturuluyor...\n"
@@ -5642,29 +4446,21 @@ msgstr "İşlem durum penceresi oluşturuluyor...\n"
 msgid "Status"
 msgstr "Durum"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "veri alınırken bir hata oluştu.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Dosyaya yazılamadı.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Bu anahtar için kullanıcı numarası bulunamadı."
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "İmza atılma tarihi %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "İmza doğrulanırken hata"
 
@@ -5690,6 +4486,10 @@ msgstr "Anahtar No"
 msgid "Val"
 msgstr "Değer"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Diğer"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Anahtar ekle"
@@ -5710,84 +4510,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Alıntı metinindeki başlıklar hatalı.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Komut çalıştır"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Komut gönderilirken hata oluştu\n"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "Bağlantı kuruluyor"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP sunucuya bağlantı kuruluyor: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "HELO gönderiliyor..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr " Kimlik denetimi"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "İleti gönderiliyor..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "EHLO gönderiliyor... "
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM gönderiliyor..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Gönderiliyor"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO gönderiliyor..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "DATA gönderiliyor..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "İleti gönderilirken hata oluştu."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5888,32 +4688,20 @@ msgstr "KÖTÜ imza"
 msgid "No public key to verify the signature"
 msgstr "İmzayı kontrol etmek için genel anahtar bulunamadı"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH kullanılamıyor\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "kötü SMTP cevabı\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "SMTP oturumunda hata oluştu\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Kaynak penceresi oluşturuluyor...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "İleti kaynağı"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "%s iletinin kaynağı gösteriliyor...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Kaynak"
@@ -6309,6 +5097,921 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Bazı düzenleme pencereleri açık.\n"
+#~ "Lütfen tüm düzenleme pencerelerini kapattıktan sonra hesapları düzenleyin."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Hesap düzenleme penceresi açılıyor...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Hesap düzenleme penceresi oluşturuluyor...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Hesapları düzenle"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Yeni iletiler bu sıra ile kontrol edilirler. `G' sütunundaki\n"
+#~ "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
+#~ "etkin duruma getirilebilir."
+
+#~ msgid "Protocol"
+#~ msgstr "Protokol"
+
+#~ msgid "Server"
+#~ msgstr "Sunucu"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Öntanımlı hesap olarak düzenle "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Bu hesabı silmek istiyor musunuz?"
+
+#~ msgid "Delete account"
+#~ msgstr "Hesabı sil"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Hesap tercihleri penceresi açılıyor...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Hesap%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Yeni hesap için tercihler"
+
+#~ msgid "Account preferences"
+#~ msgstr "Hesap tercihleri"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Al"
+
+#~ msgid "Privacy"
+#~ msgstr "Gizlilik"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Gelişmiş"
+
+#~ msgid "Name of this account"
+#~ msgstr "Bu hesabın adı"
+
+#~ msgid "Set as default"
+#~ msgstr "Öntanımlı kullan"
+
+#~ msgid "Personal information"
+#~ msgstr "Kişisel bilgiler"
+
+#~ msgid "Full name"
+#~ msgstr "Tam adı"
+
+#~ msgid "Mail address"
+#~ msgstr "E-Posta adresi"
+
+#~ msgid "Organization"
+#~ msgstr "Kurum"
+
+#~ msgid "Server information"
+#~ msgstr "Sunucu bilgisi"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Haber grubu (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Hiçbiri (yerel)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Bu sunucu parola istiyor"
+
+#~ msgid "News server"
+#~ msgstr "Haber grubu sunucusu"
+
+#~ msgid "Server for receiving"
+#~ msgstr "İletilerin alınacağı sunucu"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Gönderme için SMTP sunucu"
+
+#~ msgid "User ID"
+#~ msgstr "Kullanıcı adı"
+
+#~ msgid "Password"
+#~ msgstr "Parola"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Güvenli yetkilendirme kullan (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
+
+#~ msgid "Remove after"
+#~ msgstr "Postayı"
+
+#~ msgid "days"
+#~ msgstr "gün sonra sil"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 gün: hemen sil)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Sunucudaki tüm iletileri indir"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Alınan ileti boyutu sınırı"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "İletileri alırken filtrele"
+
+#~ msgid "Default inbox"
+#~ msgstr "Öntanımlı gelen kutusu"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Kimlik denetim yöntemi"
+
+#~ msgid "Automatic"
+#~ msgstr "Otomatik"
+
+#~ msgid "News"
+#~ msgstr "Haberler"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Indirilebilecek azami makale sayısı\n"
+#~ "(0 => limitsiz)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Alıcı belirtilmedi."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "'Hepsini Al' seçeneği bu hesaptaki yeni postaları da kontrol etsin"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Tarih başlığını ekle"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "İleti Numarası Oluştur"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Kullanıcı tanımlı başlık ekle"
+
+#~ msgid " Edit... "
+#~ msgstr " Düzenle... "
+
+#~ msgid "Authentication"
+#~ msgstr "Kimlik denetimi"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Eğer bu girdileri boş bırakırsanız, aynı\n"
+#~ "kullanıcı adı ve parolası kullanılır."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
+
+#~ msgid "Command output"
+#~ msgstr "Komut çıktısı"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Bcc"
+#~ msgstr "Bcc"
+
+#~ msgid "Reply-To"
+#~ msgstr "Yanıtla"
+
+#~ msgid "Sign message by default"
+#~ msgstr "İletileri öntanımlı olarak imzala"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "İletileri öntanımlı olarak şifrele"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "ASCII formatında şifrele"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Metin formatlı imza ekle"
+
+#~ msgid "Sign key"
+#~ msgstr "İmza anahtarı"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Öntanımlı GnuPG anahtarını kullan"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Anahtarı e-posta adresine göre seç"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Anahtarı elle seç"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Kullanıcı ya da anahtar numarası:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "SSL kullanma"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "POP3 bağlantısı için SSL kullan"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "SSL oturumuna başlamak için STARTSSL komutunu kullan"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "IMAP4 bağlantısı için SSL kullan"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "NNTP bağlantısı için SSL kullan"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Gönder (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "SMTP bağlantısı için SSL kullan"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Bloklanmamış SSL Kullan"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(SSL bağlantısında sorunlar yaşıyorsanız, bu özelliği kapatın)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "SMTP portu belirt"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "POP3 portu belirt"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "IMAP4 portu belirt"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "NNTP portu belirt"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Alan adı belirt"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP sunucu dizini"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Gönderilen iletileri nerede sakla"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Taslak mesajlarını buraya koy"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Silinen mesajları buraya koy"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Hesap adı girilmemiş."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "İleti adresi girilmemiş."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "SMTP sunucu girilmemiş."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Kullanıcı numarası girilmemiş."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "POP3 sunucu girilmemiş."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "IMAP4 sunucu girilmemiş."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "NNTP sunucu girilmemiş."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "ASCII formatındaki şifrelemeyi kullanmanız önerilmez\n"
+#~ "OpenPGP ile RFC 3156 - MIME Güvenliği ile uyuşmayan eksi\n"
+#~ "bir yöntemdir."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Genel tercihler penceresi oluşturuluyor...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Genel Tercihler"
+
+#~ msgid "Quote"
+#~ msgstr "Alıntı"
+
+#~ msgid "Display"
+#~ msgstr "Görünüm"
+
+#~ msgid "Message"
+#~ msgstr "İleti"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Dağıtım için harici program kullan"
+
+#~ msgid "Command"
+#~ msgstr "Komut"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Spooldan dağıt"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Dağıtım filtresi"
+
+#~ msgid "Spool path"
+#~ msgstr "Makara konumu"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Yeni postaları otomatik denetle"
+
+#~ msgid "every"
+#~ msgstr "her"
+
+#~ msgid "minute(s)"
+#~ msgstr "dakikada"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Açılışta yeni e-postaları denetle"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Dağıtımdan sonra tüm yerel dizinleri güncelle"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Postayı silerken ve taşırken çalıştır"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Yeni ileti numaraları alınıyor (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Göndermek için harici program kullan"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Gönderilen iletileri giden kutusuna kaydet"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Giden ileti kod kümesi"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Otomatik (Önerilen)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Batı Avrupa (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Batı Avrupa (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Orta Avrupa (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltık (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltık (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Yunanca (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Yunanca (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Kiril (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Türkçe (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Kiril (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Kiril (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Kiril (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Kiril (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Japonca (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Japonca (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Japonca (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Basitleştirilmiş Çince (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Basitleştirilmiş Çince (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Geleneksel Çince (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Geleneksel Çince (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Çince (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Korece (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Tayca (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Tayca (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Eğer 'Otomatik' seçili ise yerelde kullanılan kod\n"
+#~ "kümesi kullanılacaktır."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Transfer kod kümesi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Mesaj gövdesi ASCII karakter içermediği zaman kullanılacak\n"
+#~ "İçerik Transfer Kodlamasını seçiniz."
+
+#~ msgid "Signature separator"
+#~ msgstr "İmza ayıracı"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Otomatik ekle"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Harici düzenleyici otomatik çalıştır"
+
+#~ msgid "Undo level"
+#~ msgstr "Geri alma seviyesi"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "İletileri kaydır: "
+
+#~ msgid "characters"
+#~ msgstr "karakter"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Alıntı Kaydırması"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Girdide Kaydır"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Göndermeden önce kaydır"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Yanıtlamalarda hesabı otomatik seç"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Yanıtlarken alıntı yap"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Yanıtla tuşu eposta listelerine de yanıtlasın"
+
+#~ msgid "Reply format"
+#~ msgstr "Yanıtlama formatı"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Alıntı işareti"
+
+#~ msgid "Forward format"
+#~ msgstr "Yönlendirme biçimi"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Sembollerin açıklaması "
+
+#~ msgid "Font"
+#~ msgstr "Yazıtipi"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Başlık adlarını çevir('Kimden','Konu' gibi)"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Belirtilenden daha uzun olan haber gruplarını kısalt"
+
+#~ msgid "letters"
+#~ msgstr "posta"
+
+#~ msgid "Summary View"
+#~ msgstr "Özet Görünüm"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Eğer gönderen kendimsem 'Kimden' satırında alıcıyı göster"
+
+#~ msgid "Expand threads"
+#~ msgstr "Dizileri Genişlet"
+
+#~ msgid "Date format"
+#~ msgstr "Tarih biçimi"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Özetin görüntü nesnesini belirt"
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "İletileri renklendir"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Çok bytelı alfabe veya numaraları \n"
+#~ "ASCII karakter olarak göster(Sadece Japonca)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Postaları gösterirken üst kısımda başlıkları göster"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Postaları gösterirken kısa başlıkları göster"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Postaları gösterirken kısa başlıkları göster"
+
+#~ msgid "Line space"
+#~ msgstr "Satır boşluğu"
+
+#~ msgid "pixel(s)"
+#~ msgstr "benek"
+
+#~ msgid "Scroll"
+#~ msgstr "Kaydır"
+
+#~ msgid "Half page"
+#~ msgstr "Yarım sayfa"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Yumuşak kaydır"
+
+#~ msgid "Step"
+#~ msgstr "Adım"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Pencereye uyması için eklenmiş büyük resimleri yenşden boyutlandır"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Görüntü başlığı ayarları"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Komut çalıştır"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Komut çalıştır"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "dizin:"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "İletileri alırken filtrele"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "İmzaları otomatik denetle"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "İmza kontrol sonuçlarını ek pencerede göster"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Parolayı geçici olarak hafızada sakla"
+
+#~ msgid "Expired after"
+#~ msgstr "Belirtilen süre sonra geçerliliğini yitir"
+
+#~ msgid "minute(s) "
+#~ msgstr " dakikada"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Bu değere '0' atayarak parolanın\n"
+#~ "tüm oturuum süresince saklanmasını sağlayabilirsiniz.)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Parolayı girerken girdiyi yakala"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "GnuPG çalışmazsa başlangıçta uyarı mesajı göster"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Mesajlar seçildiğinde her zaman özet halinda göster"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Bir dizine girildiğinde ilk okunmamış iletiyi aç"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Posta sadece yeni pencerede okunduğunda okunmuş olarak işaretle"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "İleti geldiğinde gelen kutusuna git"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Postayı silerken ve taşırken çalıştır"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Eğer bu özellik kapalı ise işlem bitinceye kadar\n"
+#~ "postalar işaretlenecektir.)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Alma penceresi"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Alma penceresini göster"
+
+#~ msgid "Always"
+#~ msgstr "Her zaman"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Sadece kullanıcı kendi aldığında"
+
+#~ msgid "Never"
+#~ msgstr "Hiç bir zaman"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Alma sırasında bir hata oluşursa ek pencerede gösterme"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "İşlemler tamamlandığında alma penceresini kapat"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Tuş kombinasyonları..."
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Harici düzenleyici (%s, dosya adı/URL ile yer değiştirecektir)"
+
+#~ msgid "Web browser"
+#~ msgstr "Tarayıcı"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Çift tıklandığında adresi hedefe ekle"
+
+#~ msgid "On exit"
+#~ msgstr "Çıkışta"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Çıkışta sor"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "Çıkışta çöpü boşalt"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Boşaltmadan önce sor"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Kuyrukta ileti varsa uyar"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Özet (%s) önbelleğe yazılıyor..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Soket I/O zaman aşımı:"
+
+#~ msgid "second(s)"
+#~ msgstr "saniye"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "kısa hafta adı"
+
+#~ msgid "the full weekday name"
+#~ msgstr "tam hafta adı"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "kısa ay adı"
+
+#~ msgid "the full month name"
+#~ msgstr "tam ay adı"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "güncel yerel bilgisi için tercih edilen gün ve saat"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "yüzyıl numarası (yıl/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "sayı değerinde ayın günü"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "24 saatlik format kullanılarak saat"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "12 saatlik format kullanılarak saat"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "yılın gününün sayı değeri"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "ay sayı değerinde"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "dakika"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM veya PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "saniye"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "haftanın günü"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "tercih edilen yerek saat"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "yılın son iki rakamı"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "yıl"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "Zaman dilimi veya adı"
+
+#~ msgid "Specifier"
+#~ msgstr "Belirtici"
+
+#~ msgid "Description"
+#~ msgstr "Tanım"
+
+#~ msgid "Example"
+#~ msgstr "Örnek"
+
+#~ msgid "Set message colors"
+#~ msgstr "Posta renklerini belirt"
+
+#~ msgid "Colors"
+#~ msgstr "Renkler"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Birinci derecen alıntı metin"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "İkinci dereceden alıntı metin"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Üçüncü dereceden alıntı metin"
+
+#~ msgid "URI link"
+#~ msgstr "URL bağlantısı"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Alıntı renklerini dönüştür"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Birinci dereceden alıntı rengini seçiniz"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "İkinci dereceden alıntı rengini seçiniz"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Üçüncü dereceden alıntı rengini seçiniz"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "URL için renk seçiniz"
+
+#~ msgid "Description of symbols"
+#~ msgstr "sembollerin açıklamaları"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Tarih\n"
+#~ "Kimden\n"
+#~ "Gönderenin tam adı\n"
+#~ "Gönderenin baş harfleri\n"
+#~ "Konu\n"
+#~ "Kime\n"
+#~ "Cc\n"
+#~ "Habergrubu\n"
+#~ "Mesaj Nosu"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "Eğer x belirtilmişse expr göster"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Mesaj Gövdesi\n"
+#~ "Alıntı yapılan mesaj\n"
+#~ "İmzasız mesaj gövdesi\n"
+#~ "İmzasız alıntı yapılan metin\n"
+#~ "Tam %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Tam backslash\n"
+#~ "Tam soru işareti\n"
+#~ "Tam <\n"
+#~ "Tam >"
+
+#~ msgid "Key bindings"
+#~ msgstr "Tuş bağıntıları"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Önceden belirlenmiş tuş kombinasyonlarını seçiniz\n"
+#~ "Ayrıca menüde mousunuzun imleci üzerindeyken herhangi bir tuşa\n"
+#~ "basarak nesnelerin kısayollarını değiştirebilirsiniz."
+
+#~ msgid "Default"
+#~ msgstr "Öntanımlı"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Eski Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Yazıtipi seçimi"
 
diff --git a/po/uk.po b/po/uk.po
index ef11a65a..738bbf2d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
 "Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,13 +18,396 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "Читаємо конфігурацію для кожного запису...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "не вдалось записати конфігурацію в файл\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "З'єднання IMAP4 до %s втрачено. Відновлюємо...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "Каталог сервера IMAP"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "створення з'єднання INAP4 до %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "Не вдалось почати сесію TLS.\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "Посилаємо лист (%d / %d байтів)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "Копіюємо лист %s%c%d в %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "Копіюємо лист %s%c%d в %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "Отримуємо листи від %s..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "не вдалось встановити прапорець видалення: %s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "не вдалось очистити папку від видалених листів\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "Отримуємо листи від %s..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "не вдалось встановити прапорець видалення: 1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "не вдалось закрити папку\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "коренева папка %s не існує\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "помилка при отриманні LIST'а.\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "Не вдалось створити '%s'\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "Не вдалось створити '%s' всередині INBOX\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "не вдалось створити скриньку: невдача LIST\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "не вдалось створити скриньку\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "не вдалось перейменувати скриньку: %s на %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "не вдалось видалити скриньку\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "не вдалось отримати конверт\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "Посилаємо лист (%d / %d байтів)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "трапилась помилка при отриманні конверта.\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "не вдалось розібрати конверт: %s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "не вдалось отримати простір імен\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "не вдалось отримати папку: %s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "Невдача авторизації IMAP4.\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "Невдача авторизації IMAP4.\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "не вдалось додати %s до %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(посилаємо файл...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "не вдалось приєднати лист до %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "не вдалось скопіювати %s в %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "помилка при виконанні команди imap: EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "помилка при виконанні команди imap: CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv не може конвертувати UTF-7 в %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv не може конвертувати %s в UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "не вдалось копіювати %s в %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "Не вдалось відкрити файл позначок.\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "папка призначення ідентична до вихідної.\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "Копіюємо лист %s%c%d в %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "Останній номер в каталозі %s = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"Файл `%s' вже існує.\n"
+"Неможливо створити папку."
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "створюємо з'єднання NNTP до %s:%d ...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "З'єднання NNTP до %s:%d було розірвано. Відновлюємо...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "статтю %d вже кешовано.\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "отримуємо статтю %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "не вдалось прочитати статтю %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "не вдалось отримати список конференцій\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "не вдалось послати статтю.\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "не вдалось отримати статтю %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "не вдалось обрати конференцію: %s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "невірний діапазон статей: %d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "нових статтей нема.\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "отримуємо xover %d - %d в %s...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "не вдалось отримати xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "трапилась помилка при отриманні xover.\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "невірний рядок xover: %s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "не вдалось отримати xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "трапилась помилка при отриманні xhdr.\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "Не вдалось з'єднатись з сервером NNTP: %s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "помилка протоколу: %s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "помилка протоколу\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "Трапилась помилка при відсиланні\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "При відсиланні команди трапилась помилка\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "У привітанні не знайдено обов'язкового APOP timestamp\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "Синтаксична помилка в timestamp у привітанні\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "Помилка протоколу POP3\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "невірна відповідь UIDL: %s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: Вилучаємо застарілий лист %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Пропускаємо лист %d (%d байтів)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "скриньку заблоковано\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "таймаут сесії\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "не вдалось почати сесію TLS\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "помилка при аутентифікації\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "команда не підтримується\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "помилка під час сесії POP3\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -34,6 +417,53 @@ msgstr "Знайдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Конфігурацію збережено.\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "папка:"
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "не вдалось відкрити файл позначок\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "не вдалось стягти лист %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "Не вдалось отримати текстову частину\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "Невірна команда друку: `%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "трапилась помилка при отриманні даних.\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "Не вдалось писати в файл.\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP AUTH недоступна\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "погана відпоідь SMTP\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "помилка під час сесії SMTP\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 недоступний\n"
@@ -166,78 +596,6 @@ msgstr ""
 "програмою; якщо це не так, пишіть у Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "Читаємо конфігурацію для кожного запису...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"Відкрито деякі вікна з новими листами.\n"
-"Закрийте їх, будь-ласка, перш ніж редагувати облікові записи."
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "Відкриваємо вікно редагування облікового запису...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "Створюємо вікно редагування облікового запису...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "Редагуємо облікові записи"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"Порядок перевірки нових листів. Позначте в колонці `G'\n"
-"account'и, які поповнюються через `Отримати всі'."
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "Ім'я"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "Протокол"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "Сервер"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "Редагувати"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " Встановити як default "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "Ви дійсно бажаєте видалити цей запис?"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "БезНазви"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "Видалити обліковий запис"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -337,6 +695,14 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "Ім'я"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -351,8 +717,8 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/Файл"
 
@@ -373,9 +739,9 @@ msgid "/_File/New _Server"
 msgstr "/Файл/Новий сервер"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -391,7 +757,7 @@ msgstr "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
@@ -423,8 +789,8 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/Інструменти"
 
@@ -432,13 +798,13 @@ msgstr "/Інструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
@@ -455,17 +821,17 @@ msgid "/New _Folder"
 msgstr "/Нова папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/Редагувати"
 
@@ -477,7 +843,7 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -487,14 +853,14 @@ msgstr "Ім'я:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "Видалити"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -505,11 +871,11 @@ msgid "Lookup"
 msgstr "Пошук"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "Копія:"
 
@@ -535,7 +901,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -642,7 +1008,7 @@ msgstr "Помилка при конвертуванні адресної кни
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "Інтерфейс"
 
@@ -662,8 +1028,7 @@ msgstr "Адреса e-mail"
 msgid "Group"
 msgstr "Група"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "Папка"
 
@@ -687,15 +1052,15 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "Примітка"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "Помилка"
 
@@ -750,8 +1115,8 @@ msgstr "/Додати..."
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
@@ -791,8 +1156,8 @@ msgstr "/Редагувати/Undo"
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
@@ -800,7 +1165,7 @@ msgstr "/Редагувати/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
@@ -812,7 +1177,7 @@ msgstr "/Редагувати/Вставити"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
@@ -828,7 +1193,7 @@ msgstr "/Редагувати/Згорнути всі довгі рядки"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Вигляд"
@@ -850,9 +1215,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
@@ -868,7 +1233,7 @@ msgstr "/Вигляд/Лінійка"
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Сортувати/За спаданням"
@@ -880,127 +1245,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
@@ -1008,14 +1373,14 @@ msgstr "/Інструменти/Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
@@ -1036,10 +1401,6 @@ msgstr "/Інструменти/Шифрування PGP"
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "Не вдалось отримати текстову частину\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
@@ -1116,7 +1477,7 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
@@ -1208,8 +1569,7 @@ msgstr "тип MIME"
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "Послати"
 
@@ -1249,8 +1609,7 @@ msgstr "Приєднати"
 msgid "Attach file"
 msgstr "Приєднати файл"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "Підпис"
 
@@ -1258,7 +1617,7 @@ msgstr "Підпис"
 msgid "Insert signature"
 msgstr "Вставити підпис"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "Редактор"
 
@@ -1455,7 +1814,7 @@ msgstr "Змінити"
 msgid "Clear"
 msgstr "Очистити"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Значення"
 
@@ -1488,7 +1847,6 @@ msgid " Check File "
 msgstr " Перевірити файл "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "Файл"
 
@@ -1544,12 +1902,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -1566,7 +1924,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1630,7 +1988,7 @@ msgstr "Таймаут (с)"
 msgid "Maximum Entries"
 msgstr "Максимальний розмір результату"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "Основні"
 
@@ -1687,7 +2045,6 @@ msgid "Exporting file:"
 msgstr "Експорт файла:"
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " Обрати... "
 
@@ -1711,162 +2068,162 @@ msgstr "Писати поверх існуючого файла?"
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "Чорновики"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/Створити нову папку..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/Перейменувати папку..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Перейменувати папку..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/Видалити папку"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/Шукати листи..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/Завантажити"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Передплатити конференцію"
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/Видалити конференцію"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "Створення області перегляду папок...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "Нові"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочитані"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "Встановлюємо інформацію папки...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1876,21 +2233,21 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1901,21 +2258,21 @@ msgstr ""
 "Всі папки і листи в `%s' буде видалено.\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1924,34 +2281,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2012,7 +2369,7 @@ msgstr "%d конференцій отримано (%s прочитано)"
 msgid "Newsgroups:"
 msgstr "Конференції:"
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -2036,160 +2393,6 @@ msgstr "Створюємо область перегляду зображенн�
 msgid "Can't load the image."
 msgstr "Не вдалось завантажити зображення."
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "З'єднання IMAP4 до %s втрачено. Відновлюємо...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "Каталог сервера IMAP"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "створення з'єднання INAP4 до %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "Не вдалось почати сесію TLS.\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "не вдалось встановити прапорець видалення: %s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "не вдалось очистити папку від видалених листів\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "не вдалось встановити прапорець видалення: 1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "не вдалось закрити папку\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "коренева папка %s не існує\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "помилка при отриманні LIST'а.\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "Не вдалось створити '%s'\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "Не вдалось створити '%s' всередині INBOX\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "не вдалось створити скриньку: невдача LIST\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "не вдалось створити скриньку\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "не вдалось перейменувати скриньку: %s на %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "не вдалось видалити скриньку\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "не вдалось отримати конверт\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "трапилась помилка при отриманні конверта.\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "не вдалось розібрати конверт: %s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "не вдалось отримати простір імен\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "не вдалось отримати папку: %s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "Невдача авторизації IMAP4.\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "Невдача авторизації IMAP4.\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "не вдалось додати %s до %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(посилаємо файл...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "не вдалось приєднати лист до %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "не вдалось скопіювати %s в %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "помилка при виконанні команди imap: EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "помилка при виконанні команди imap: CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv не може конвертувати UTF-7 в %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv не може конвертувати %s в UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "Імпортувати"
@@ -2287,7 +2490,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "Далі"
 
@@ -2303,143 +2506,143 @@ msgstr "Атрибути"
 msgid "Finish"
 msgstr "Закінчити"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Старий Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "Отримання нових листів"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "Очікування"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Виконано (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "Виконано (немає нових листів)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "Невдача з'єднання"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "Невдача автентифікації"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "Закінчено (немає нових листів)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "При отриманні пошти трапились деякі помилки."
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "отримання нової пошти для запису %s...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Отримання нових листів"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Отримуємо лист (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2448,28 +2651,28 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2478,11 +2681,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2491,15 +2694,15 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -2517,29 +2720,20 @@ msgstr "Введіть пароль"
 msgid "Protocol log"
 msgstr "Журнал протоколу"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"Файл `%s' вже існує.\n"
-"Неможливо створити папку."
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не підтримується glib.\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Вживання: %s [ОПЦІЇ]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    відкрити вікно для нового листа"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2549,23 +2743,23 @@ msgstr ""
 "                         відкрити вікно створення з приєднанням вказаних\n"
 "                         файлів"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              отримати нові листи"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          отримати нові листи для всіх записів"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 відіслати всі відкладені листи"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   показати загальну кількість листів"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2573,24 +2767,24 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         показати стан кожної папки"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим відлагодження"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 показати цю довідку і вийти"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              видати інформацію про версію і вийти"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Кодова таблиця для вихідної пошти"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2604,19 +2798,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "Є незавершені листи. Справді вийти?"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "Листи в черзі"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Деякі невідіслані листи - в черзі. Вийти зараз?"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2625,652 +2819,652 @@ msgstr ""
 "Відключено підтримку OpenPGP."
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфігурування дій"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Створити нову..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Видалити папку"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Додати скриньку..."
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Додати скриньку..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Видалити скриньку"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Папка/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Папка/Перевірити за новими листами у всіх папках"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Імпортувати файл mbox"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Експортувати в файл mbox..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Спорожнити кошик"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/Файл/Зберегти як..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/Файл/Друкувати..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/Файл/Працювати без з'єднання"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/Файл/Вийти"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/Редагувати/Виділити обговорення"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/Редагувати/Шукати в поточному листі"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/Редагувати/Пошук листів..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/Вигляд/Показати чи приховати"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вигляд/Показати чи приховати/Дерево папок"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вигляд/Показати чи приховати/Зміст листа"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка і текст"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Текст"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Немає"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме дерево папок"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окрема область перегляду змісту"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/Вигляд/Сортувати"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/Вигляд/Сортувати/За номером"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вигляд/Сортувати/За розміром"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/Вигляд/Сортувати/За датою"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/Вигляд/Сортувати/За відправником"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вигляд/Сортувати/За одержувачем"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вигляд/Сортувати/За темою"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вигляд/Сортувати/За виділенням кольором"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вигляд/Сортувати/За позначкою"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вигляд/Сортувати/Окремо непрочитані"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вигляд/Сортувати/За вкладенням"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вигляд/Сортувати/Непотрібно"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/Вигляд/Сортувати/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вигляд/Сортувати/За зростанням"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вигляд/Сортувати/Групувати за темою"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/Вигляд/Перегляд обговорення"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/Вигляд/Розгортати всі обговорення"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вигляд/Згорнути всі обговорення"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/Вигляд/Встановити поля для показу..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/Вигляд/Перейти до"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вигляд/Перейти до/Наступного листа"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вигляд/Перейти до/Попереднього листа"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/Вигляд/Перейти до/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вигляд/Перейти до/Попереднього непрочитаного листа"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вигляд/Перейти до/Наступного непрочитаного листа"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вигляд/Перейти до/Попереднього нового листа"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вигляд/Перейти до/Наступного нового листа"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вигляд/Перейти до/Попереднього позначеного листа"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вигляд/Перейти до/Наступного позначеного листа"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вигляд/Перейти до/Попереднього листа, виділеного кольором"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вигляд/Перейти до/Наступного листа, виділеного кольором"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/Вигляд/Показати весь заголовок"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Лист/Отримати/Скасувати отримання"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Лист/Позначка/Зробити"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/Інструменти/Виконати"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Спільні налаштування..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійський"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японський"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійський"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецький"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанський"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французький"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійський"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Спорожнити кошик"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3280,16 +3474,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3299,150 +3493,149 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Встановити як default"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
@@ -3560,32 +3753,32 @@ msgstr "Досягнуто кінця листа; продовжити з поч
 msgid "Search finished"
 msgstr "Пошук закінчено"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "Створюємо область перегляду листа...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "Текст"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "Вкладення"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3594,7 +3787,7 @@ msgstr ""
 "Введіть команду друку:\n"
 "(`%s' буде замінено іменем файла)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3603,41 +3796,6 @@ msgstr ""
 "Командний рядок друку непридатний:\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "не вдалось копіювати %s в %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "Не вдалось відкрити файл позначок.\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "папка призначення ідентична до вихідної.\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "Копіюємо лист %s%c%d в %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Останній номер в каталозі %s = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/Відкрити"
@@ -3724,115 +3882,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Командний рядок переглядача MIME невірний: `%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "створюємо з'єднання NNTP до %s:%d ...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "З'єднання NNTP до %s:%d було розірвано. Відновлюємо...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "статтю %d вже кешовано.\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "отримуємо статтю %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "не вдалось прочитати статтю %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "не вдалось отримати список конференцій\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "не вдалось послати статтю.\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "не вдалось отримати статтю %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "не вдалось обрати конференцію: %s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "невірний діапазон статей: %d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "нових статтей нема.\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "отримуємо xover %d - %d в %s...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "не вдалось отримати xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "трапилась помилка при отриманні xover.\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "невірний рядок xover: %s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "не вдалось отримати xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "трапилась помилка при отриманні xhdr.\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "Не вдалось з'єднатись з сервером NNTP: %s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "помилка протоколу: %s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "помилка протоколу\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "Трапилась помилка при відсиланні\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "При відсиланні команди трапилась помилка\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "Пароль"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[нема id користувача]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3845,7 +3903,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3853,455 +3911,6 @@ msgstr ""
 "Поганий пароль! Пробуємо знову...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "У привітанні не знайдено обов'язкового APOP timestamp\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "Синтаксична помилка в timestamp у привітанні\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "Помилка протоколу POP3\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "невірна відповідь UIDL: %s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: Вилучаємо застарілий лист %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Пропускаємо лист %d (%d байтів)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "скриньку заблоковано\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "таймаут сесії\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "не вдалось почати сесію TLS\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "помилка при аутентифікації\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "команда не підтримується\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "помилка під час сесії POP3\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "Відкриття вікна опцій account'а...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "Запис%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "Налаштування для нового запису"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "Налаштування запису"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "Створення вікна опцій запису...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "Отримання"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "Privacy"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "Advanced"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "Назва цього запису"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "Встановити як default"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "Особиста інформація"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "Повне ім'я"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "Поштова адреса"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "Організація"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "Інформація про сервер"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "Новини (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "Нема (локально)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "Цей сервер вимагає аутентифікації"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "Сервер новин"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "Сервер для отримання"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "Сервер SMTP (відсилання)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "ID користувача"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "Пароль"
-
-#: src/prefs_account.c:1031
-#, fuzzy
-msgid "Use secure authentication (APOP)"
-msgstr "Цей сервер вимагає аутентифікації"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "Видаляти листи на сервері після отримання"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "Видалити через"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "днів"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 днів - видаляти негайно)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "Завантажити всі листи на сервері"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "Обмеження розміру отриманих листів"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "Кб"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "Фільтрувати листи при отриманні"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "Вхідна папка по замовчуванню"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(Тут складаємо невідфільтровані листи)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "Метод аутентифікації"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "Автоматично"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "Новини"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"Максимальна кількість статей для завантаження\n"
-"(необмежена, якщо вказано 0)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "Не вказано отримувача."
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "Перевіряти за командою `Отримати всі'"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "Заголовок"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "Додати поле дати заголовка"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "Генерувати Message-ID"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "Вживати заголовок, визначений користувачем"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " Редагувати... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "Аутентифікація"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "Аутентифікація SMTP (SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Якщо Ви залишите ці поля порожніми, буде вжито ті ж\n"
-"ID користувача та пароль, що й для отримання пошти."
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "Аутентифікація POP3 перед відсиланням"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "Вивід команди"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "Автоматично встановлювати наступні адреси"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "Копія"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "Приховано"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "Зворотня адреса"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "Підписувати лист по замовчуванню"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "Шифрувати лист по замовчуванню"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "Вживати \"ASCII-armored\" формат для шифрування"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "Вживати підпис відкритим текстом"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "Ключ підпису"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "Вживати ключ GnuPG по замовчуванню"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "Обрати ключ за Вашою адресою e-mail"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "Визначити ключ власноручно"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "Користувач або ідентифікатор ключа:"
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "Не вживати SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "Вживати SSL для з'єднання POP3"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "Вживати команду STARTTLS для початку сесії SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "Вживати SSL для з'єднання IMAP4"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "Вживати SSL для з'єднання NNTP"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "Відсилка (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "Вживати SSL для з'єднання SMTP"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "Вживати неблокуючий SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(Вимкніть це, якщо стикаєтесь з проблемами при з'єднанні SSL )"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "Вказати порт SMTP"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "Вказати порт POP3"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "Вказати порт IMAP4"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "Вказати порт NNTP"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "Вказати ім'я домена"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "Каталог сервера IMAP"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "Зберігати відіслані листи в"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "Зберігати чорновики листів в"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "Зберігати видалені листи в"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "Назву запису не вказано."
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "Не вказано поштову адресу."
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "Не вказано сервер SMTP."
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "Не вказано ID користувача."
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "Не вказано сервер POP3."
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "Не вказано сервер IMAP4."
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "Не вказано сервер NNTP."
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"Не рекомендовано вживати старий \"ASCII-armored\"\n"
-"режим для шифрованих листів. Він не відповідає\n"
-"RFC 3156 - MIME Security with OpenPGP."
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "Конфігурування дій"
@@ -4366,17 +3975,17 @@ msgstr "Синтаксична довідка"
 msgid "Registered actions"
 msgstr "Зареєстровані дії"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "Вгору"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "Вниз"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(Новий)"
 
@@ -4419,836 +4028,31 @@ msgstr "Видалити дію"
 msgid "Do you really want to delete this action?"
 msgstr "Ви дійсно бажаєте видалити цю дію?"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "папка:"
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "Створюємо вікно загальних опцій...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "Загальні налаштування"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "Цитування"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "Відображення"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "Повідомлення"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "Інше"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "Вживати зовнішню програму для прийому"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "Команда"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "Приймати зі спулу"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "Фільтрувати при прийомі"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Шлях до спулу"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "Автоматично перевіряти нову пошту"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "кожні"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "хвилин"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "Перевіряти нову пошту при запуску"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "Оновлювати всі локальні папки після прийому"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "Виконувати негайно після видалення чи переміщення листів"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "Отримуємо кількість нових листів (STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "Вживати зовнішню програму для відсилання"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "Зберігати відіслані листи в outbox"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "Кодова таблиця для вихідної пошти"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "Автоматична (рекомендовано)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7bit ascii (US-ASCII)"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "Західноєвропейська (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "Західноєвропейська (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "Цнтральноєвропейська (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "Балтійська (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "Балтійська (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "Грецька (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "Грецька (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "Кирилиця (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "Турецька (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Кирилиця (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "Кирилиця (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "Кирилиця (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "Кирилиця (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Японська (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "Японська (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "Японська (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "Спрощена китайська (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "Спрощена китайська (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "Традиційна китайська (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "Традиційна китайська (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "Китайська (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "Корейська (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "Тайська (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "Тайська (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"Якщо включено `Автоматична', буде обрано оптимальне\n"
-"кодування для діючої locale."
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "Кодування пересилки"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr ""
-"Вкажіть Content-Transfer-Encoding для вживання,\n"
-"якщо тіло листа містить не-ASCII символи."
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "Розділювач підпису"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "Вставити автоматично"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "Автоматично запускати зовнішній редактор"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "Рівень Undo"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "Згортати рядки листів після"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "символів"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "Згортати цитування"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "Згорнути при вводі"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "Згортати перед відсиланням"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "Автоматично вибирати запис для відповідей"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "Цитувати лист при відповіді"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "Кнопка відповіді запускає відповідь конференції"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "Формат відповіді"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "Знак цитати"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "Формат пересилання"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " Опис символів "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "Шрифт"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "Перекладати назви полів заголовка (як `From:', `Subject:')"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "Показувати кількість непрочитаного після назви папки"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "Скорочувати назви конференцій, довші ніж"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "літер"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "Список повідомлень"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Показувати отримувача в колонці `Від', якщо відправник - Ви"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "Розгортати обговорення"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "Формат дати"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " Показувати наступні поля... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "Дозволити розфарбування листів"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"Відображати 2-байтний алфавіт і числа\n"
-"однобайтним символом (для японської мови)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "Показувати панель заголовка над листом"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "Показувати скорочені заголовки при перегляді листів"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "Показувати скорочені заголовки при перегляді листів"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "Міжрядковий інтервал"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "пікселів"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "Прокрутка"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "Півсторінки"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "Плавна прокрутка"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "Крок"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "Масштабувати приєднані картинки відповідно до вікна"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "Налаштування відображення заголовка"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "Виконати команду"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "Виконати команду"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "папка:"
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "Фільтрувати листи при отриманні"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(Тут складаємо невідфільтровані листи)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "Автоматично перевіряти підписи"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "Показувати результат перевірки підпису у спливаючому вікні"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "Тимчасово зберігати пароль в пам'яті"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "Недійсний після"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "хвилин "
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr ""
-"(Присвоєння '0' зберігає пароль протягом\n"
-" всієї сесії)"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "Захопити ввід при введенні паролю"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "Попереджати при запуску, якщо GnuPG не працює"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "Завжди відкривати листи у списку при виділенні"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "Відкривати перший непрочитаний лист, входячи в папку"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "Позначати як прочитаний тільки лист, відкритий у новому вікні"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "Переходити у папку `Вхідні', отримавши нову пошту"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Виконувати негайно після видалення чи переміщення листів"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr ""
-"(Листи буде позначено до виконання,\n"
-" якщо це вимкнути)"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "Діалог отримання"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "Показувати діалог отримання"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "Завжди"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "Тільки при ручному отриманні"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "Ніколи"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "Не видавати діалог при помилці отримання"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "Закрити діалог отримання після завершення"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " Встановити гарячі клавіші... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Зовнішні команди (%s буде замінено на ім'я файлу / URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "Web-браузер"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "Додати адресу до призначення, коли клацнути двічі"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "При виході"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "Підтвердити при виході"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "При виході очищати кошик"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "Питати перед очищенням"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "Попереджати, якщо є листи в черзі"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "Пишемо кеш списка (%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Таймаут сокета вводу/виводу"
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "секунд"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "повна скорочена назва дня тижня"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "повна назва дня тижня"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "скорочена назва місяця"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "повна назва місяця"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "бажана дата і час для поточної locale"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "номер сторіччя (рік/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "день місяця як десяткове число"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "година як десяткове число за 24-годинним циферблатом"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "година як десяткове число за 12-годинним циферблатом"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "день року як десяткове число"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "місяць як десяткове число"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "хвилини як десяткове число"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM чи PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "секунди як десяткове число"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "день тижня як десяткове число"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "бажана дата для поточної locale"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "останні дві цифри року"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "рік як десяткове число"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "часова зона або ім'я або скорочення"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "Специфікатор"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "Опис"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "Приклад"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "Встановити кольори листа"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "Кольори"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "Цитований текст - перший рівень"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "Цитований текст - другий рівень"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "Цитований текст - третій рівень"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI link"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "Повторно використати кольори цитування"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "Обрати колір для цитування рівня 1"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "Обрати колір для цитування рівня 2"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "Обрати колір для цитування рівня 3"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "Обрати колір для URI"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "Опис символів"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "якщо встановлено x, показує expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"Тіло повідомлення\n"
-"Тіло цитованого повідомлення\n"
-"Тіло повідомлення без підпису\n"
-"Тіло цитованого повідомлення без підпису\n"
-"Буквально %"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"Буквальний backslash\n"
-"Буквальний знак запитання\n"
-"Буквальна відкриваюча фігурна дужка\n"
-"Буквальна закриваюча фігурна дужка"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "Гарячі клавіші"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"Оберіть попереднє значення гарячих клавіш.\n"
-"Ви також можете змінити кожен shortcut меню, натиснувши\n"
-"будь-яку(і) клавішу(і), тримаючи вказівник миші на пункті."
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "По замовчуванню"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "Старий Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "Власні налаштування заголовка"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "Заголовок"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr "Видалити"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "Власні заголовки"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Назву заголовка не задано."
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "Видалити заголовок"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "Справді бажаєте видалити цей заголовок?"
 
@@ -5296,12 +4100,21 @@ msgstr "Налаштування фільтра"
 msgid "Enabled"
 msgstr "Ввімкнено"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "Редагувати"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Справді бажаєте видалити це правило?"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "БезНазви"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "Видалити правило"
 
@@ -5385,6 +4198,10 @@ msgstr "довше, ніж"
 msgid "is shorter than"
 msgstr "коротше, ніж"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "Кб"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Перенести у"
@@ -5507,6 +4324,10 @@ msgstr "Видаляти [...] чи (...) на початку теми при в
 msgid "Apply to subfolders"
 msgstr "Застосувати до підпапок"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "Автоматично встановлювати наступні адреси"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "вживати і при відповіді"
@@ -5580,64 +4401,46 @@ msgstr "Показані поля"
 msgid " Revert to default "
 msgstr " Повернутись до стандартних "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "Назва шаблону"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "Реєструвати"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " Підставити "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " Символи "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "Зареєстровані шаблони"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "Шаблони"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "Помилка формату шаблону."
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "Видалити шаблон"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "Справді видалити цей шаблон?"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "не вдалось відкрити файл позначок\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "не вдалось стягти лист %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "Невірна команда друку: `%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "Створюємо діалогове вікно прогресу...\n"
@@ -5646,29 +4449,21 @@ msgstr "Створюємо діалогове вікно прогресу...\n"
 msgid "Status"
 msgstr "Стан"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "трапилась помилка при отриманні даних.\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "Не вдалось писати в файл.\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "Не вдалось знайти ID користувача для цього ключа"
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Підпис створений %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Помилка при перевірці підпису"
 
@@ -5694,6 +4489,10 @@ msgstr "Ідентифікатор ключа"
 msgid "Val"
 msgstr "Val"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "Інше"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "Додати ключ"
@@ -5714,84 +4513,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок листа з черги зіпсовано.\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Посилаємо лист (%d / %d байтів)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "Виконати команду"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "При відсиланні команди трапилась помилка\n"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "З'єднуємось"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "З'єднання з сервером SMTP: %s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "Посилаємо HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "Аутентифікація"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "Посилаємо лист..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "Посилаємо EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "Посилаємо MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "Посилаємо"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "Посилаємо RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "Посилаємо DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "Виходимо..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Посилаємо лист (%d / %d байтів)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "Посилаємо лист"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "При відсиланні листа трапилась помилка."
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5893,32 +4692,20 @@ msgstr "ПОГАНИЙ підпис"
 msgid "No public key to verify the signature"
 msgstr "Немає публічного ключа для перевірки підпису"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP AUTH недоступна\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "погана відпоідь SMTP\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "помилка під час сесії SMTP\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "Створюємо вікно перегляду вихідного тексту листа...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Вихідний текст листа"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "Показуємо вихідний текст %s ...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Вихідний текст"
@@ -6316,6 +5103,922 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "Відкрито деякі вікна з новими листами.\n"
+#~ "Закрийте їх, будь-ласка, перш ніж редагувати облікові записи."
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "Відкриваємо вікно редагування облікового запису...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "Створюємо вікно редагування облікового запису...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "Редагуємо облікові записи"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "Порядок перевірки нових листів. Позначте в колонці `G'\n"
+#~ "account'и, які поповнюються через `Отримати всі'."
+
+#~ msgid "Protocol"
+#~ msgstr "Протокол"
+
+#~ msgid "Server"
+#~ msgstr "Сервер"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " Встановити як default "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "Ви дійсно бажаєте видалити цей запис?"
+
+#~ msgid "Delete account"
+#~ msgstr "Видалити обліковий запис"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "Відкриття вікна опцій account'а...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "Запис%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "Налаштування для нового запису"
+
+#~ msgid "Account preferences"
+#~ msgstr "Налаштування запису"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "Створення вікна опцій запису...\n"
+
+#~ msgid "Receive"
+#~ msgstr "Отримання"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacy"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "Advanced"
+
+#~ msgid "Name of this account"
+#~ msgstr "Назва цього запису"
+
+#~ msgid "Set as default"
+#~ msgstr "Встановити як default"
+
+#~ msgid "Personal information"
+#~ msgstr "Особиста інформація"
+
+#~ msgid "Full name"
+#~ msgstr "Повне ім'я"
+
+#~ msgid "Mail address"
+#~ msgstr "Поштова адреса"
+
+#~ msgid "Organization"
+#~ msgstr "Організація"
+
+#~ msgid "Server information"
+#~ msgstr "Інформація про сервер"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "Новини (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "Нема (локально)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "Цей сервер вимагає аутентифікації"
+
+#~ msgid "News server"
+#~ msgstr "Сервер новин"
+
+#~ msgid "Server for receiving"
+#~ msgstr "Сервер для отримання"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "Сервер SMTP (відсилання)"
+
+#~ msgid "User ID"
+#~ msgstr "ID користувача"
+
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#, fuzzy
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "Цей сервер вимагає аутентифікації"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "Видаляти листи на сервері після отримання"
+
+#~ msgid "Remove after"
+#~ msgstr "Видалити через"
+
+#~ msgid "days"
+#~ msgstr "днів"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 днів - видаляти негайно)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "Завантажити всі листи на сервері"
+
+#~ msgid "Receive size limit"
+#~ msgstr "Обмеження розміру отриманих листів"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "Фільтрувати листи при отриманні"
+
+#~ msgid "Default inbox"
+#~ msgstr "Вхідна папка по замовчуванню"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(Тут складаємо невідфільтровані листи)"
+
+#~ msgid "Authentication method"
+#~ msgstr "Метод аутентифікації"
+
+#~ msgid "Automatic"
+#~ msgstr "Автоматично"
+
+#~ msgid "News"
+#~ msgstr "Новини"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "Максимальна кількість статей для завантаження\n"
+#~ "(необмежена, якщо вказано 0)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "Не вказано отримувача."
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "Перевіряти за командою `Отримати всі'"
+
+#~ msgid "Add Date header field"
+#~ msgstr "Додати поле дати заголовка"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "Генерувати Message-ID"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "Вживати заголовок, визначений користувачем"
+
+#~ msgid " Edit... "
+#~ msgstr " Редагувати... "
+
+#~ msgid "Authentication"
+#~ msgstr "Аутентифікація"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "Аутентифікація SMTP (SMTP AUTH)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr ""
+#~ "Якщо Ви залишите ці поля порожніми, буде вжито ті ж\n"
+#~ "ID користувача та пароль, що й для отримання пошти."
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "Аутентифікація POP3 перед відсиланням"
+
+#~ msgid "Command output"
+#~ msgstr "Вивід команди"
+
+#~ msgid "Cc"
+#~ msgstr "Копія"
+
+#~ msgid "Bcc"
+#~ msgstr "Приховано"
+
+#~ msgid "Reply-To"
+#~ msgstr "Зворотня адреса"
+
+#~ msgid "Sign message by default"
+#~ msgstr "Підписувати лист по замовчуванню"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "Шифрувати лист по замовчуванню"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "Вживати \"ASCII-armored\" формат для шифрування"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "Вживати підпис відкритим текстом"
+
+#~ msgid "Sign key"
+#~ msgstr "Ключ підпису"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "Вживати ключ GnuPG по замовчуванню"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "Обрати ключ за Вашою адресою e-mail"
+
+#~ msgid "Specify key manually"
+#~ msgstr "Визначити ключ власноручно"
+
+#~ msgid "User or key ID:"
+#~ msgstr "Користувач або ідентифікатор ключа:"
+
+#~ msgid "Don't use SSL"
+#~ msgstr "Не вживати SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "Вживати SSL для з'єднання POP3"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "Вживати команду STARTTLS для початку сесії SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "Вживати SSL для з'єднання IMAP4"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "Вживати SSL для з'єднання NNTP"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "Відсилка (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "Вживати SSL для з'єднання SMTP"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "Вживати неблокуючий SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(Вимкніть це, якщо стикаєтесь з проблемами при з'єднанні SSL )"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "Вказати порт SMTP"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "Вказати порт POP3"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "Вказати порт IMAP4"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "Вказати порт NNTP"
+
+#~ msgid "Specify domain name"
+#~ msgstr "Вказати ім'я домена"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "Каталог сервера IMAP"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "Зберігати відіслані листи в"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "Зберігати чорновики листів в"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "Зберігати видалені листи в"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "Назву запису не вказано."
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "Не вказано поштову адресу."
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "Не вказано сервер SMTP."
+
+#~ msgid "User ID is not entered."
+#~ msgstr "Не вказано ID користувача."
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "Не вказано сервер POP3."
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "Не вказано сервер IMAP4."
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "Не вказано сервер NNTP."
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "Не рекомендовано вживати старий \"ASCII-armored\"\n"
+#~ "режим для шифрованих листів. Він не відповідає\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "Створюємо вікно загальних опцій...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "Загальні налаштування"
+
+#~ msgid "Quote"
+#~ msgstr "Цитування"
+
+#~ msgid "Display"
+#~ msgstr "Відображення"
+
+#~ msgid "Message"
+#~ msgstr "Повідомлення"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "Вживати зовнішню програму для прийому"
+
+#~ msgid "Command"
+#~ msgstr "Команда"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "Приймати зі спулу"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "Фільтрувати при прийомі"
+
+#~ msgid "Spool path"
+#~ msgstr "Шлях до спулу"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "Автоматично перевіряти нову пошту"
+
+#~ msgid "every"
+#~ msgstr "кожні"
+
+#~ msgid "minute(s)"
+#~ msgstr "хвилин"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "Перевіряти нову пошту при запуску"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "Оновлювати всі локальні папки після прийому"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "Виконувати негайно після видалення чи переміщення листів"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "Отримуємо кількість нових листів (STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "Вживати зовнішню програму для відсилання"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "Зберігати відіслані листи в outbox"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "Кодова таблиця для вихідної пошти"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "Автоматична (рекомендовано)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7bit ascii (US-ASCII)"
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "Західноєвропейська (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "Західноєвропейська (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "Цнтральноєвропейська (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Балтійська (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Балтійська (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "Грецька (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "Грецька (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "Кирилиця (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "Турецька (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "Кирилиця (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "Кирилиця (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "Кирилиця (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "Кирилиця (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "Японська (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "Японська (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "Японська (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "Спрощена китайська (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "Спрощена китайська (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "Традиційна китайська (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "Традиційна китайська (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "Китайська (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "Корейська (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "Тайська (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "Тайська (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "Якщо включено `Автоматична', буде обрано оптимальне\n"
+#~ "кодування для діючої locale."
+
+#~ msgid "Transfer encoding"
+#~ msgstr "Кодування пересилки"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr ""
+#~ "Вкажіть Content-Transfer-Encoding для вживання,\n"
+#~ "якщо тіло листа містить не-ASCII символи."
+
+#~ msgid "Signature separator"
+#~ msgstr "Розділювач підпису"
+
+#~ msgid "Insert automatically"
+#~ msgstr "Вставити автоматично"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "Автоматично запускати зовнішній редактор"
+
+#~ msgid "Undo level"
+#~ msgstr "Рівень Undo"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "Згортати рядки листів після"
+
+#~ msgid "characters"
+#~ msgstr "символів"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "Згортати цитування"
+
+#~ msgid "Wrap on input"
+#~ msgstr "Згорнути при вводі"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "Згортати перед відсиланням"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "Автоматично вибирати запис для відповідей"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "Цитувати лист при відповіді"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "Кнопка відповіді запускає відповідь конференції"
+
+#~ msgid "Reply format"
+#~ msgstr "Формат відповіді"
+
+#~ msgid "Quotation mark"
+#~ msgstr "Знак цитати"
+
+#~ msgid "Forward format"
+#~ msgstr "Формат пересилання"
+
+#~ msgid " Description of symbols "
+#~ msgstr " Опис символів "
+
+#~ msgid "Font"
+#~ msgstr "Шрифт"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "Перекладати назви полів заголовка (як `From:', `Subject:')"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "Показувати кількість непрочитаного після назви папки"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "Скорочувати назви конференцій, довші ніж"
+
+#~ msgid "letters"
+#~ msgstr "літер"
+
+#~ msgid "Summary View"
+#~ msgstr "Список повідомлень"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "Показувати отримувача в колонці `Від', якщо відправник - Ви"
+
+#~ msgid "Expand threads"
+#~ msgstr "Розгортати обговорення"
+
+#~ msgid "Date format"
+#~ msgstr "Формат дати"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " Показувати наступні поля... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "Дозволити розфарбування листів"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "Відображати 2-байтний алфавіт і числа\n"
+#~ "однобайтним символом (для японської мови)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "Показувати панель заголовка над листом"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "Показувати скорочені заголовки при перегляді листів"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "Показувати скорочені заголовки при перегляді листів"
+
+#~ msgid "Line space"
+#~ msgstr "Міжрядковий інтервал"
+
+#~ msgid "pixel(s)"
+#~ msgstr "пікселів"
+
+#~ msgid "Scroll"
+#~ msgstr "Прокрутка"
+
+#~ msgid "Half page"
+#~ msgstr "Півсторінки"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "Плавна прокрутка"
+
+#~ msgid "Step"
+#~ msgstr "Крок"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "Масштабувати приєднані картинки відповідно до вікна"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "Налаштування відображення заголовка"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "Виконати команду"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "Виконати команду"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "папка:"
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "Фільтрувати листи при отриманні"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(Тут складаємо невідфільтровані листи)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "Автоматично перевіряти підписи"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Показувати результат перевірки підпису у спливаючому вікні"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "Тимчасово зберігати пароль в пам'яті"
+
+#~ msgid "Expired after"
+#~ msgstr "Недійсний після"
+
+#~ msgid "minute(s) "
+#~ msgstr "хвилин "
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr ""
+#~ "(Присвоєння '0' зберігає пароль протягом\n"
+#~ " всієї сесії)"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "Захопити ввід при введенні паролю"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "Попереджати при запуску, якщо GnuPG не працює"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "Завжди відкривати листи у списку при виділенні"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "Відкривати перший непрочитаний лист, входячи в папку"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "Позначати як прочитаний тільки лист, відкритий у новому вікні"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "Переходити у папку `Вхідні', отримавши нову пошту"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "Виконувати негайно після видалення чи переміщення листів"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr ""
+#~ "(Листи буде позначено до виконання,\n"
+#~ " якщо це вимкнути)"
+
+#~ msgid "Receive dialog"
+#~ msgstr "Діалог отримання"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "Показувати діалог отримання"
+
+#~ msgid "Always"
+#~ msgstr "Завжди"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "Тільки при ручному отриманні"
+
+#~ msgid "Never"
+#~ msgstr "Ніколи"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "Не видавати діалог при помилці отримання"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "Закрити діалог отримання після завершення"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " Встановити гарячі клавіші... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "Зовнішні команди (%s буде замінено на ім'я файлу / URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "Web-браузер"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "Додати адресу до призначення, коли клацнути двічі"
+
+#~ msgid "On exit"
+#~ msgstr "При виході"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "Підтвердити при виході"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "При виході очищати кошик"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "Питати перед очищенням"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "Попереджати, якщо є листи в черзі"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "Пишемо кеш списка (%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Таймаут сокета вводу/виводу"
+
+#~ msgid "second(s)"
+#~ msgstr "секунд"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "повна скорочена назва дня тижня"
+
+#~ msgid "the full weekday name"
+#~ msgstr "повна назва дня тижня"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "скорочена назва місяця"
+
+#~ msgid "the full month name"
+#~ msgstr "повна назва місяця"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "бажана дата і час для поточної locale"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "номер сторіччя (рік/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "день місяця як десяткове число"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "година як десяткове число за 24-годинним циферблатом"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "година як десяткове число за 12-годинним циферблатом"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "день року як десяткове число"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "місяць як десяткове число"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "хвилини як десяткове число"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM чи PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "секунди як десяткове число"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "день тижня як десяткове число"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "бажана дата для поточної locale"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "останні дві цифри року"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "рік як десяткове число"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "часова зона або ім'я або скорочення"
+
+#~ msgid "Specifier"
+#~ msgstr "Специфікатор"
+
+#~ msgid "Description"
+#~ msgstr "Опис"
+
+#~ msgid "Example"
+#~ msgstr "Приклад"
+
+#~ msgid "Set message colors"
+#~ msgstr "Встановити кольори листа"
+
+#~ msgid "Colors"
+#~ msgstr "Кольори"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "Цитований текст - перший рівень"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "Цитований текст - другий рівень"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "Цитований текст - третій рівень"
+
+#~ msgid "URI link"
+#~ msgstr "URI link"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "Повторно використати кольори цитування"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "Обрати колір для цитування рівня 1"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "Обрати колір для цитування рівня 2"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "Обрати колір для цитування рівня 3"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "Обрати колір для URI"
+
+#~ msgid "Description of symbols"
+#~ msgstr "Опис символів"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "якщо встановлено x, показує expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "Тіло повідомлення\n"
+#~ "Тіло цитованого повідомлення\n"
+#~ "Тіло повідомлення без підпису\n"
+#~ "Тіло цитованого повідомлення без підпису\n"
+#~ "Буквально %"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "Буквальний backslash\n"
+#~ "Буквальний знак запитання\n"
+#~ "Буквальна відкриваюча фігурна дужка\n"
+#~ "Буквальна закриваюча фігурна дужка"
+
+#~ msgid "Key bindings"
+#~ msgstr "Гарячі клавіші"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "Оберіть попереднє значення гарячих клавіш.\n"
+#~ "Ви також можете змінити кожен shortcut меню, натиснувши\n"
+#~ "будь-яку(і) клавішу(і), тримаючи вказівник миші на пункті."
+
+#~ msgid "Default"
+#~ msgstr "По замовчуванню"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "Старий Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "Вибір шрифта"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b93a1044..122f0f78 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: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+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"
@@ -16,13 +16,396 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "正在读取所有帐号的配置...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "无法写入配置文件\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "到 %s 的 IMAP4 连接已断开。正在重新连接...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP4 服务器目录"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "无法启动 TLS 会话。\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "正在发送邮件 (%d / %d 字节)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "正在移动邮件 %s%c%d 到 %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "正在从 %s 获取邮件..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "无法设置删除标志：%s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "无法清除\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "正在从 %s 获取邮件..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "无法设置删除标志：1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "无法关闭文件夹\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "根文件夹 %s 不存在\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "获取列表时发生错误。\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "无法创建“%s”\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "无法在收件箱中创建“%s”\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "无法创建邮箱：LIST 失败\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "无法创建邮箱\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "无法将邮箱 %s 重命名为 %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "无法删除邮箱\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "无法获取信封\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "正在发送邮件 (%d / %d 字节)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "获取信封时发生错误。\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "无法解析信封：%s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "无法连接到IMAP4服务器：%s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "无法连接到IMAP4服务器：%s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "无法获得名字空间\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "无法选择文件夹：%s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 验证失败。\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 登录失败。\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "无法把 %s 添加到 %s\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "(正在发送文件...)"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "无法追加邮件到 %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "无法将 %s 复制到 %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "执行IMAP命令时发生错误：CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "iconv 无法转换 UTF-7 到 %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "iconv 无法转换 %s 到 UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "无法复制邮件 %s 到 %s\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "无法打开标记文件。\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "源文件夹与目的文件夹是同一个。\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr "目录 %s 的最后一个序号 = %d\n"
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"文件“%s”已存在。\n"
+"无法创建文件件。"
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "正在创建到 %s:%d 的NNTP连接...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "到 %s:%d 的NNTP连接已断开。正在重新连接...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr "文章 %d 已被缓存。\n"
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr "正在下载文章 %d...\n"
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "无法读取文章 %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "无法获取新闻组列表\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "无法发表文章。\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "无法获取文章 %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "无法选择组：%s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "无效的文章范围：%d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "没有新文章。\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr "正在获取 %3$s 里的 xover %1$d - %2$d...\n"
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "无法获取 xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "获取 xover 时发生错误。\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "无效的 xover 行：%s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "无法获取 xhdr\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "获取 xhdr 时发生错误。\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "无法连接到NNTP服务器：%s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "协议错误：%s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "协议错误\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "发表文章时发生错误\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "发送命令时发生错误\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "在问候信息中没有发现需要的APOP时戳\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "在问候信息中时间戳语法错误\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 协议错误\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "无效的 UIDL 回应：%s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: 正在删除过期邮件 %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3：跳过邮件 %d (%d 字节)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "信箱被锁住了\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "会话超时\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "无法启动 TLS 会话\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "验证时发生错误\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "不支持的命令\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "POP3 会话发生错误\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -32,6 +415,53 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "文件夹："
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content()：代码转换失败。\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "无法打开标记文件\n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "无法获取邮件 %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "无法得到文本分块\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "打印命令行无效：“%s”\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "下载数据时发生错误。\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "无法写入文件。\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "SMTP验证不可用\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "错误的 SMTP 回应\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "SMTP 会话发生错误\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "SSLv23不可用\n"
@@ -161,78 +591,6 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "正在读取所有帐号的配置...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"一些撰写窗口已打开。\n"
-"在编辑帐号前，请关闭所有的撰写窗口。"
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "正在打开帐号编辑窗口...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "正在创建帐号编辑窗口...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "编辑帐号"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
-"时会检查新邮件。"
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "名称"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "协议"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "服务器"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "编辑"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr " 设为默认帐号 "
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "您真的要删除该帐号吗？"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "无标题"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "删除帐号"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -332,6 +690,14 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "名称"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -346,8 +712,8 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/文件(_F)"
 
@@ -368,9 +734,9 @@ msgid "/_File/New _Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
@@ -386,7 +752,7 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
@@ -418,8 +784,8 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
@@ -427,13 +793,13 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
@@ -450,17 +816,17 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
@@ -472,7 +838,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "地址簿"
 
@@ -482,14 +848,14 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "删除"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -500,11 +866,11 @@ msgid "Lookup"
 msgstr "查找"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "抄送："
 
@@ -530,7 +896,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -634,7 +1000,7 @@ msgstr "地址簿转换错误"
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "界面"
 
@@ -654,8 +1020,7 @@ msgstr "电子邮件地址"
 msgid "Group"
 msgstr "群组"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "文件夹"
 
@@ -679,15 +1044,15 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "错误"
 
@@ -742,8 +1107,8 @@ msgstr "/添加(_A)..."
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
@@ -783,8 +1148,8 @@ msgstr "/编辑(_E)/撤销(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
@@ -792,7 +1157,7 @@ msgstr "/编辑(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
@@ -804,7 +1169,7 @@ msgstr "/编辑(_E)/粘贴(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
@@ -820,7 +1185,7 @@ msgstr "/编辑(_E)/所有长行折行(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/查看(_V)"
@@ -842,9 +1207,9 @@ msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
@@ -860,7 +1225,7 @@ msgstr "/查看(_V)/标尺(_U)"
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
@@ -871,106 +1236,106 @@ msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
@@ -978,14 +1343,14 @@ msgstr "/工具(_T)/地址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
@@ -1006,10 +1371,6 @@ msgstr "/工具(_T)/PGP 加密(_E)"
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "无法得到文本分块\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
@@ -1086,7 +1447,7 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
@@ -1177,8 +1538,7 @@ msgstr "MIME 类型"
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "发送"
 
@@ -1218,8 +1578,7 @@ msgstr "附件"
 msgid "Attach file"
 msgstr "加入附件"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "签名"
 
@@ -1227,7 +1586,7 @@ msgstr "签名"
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "编辑器"
 
@@ -1423,7 +1782,7 @@ msgstr "修改"
 msgid "Clear"
 msgstr "清除"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "值"
 
@@ -1456,7 +1815,6 @@ msgid " Check File "
 msgstr " 检查文件 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "文件"
 
@@ -1512,12 +1870,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -1534,7 +1892,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr " ... "
 
@@ -1598,7 +1956,7 @@ msgstr "超时(秒)"
 msgid "Maximum Entries"
 msgstr "最大项数"
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "基本"
 
@@ -1655,7 +2013,6 @@ msgid "Exporting file:"
 msgstr "导出文件："
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr " 选择... "
 
@@ -1679,161 +2036,161 @@ msgstr "覆盖已存在的文件？"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/创建新文件夹(_N)..."
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/删除文件夹(_D)"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/清空废件箱(_T)"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/重建文件夹树(_E)"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/查找邮件(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/下载(_L)"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/订阅新闻组(_B)..."
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/删除新闻组(_R)"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "正在创建文件夹视图...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "正在设置文件夹信息...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "文件夹树将重建。继续吗？"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "正在重建文件夹树..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1843,21 +2200,21 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1868,21 +2225,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1891,34 +2248,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -1979,7 +2336,7 @@ msgstr "已接收 %d 个新闻组(已读取 %s)"
 msgid "Newsgroups:"
 msgstr "新闻组："
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "标题："
 
@@ -2003,160 +2360,6 @@ msgstr "正在创建图像视图...\n"
 msgid "Can't load the image."
 msgstr "无法加载该图像。"
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "到 %s 的 IMAP4 连接已断开。正在重新连接...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP4 服务器目录"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "无法启动 TLS 会话。\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "无法设置删除标志：%s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "无法清除\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "无法设置删除标志：1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "无法关闭文件夹\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "根文件夹 %s 不存在\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "获取列表时发生错误。\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "无法创建“%s”\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "无法在收件箱中创建“%s”\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "无法创建邮箱：LIST 失败\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "无法创建邮箱\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "无法将邮箱 %s 重命名为 %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "无法删除邮箱\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "无法获取信封\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "获取信封时发生错误。\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "无法解析信封：%s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "无法连接到IMAP4服务器：%s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "无法连接到IMAP4服务器：%s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "无法获得名字空间\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "无法选择文件夹：%s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 验证失败。\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 登录失败。\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "无法把 %s 添加到 %s\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "(正在发送文件...)"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "无法追加邮件到 %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "无法将 %s 复制到 %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "执行IMAP命令时发生错误：CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv 无法转换 UTF-7 到 %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv 无法转换 %s 到 UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "导入"
@@ -2254,7 +2457,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "下一个"
 
@@ -2270,143 +2473,143 @@ msgstr "属性"
 msgid "Finish"
 msgstr "完成"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2415,28 +2618,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2445,11 +2648,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2458,15 +2661,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -2484,29 +2687,20 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"文件“%s”已存在。\n"
-"无法创建文件件。"
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 不支持 g_thread。\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2515,23 +2709,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开撰写窗口并添加指定的附件"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [文件夹]...   显示邮件总数"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2539,24 +2733,24 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2570,19 +2764,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "队列中的邮件"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2591,15 +2785,15 @@ msgstr ""
 "已禁用 OpenPGP 支持。"
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:808
+#: src/main.c:821
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2607,622 +2801,622 @@ msgstr ""
 "发现以前版本的配置。\n"
 "您要迁移吗？"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/文件(_F)/文件夹(_F)"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/文件(_F)/文件夹(_F)/新建文件夹(_N)..."
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/文件(_F)/文件夹(_F)/删除文件夹(_D)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/文件(_F)/邮箱(_M)"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/文件(_F)/邮箱(_M)/添加邮箱(_M)..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/文件(_F)/邮箱(_M)/删除邮箱(_R)..."
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/文件(_F)/邮箱(_M)/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/文件(_F)/邮箱(_M)/检查新邮件(_C)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/文件(_F)/邮箱(_M)/检查所有邮箱的新邮件(_A)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/文件(_F)/邮箱(_M)/重建文件夹树(_E)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox文件(_I)..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/导出到mbox文件(_E)..."
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/文件(_F)/清空废件箱(_T)"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/离线工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_X)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在当前邮件中查找(_F)..."
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/编辑(_E)/查找邮件(_S)..."
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_D)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_D)/文件夹树(_F)"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_D)/邮件视图(_M)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标和文字(_A)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/文字(_T)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/无(_N)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_M)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/查看/排序(_S)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按序号(_N)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_I)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/查看(_V)/排序(_S)/按发件人(_F)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/查看(_V)/排序(_S)/按收件人(_R)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/查看(_V)/排序(_S)/按主题(_S)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标注(_C)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_M)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/查看(_V)/排序(_S)/按未读(_U)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_T)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题集中(_A)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/收缩所有线索(_L)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/查看(_V)/设置显示项(_I)..."
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一个邮件(_P)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一个邮件(_N)"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一个未读邮件(_R)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一个未读邮件(_E)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/上一个新邮件(_W)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一个新邮件(_X)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/转到(_G)/上一个标记的邮件(_M)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/转到(_G)/下一个标记的邮件(_A)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/转到(_G)/上一个用颜色标注的邮件(_L)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/查看(_V)/显示所有邮件头(_H)"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/接收(_V)/取消(_G)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/标记(_M)"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/取消标记(_U)"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/记录窗口(_L)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3231,16 +3425,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3249,150 +3443,149 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "设置为默认帐号"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
@@ -3510,32 +3703,32 @@ msgstr "已查找到邮件结尾；从开头继续？"
 msgid "Search finished"
 msgstr "搜索结束"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "文本"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "附件"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3544,7 +3737,7 @@ msgstr ""
 "输入打印命令行：\n"
 "(“%s”将被替换为文件名)"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3553,41 +3746,6 @@ msgstr ""
 "打印命令行无效：\n"
 "“%s”"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "无法复制邮件 %s 到 %s\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "无法打开标记文件。\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "源文件夹与目的文件夹是同一个。\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "目录 %s 的最后一个序号 = %d\n"
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/打开(_O)"
@@ -3671,115 +3829,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME察看器命令行无效：“%s”"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "正在创建到 %s:%d 的NNTP连接...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "到 %s:%d 的NNTP连接已断开。正在重新连接...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr "文章 %d 已被缓存。\n"
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr "正在下载文章 %d...\n"
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "无法读取文章 %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "无法获取新闻组列表\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "无法发表文章。\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "无法获取文章 %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "无法选择组：%s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "无效的文章范围：%d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "没有新文章。\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr "正在获取 %3$s 里的 xover %1$d - %2$d...\n"
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "无法获取 xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "获取 xover 时发生错误。\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "无效的 xover 行：%s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "无法获取 xhdr\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "获取 xhdr 时发生错误。\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "无法连接到NNTP服务器：%s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "协议错误：%s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "协议错误\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "发表文章时发生错误\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "发送命令时发生错误\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "口令串"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[没有用户标识]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3792,7 +3850,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3800,450 +3858,6 @@ msgstr ""
 "错误的口令串！重试...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "在问候信息中没有发现需要的APOP时戳\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "在问候信息中时间戳语法错误\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 协议错误\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "无效的 UIDL 回应：%s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: 正在删除过期邮件 %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3：跳过邮件 %d (%d 字节)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "信箱被锁住了\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "会话超时\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "无法启动 TLS 会话\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "验证时发生错误\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "不支持的命令\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "POP3 会话发生错误\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "正在打开帐号首选项窗口...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "帐号%d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "新帐号的首选项"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "帐号首选项"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "正在创建帐号首选项窗口...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "接收"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "隐私"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr "SSL"
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "高级"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "帐号名称"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "设置为默认帐号"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "个人资料"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "全名"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "邮件地址"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "组织"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "服务器资料"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "新闻组 (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "无(本地)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "该服务器需要验证"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "新闻组服务器"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "接收服务器"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "SMTP服务器(发送)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "用户名"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "密码"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "使用安全验证 (APOP)"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "收到邮件后从服务器上删除"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "以后删除"
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "天"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(0 天：立即删除)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "下载服务器上的所有邮件"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "接收大小限制"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "在接收邮件时进行过滤"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "默认收件箱"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "(没有过滤的邮件会保存在该文件夹中)"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "验证方法"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "自动"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "新闻"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"下载文章的最大数量\n"
-"(指定 0 表示无限制)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "没有指定收件人。"
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "“全部接收”时检查该帐号的新邮件"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "邮件头"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "添加日期头域"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "生成邮件标识"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "添加用户定义的头域"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr " 编辑... "
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "验证"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP验证(SMTP AUTH)"
-
-#: src/prefs_account.c:1351
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr "如果您不填这些项，将使用和接收邮件相同的用户名和口令。"
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "发送前用POP3验证"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "命令输出"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "自动设置以下地址"
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "抄送"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "密件抄送"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "回复至"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "默认对邮件签名"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "默认对邮件加密"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "使用 ASCII 包裹格式进行加密"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "使用明文签名"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "签名密钥"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "使用默认的GnuPG密钥"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "按照邮件地址选择密钥"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "手工指定密钥"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "用户或者密钥ID："
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "不使用SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "使用SSL连接POP3服务器"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "使用STARTTLS命令开始SSL会话"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "使用SSL连接IMAP4服务器"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr "NNTP"
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "使用SSL连接NNTP服务器"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "发送(SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "使用SSL连接SMTP服务器"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "使用非阻塞式SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "(如果您遇到SSL连接问题，请关闭该选项)"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "指定SMTP端口"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "指定POP3端口"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "指定IMAP4端口"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "指定NNTP端口"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "指定域名"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP4 服务器目录"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "将已发出的邮件保存于"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "将邮件草稿保存于"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "将删除的邮件保存于"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "没有输入帐号名称。"
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "没有输入邮件地址。"
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "没有输入SMTP服务器。"
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "没有输入用户标识。"
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "没有输入POP3服务器。"
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "没有输入IMAP4服务器。"
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "没有输入NNTP服务器。"
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"不推荐使用旧式的 ASCII 包裹模式加密邮件。它不遵从 RFC\n"
-"3156 - OpenGPG MIME 安全。"
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "动作配置"
@@ -4308,17 +3922,17 @@ msgstr " 语法帮助 "
 msgid "Registered actions"
 msgstr "已注册的动作"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "上移"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "下移"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "(新建)"
 
@@ -4361,822 +3975,31 @@ msgstr "删除动作"
 msgid "Do you really want to delete this action?"
 msgstr "您真的要删除该动作吗？"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "文件夹："
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "正在创建通用首选项窗口...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "通用首选项"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "引文"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "显示"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "邮件"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "其它"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "使用外部程序合并邮件"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "命令"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "从邮件池合并邮件"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "合并邮件时进行过滤"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "邮件池路径"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "自动检查新邮件"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "每"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "分钟"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "启动时检查新邮件"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "合并邮件后更新所有的本地文件夹"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "当移动或删除邮件时立即执行"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "正在获取新邮件数量(STAT)..."
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "使用外部程序发送"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "将已发出的邮件保存在发件箱"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-msgid "Outgoing encoding"
-msgstr "发送时使用的字符编码"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "自动 (建议使用)"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7位 ASCII (US-ASCII) "
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "西欧 (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "西欧 (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "中欧 (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "波罗的语 (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "波罗的语 (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "希腊语 (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "希腊语 (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "斯拉夫语 (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "土耳其语 (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "斯拉夫语 (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "斯拉夫语 (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "斯拉夫语 (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "斯拉夫语 (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "日语 (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "日语 (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "日语 (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "简体中文 (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "简体中文 (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "繁体中文 (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "繁体中文 (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "中文 (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "朝鲜文 (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "泰文 (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "泰文 (Windows-874)"
-
-#: src/prefs_common.c:1280
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "传输编码"
-
-#: src/prefs_common.c:1306
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr "指定当邮件内容包含非 ASCII 字符时使用的 Content-Transfer-Encoding。"
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "签名分隔符"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "自动插入"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "自动启动外部编辑器"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "撤销次数"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "邮件折行于第"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "个字符"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "引文折行"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "输入时折行"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "发送前折行"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "自动选择回复用的帐号"
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "回复时引用原文"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "回复按钮会回复到邮件列表"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "回复格式"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "引文符号"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "转发格式"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr " 符号描述 "
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "字体"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "翻译邮件头名(如“发件人：”、“主题：”)"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "在文件夹名后显示未读邮件的数量"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "缩写新闻组长于"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "信件"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "摘要视图"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "展开线索"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "日期格式"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr " 设置摘要中显示的项... "
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "启用邮件的颜色表示"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr ""
-"用单字节字符显示多字节字母和数字\n"
-"(仅适用于日语)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "在邮件视图之上显示邮件头面板"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "在邮件视图中显示简短的邮件头"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr "将HTML内容显示为文本"
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "在邮件视图中显示简短的邮件头"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "邮件内容行间距"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "个像素"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "滚动"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "半页滚动"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "平滑滚动"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "每次滚动"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr "图像"
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "将附件中的图像缩放至适合窗口大小"
-
-#: src/prefs_common.c:1924
-msgid "Display images as inline"
-msgstr "嵌入显示图像"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "执行命令"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "执行命令"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "文件夹："
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "在接收邮件时进行过滤"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "(没有过滤的邮件会保存在该文件夹中)"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "自动检查签名"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "在弹出窗口中显示签名检查结果"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "将口令串临时存放在内存中"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "过期时间"
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "分钟后"
-
-#: src/prefs_common.c:2137
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "设置为“0”将在整个会话过程中储存口令串"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "输入口令串时捕获输入(更安全)"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "如果 GnuPG 无法工作，在启动时显示警告"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "在摘要窗口中选择邮件时打开邮件"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "进入文件夹时打开第一个未读的邮件"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "仅在新窗口中打开邮件时标记邮件为已读"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "收到新邮件时转到收件箱"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "当移动或删除邮件时立即执行"
-
-#: src/prefs_common.c:2236
-msgid "Messages will be marked until execution if this is turned off."
-msgstr "如果该选项关闭，标记邮件直到完成执行。"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "收对话框"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "显示接收对话框"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "总是"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "仅在手工接收时"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "从不"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "在接收错误时不弹出错误对话框"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "完成后关闭接收对话框"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr " 设置键盘关联... "
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "外部命令 (%s 将被替换为文件名或URI)"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "网页浏览器"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "双击时将地址添加为收件人"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "退出程序时"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "退出时进行确认"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "退出时清空废件箱"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "在清空前询问"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "如果队列中有邮件就发出警告"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "正在写摘要缓存(%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "套接字 I/O 超时："
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "秒"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "缩写的星期名"
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "完整的星期名"
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "缩写的月份名"
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "完整的月份名"
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "当前区域设置首选的日期和时间格式"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "世纪(年份/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "十进制表示的月中的天数"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "24小时时钟的十进制小时"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "12小时时钟的十进制小时"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "十进制表示的一年中的天数"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "十进制表示的月份"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "十进制表示的天数"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "AM或PM"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "十进制表示的秒"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "十进制表示的星期中的天数"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "当前区域设置的首选日期格式"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "年份的最后两个数字"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "十进制的年份"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "时区、名字或缩写"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "说明符"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "描述"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "示例"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "设置邮件颜色"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "颜色"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "引文－第一级"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "引文－第二级"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "引文－第三级"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "URI 链接"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "循环使用引文颜色"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "选择引文级别 1 的颜色"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "选择引文级别 2 的颜色"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "选择引文级别 3 的颜色"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "选择URI的颜色"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "符号的描述"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"日期\n"
-"发件人\n"
-"发信人的全名\n"
-"发信人的名\n"
-"发信人的姓\n"
-"主题\n"
-"收件人\n"
-"抄送\n"
-"新闻组\n"
-"邮件标识号"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "如果 x 设置了值则显示 expr"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"邮件内容\n"
-"引用的邮件内容\n"
-"没有签名的邮件内容\n"
-"没有签名的引文内容\n"
-"%"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"反斜线\n"
-"问号\n"
-"左括号\n"
-"右括号"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "键盘关联"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"选择预置的键关联。\n"
-"您也可以将鼠标放在菜单项上并按下任何键\n"
-"(或组合键)来修改菜单快捷键。"
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "默认"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "旧式的Sylpheed"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "自定义邮件头设置"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "邮件头"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr " 删除 "
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "自定义邮件头"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "没有设置邮件头名。"
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "删除邮件头"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "您确实想删除该邮件头吗？"
 
@@ -5224,12 +4047,21 @@ msgstr "过滤设定"
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "编辑"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "您确实要删除该规则吗？"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "无标题"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "删除规则"
 
@@ -5313,6 +4145,10 @@ msgstr "长于"
 msgid "is shorter than"
 msgstr "短于"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr "KB"
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "移到"
@@ -5435,6 +4271,10 @@ msgstr "回复时删除主题前的 [...] 或 (...)"
 msgid "Apply to subfolders"
 msgstr "应用到子文件夹"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "自动设置以下地址"
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "回复时也使用"
@@ -5508,64 +4348,46 @@ msgstr "显示的项目"
 msgid " Revert to default "
 msgstr " 还原为默认值 "
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "模板名"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "注册"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr " 替换 "
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " 符号 "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "已注册的模板"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "模板"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "模板"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "模板格式错误。"
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "删除模板"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "您确实要删除该模板吗？"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content()：代码转换失败。\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "无法打开标记文件\n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "无法获取邮件 %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "打印命令行无效：“%s”\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr "正在创建进度对话框...\n"
@@ -5574,29 +4396,21 @@ msgstr "正在创建进度对话框...\n"
 msgid "Status"
 msgstr "状态"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "下载数据时发生错误。\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "无法写入文件。\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "无法为该密钥找到用户标识。"
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\t也就是“%s”\n"
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "签名创建于 %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "验证签名时发生错误"
 
@@ -5622,6 +4436,10 @@ msgstr "密钥标识"
 msgid "Val"
 msgstr "值"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "其它"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "添加密钥"
@@ -5646,84 +4464,84 @@ msgstr ""
 "的人那里。\n"
 "您仍然要使用它吗？"
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "队列中的邮件的邮件头头损坏。\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "无法执行外部命令：%s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "发送命令时发生错误\n"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "正在连接SMTP服务器：%s ..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "正在发送 HELO..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "正在验证"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "正在发送 EHLO..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "正在发送 MAIL FROM..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "正在发送"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "正在发送 RCPT TO..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "正在发送 DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "发送邮件时发生错误。"
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5822,32 +4640,20 @@ msgstr "签名错误"
 msgid "No public key to verify the signature"
 msgstr "没有公钥来验证签名"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "SMTP验证不可用\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "错误的 SMTP 回应\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "SMTP 会话发生错误\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "正在创建原文窗口...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "邮件原文"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "正在显示 %s 的原文...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s－原文"
@@ -6242,6 +5048,909 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "一些撰写窗口已打开。\n"
+#~ "在编辑帐号前，请关闭所有的撰写窗口。"
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "正在打开帐号编辑窗口...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "正在创建帐号编辑窗口...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "编辑帐号"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
+#~ "时会检查新邮件。"
+
+#~ msgid "Protocol"
+#~ msgstr "协议"
+
+#~ msgid "Server"
+#~ msgstr "服务器"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr " 设为默认帐号 "
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "您真的要删除该帐号吗？"
+
+#~ msgid "Delete account"
+#~ msgstr "删除帐号"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "正在打开帐号首选项窗口...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "帐号%d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "新帐号的首选项"
+
+#~ msgid "Account preferences"
+#~ msgstr "帐号首选项"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "正在创建帐号首选项窗口...\n"
+
+#~ msgid "Receive"
+#~ msgstr "接收"
+
+#~ msgid "Privacy"
+#~ msgstr "隐私"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Advanced"
+#~ msgstr "高级"
+
+#~ msgid "Name of this account"
+#~ msgstr "帐号名称"
+
+#~ msgid "Set as default"
+#~ msgstr "设置为默认帐号"
+
+#~ msgid "Personal information"
+#~ msgstr "个人资料"
+
+#~ msgid "Full name"
+#~ msgstr "全名"
+
+#~ msgid "Mail address"
+#~ msgstr "邮件地址"
+
+#~ msgid "Organization"
+#~ msgstr "组织"
+
+#~ msgid "Server information"
+#~ msgstr "服务器资料"
+
+#~ msgid "POP3"
+#~ msgstr "POP3"
+
+#~ msgid "IMAP4"
+#~ msgstr "IMAP4"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "新闻组 (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "无(本地)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "该服务器需要验证"
+
+#~ msgid "News server"
+#~ msgstr "新闻组服务器"
+
+#~ msgid "Server for receiving"
+#~ msgstr "接收服务器"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "SMTP服务器(发送)"
+
+#~ msgid "User ID"
+#~ msgstr "用户名"
+
+#~ msgid "Password"
+#~ msgstr "密码"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "使用安全验证 (APOP)"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "收到邮件后从服务器上删除"
+
+#~ msgid "Remove after"
+#~ msgstr "以后删除"
+
+#~ msgid "days"
+#~ msgstr "天"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(0 天：立即删除)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "下载服务器上的所有邮件"
+
+#~ msgid "Receive size limit"
+#~ msgstr "接收大小限制"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "在接收邮件时进行过滤"
+
+#~ msgid "Default inbox"
+#~ msgstr "默认收件箱"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "(没有过滤的邮件会保存在该文件夹中)"
+
+#~ msgid "Authentication method"
+#~ msgstr "验证方法"
+
+#~ msgid "Automatic"
+#~ msgstr "自动"
+
+#~ msgid "News"
+#~ msgstr "新闻"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "下载文章的最大数量\n"
+#~ "(指定 0 表示无限制)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "没有指定收件人。"
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "“全部接收”时检查该帐号的新邮件"
+
+#~ msgid "Add Date header field"
+#~ msgstr "添加日期头域"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "生成邮件标识"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "添加用户定义的头域"
+
+#~ msgid " Edit... "
+#~ msgstr " 编辑... "
+
+#~ msgid "Authentication"
+#~ msgstr "验证"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP验证(SMTP AUTH)"
+
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr "如果您不填这些项，将使用和接收邮件相同的用户名和口令。"
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "发送前用POP3验证"
+
+#~ msgid "Command output"
+#~ msgstr "命令输出"
+
+#~ msgid "Cc"
+#~ msgstr "抄送"
+
+#~ msgid "Bcc"
+#~ msgstr "密件抄送"
+
+#~ msgid "Reply-To"
+#~ msgstr "回复至"
+
+#~ msgid "Sign message by default"
+#~ msgstr "默认对邮件签名"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "默认对邮件加密"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "使用 ASCII 包裹格式进行加密"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "使用明文签名"
+
+#~ msgid "Sign key"
+#~ msgstr "签名密钥"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "使用默认的GnuPG密钥"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "按照邮件地址选择密钥"
+
+#~ msgid "Specify key manually"
+#~ msgstr "手工指定密钥"
+
+#~ msgid "User or key ID:"
+#~ msgstr "用户或者密钥ID："
+
+#~ msgid "Don't use SSL"
+#~ msgstr "不使用SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "使用SSL连接POP3服务器"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "使用STARTTLS命令开始SSL会话"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "使用SSL连接IMAP4服务器"
+
+#~ msgid "NNTP"
+#~ msgstr "NNTP"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "使用SSL连接NNTP服务器"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "发送(SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "使用SSL连接SMTP服务器"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "使用非阻塞式SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "(如果您遇到SSL连接问题，请关闭该选项)"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "指定SMTP端口"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "指定POP3端口"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "指定IMAP4端口"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "指定NNTP端口"
+
+#~ msgid "Specify domain name"
+#~ msgstr "指定域名"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP4 服务器目录"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "将已发出的邮件保存于"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "将邮件草稿保存于"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "将删除的邮件保存于"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "没有输入帐号名称。"
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "没有输入邮件地址。"
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "没有输入SMTP服务器。"
+
+#~ msgid "User ID is not entered."
+#~ msgstr "没有输入用户标识。"
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "没有输入POP3服务器。"
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "没有输入IMAP4服务器。"
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "没有输入NNTP服务器。"
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "不推荐使用旧式的 ASCII 包裹模式加密邮件。它不遵从 RFC\n"
+#~ "3156 - OpenGPG MIME 安全。"
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "正在创建通用首选项窗口...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "通用首选项"
+
+#~ msgid "Quote"
+#~ msgstr "引文"
+
+#~ msgid "Display"
+#~ msgstr "显示"
+
+#~ msgid "Message"
+#~ msgstr "邮件"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "使用外部程序合并邮件"
+
+#~ msgid "Command"
+#~ msgstr "命令"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "从邮件池合并邮件"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "合并邮件时进行过滤"
+
+#~ msgid "Spool path"
+#~ msgstr "邮件池路径"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "自动检查新邮件"
+
+#~ msgid "every"
+#~ msgstr "每"
+
+#~ msgid "minute(s)"
+#~ msgstr "分钟"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "启动时检查新邮件"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "合并邮件后更新所有的本地文件夹"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "当移动或删除邮件时立即执行"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "正在获取新邮件数量(STAT)..."
+
+#~ msgid "Use external program for sending"
+#~ msgstr "使用外部程序发送"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "将已发出的邮件保存在发件箱"
+
+#~ msgid "Outgoing encoding"
+#~ msgstr "发送时使用的字符编码"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "自动 (建议使用)"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7位 ASCII (US-ASCII) "
+
+#~ msgid "Unicode (UTF-8)"
+#~ msgstr "Unicode (UTF-8)"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "西欧 (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "西欧 (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "中欧 (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "波罗的语 (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "波罗的语 (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "希腊语 (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "希腊语 (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "斯拉夫语 (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "土耳其语 (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "斯拉夫语 (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "斯拉夫语 (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "斯拉夫语 (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "斯拉夫语 (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "日语 (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "日语 (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "日语 (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "简体中文 (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "简体中文 (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "繁体中文 (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "繁体中文 (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "中文 (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "朝鲜文 (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "泰文 (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "泰文 (Windows-874)"
+
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
+
+#~ msgid "Transfer encoding"
+#~ msgstr "传输编码"
+
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr "指定当邮件内容包含非 ASCII 字符时使用的 Content-Transfer-Encoding。"
+
+#~ msgid "Signature separator"
+#~ msgstr "签名分隔符"
+
+#~ msgid "Insert automatically"
+#~ msgstr "自动插入"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "自动启动外部编辑器"
+
+#~ msgid "Undo level"
+#~ msgstr "撤销次数"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "邮件折行于第"
+
+#~ msgid "characters"
+#~ msgstr "个字符"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "引文折行"
+
+#~ msgid "Wrap on input"
+#~ msgstr "输入时折行"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "发送前折行"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "自动选择回复用的帐号"
+
+#~ msgid "Quote message when replying"
+#~ msgstr "回复时引用原文"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "回复按钮会回复到邮件列表"
+
+#~ msgid "Reply format"
+#~ msgstr "回复格式"
+
+#~ msgid "Quotation mark"
+#~ msgstr "引文符号"
+
+#~ msgid "Forward format"
+#~ msgstr "转发格式"
+
+#~ msgid " Description of symbols "
+#~ msgstr " 符号描述 "
+
+#~ msgid "Font"
+#~ msgstr "字体"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "翻译邮件头名(如“发件人：”、“主题：”)"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "在文件夹名后显示未读邮件的数量"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "缩写新闻组长于"
+
+#~ msgid "letters"
+#~ msgstr "信件"
+
+#~ msgid "Summary View"
+#~ msgstr "摘要视图"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
+
+#~ msgid "Expand threads"
+#~ msgstr "展开线索"
+
+#~ msgid "Date format"
+#~ msgstr "日期格式"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr " 设置摘要中显示的项... "
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "启用邮件的颜色表示"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr ""
+#~ "用单字节字符显示多字节字母和数字\n"
+#~ "(仅适用于日语)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "在邮件视图之上显示邮件头面板"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "在邮件视图中显示简短的邮件头"
+
+#~ msgid "Render HTML messages as text"
+#~ msgstr "将HTML内容显示为文本"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "在邮件视图中显示简短的邮件头"
+
+#~ msgid "Line space"
+#~ msgstr "邮件内容行间距"
+
+#~ msgid "pixel(s)"
+#~ msgstr "个像素"
+
+#~ msgid "Scroll"
+#~ msgstr "滚动"
+
+#~ msgid "Half page"
+#~ msgstr "半页滚动"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "平滑滚动"
+
+#~ msgid "Step"
+#~ msgstr "每次滚动"
+
+#~ msgid "Images"
+#~ msgstr "图像"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "将附件中的图像缩放至适合窗口大小"
+
+#~ msgid "Display images as inline"
+#~ msgstr "嵌入显示图像"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "执行命令"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "执行命令"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "文件夹："
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "在接收邮件时进行过滤"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "(没有过滤的邮件会保存在该文件夹中)"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "自动检查签名"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "在弹出窗口中显示签名检查结果"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "将口令串临时存放在内存中"
+
+#~ msgid "Expired after"
+#~ msgstr "过期时间"
+
+#~ msgid "minute(s) "
+#~ msgstr "分钟后"
+
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "设置为“0”将在整个会话过程中储存口令串"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "输入口令串时捕获输入(更安全)"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "如果 GnuPG 无法工作，在启动时显示警告"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "在摘要窗口中选择邮件时打开邮件"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "进入文件夹时打开第一个未读的邮件"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "仅在新窗口中打开邮件时标记邮件为已读"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "收到新邮件时转到收件箱"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "当移动或删除邮件时立即执行"
+
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr "如果该选项关闭，标记邮件直到完成执行。"
+
+#~ msgid "Receive dialog"
+#~ msgstr "收对话框"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "显示接收对话框"
+
+#~ msgid "Always"
+#~ msgstr "总是"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "仅在手工接收时"
+
+#~ msgid "Never"
+#~ msgstr "从不"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "在接收错误时不弹出错误对话框"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "完成后关闭接收对话框"
+
+#~ msgid " Set key bindings... "
+#~ msgstr " 设置键盘关联... "
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "外部命令 (%s 将被替换为文件名或URI)"
+
+#~ msgid "Web browser"
+#~ msgstr "网页浏览器"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "双击时将地址添加为收件人"
+
+#~ msgid "On exit"
+#~ msgstr "退出程序时"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "退出时进行确认"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "退出时清空废件箱"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "在清空前询问"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "如果队列中有邮件就发出警告"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "正在写摘要缓存(%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "套接字 I/O 超时："
+
+#~ msgid "second(s)"
+#~ msgstr "秒"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "缩写的星期名"
+
+#~ msgid "the full weekday name"
+#~ msgstr "完整的星期名"
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "缩写的月份名"
+
+#~ msgid "the full month name"
+#~ msgstr "完整的月份名"
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "当前区域设置首选的日期和时间格式"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "世纪(年份/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "十进制表示的月中的天数"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "24小时时钟的十进制小时"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "12小时时钟的十进制小时"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "十进制表示的一年中的天数"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "十进制表示的月份"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "十进制表示的天数"
+
+#~ msgid "either AM or PM"
+#~ msgstr "AM或PM"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "十进制表示的秒"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "十进制表示的星期中的天数"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "当前区域设置的首选日期格式"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "年份的最后两个数字"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "十进制的年份"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "时区、名字或缩写"
+
+#~ msgid "Specifier"
+#~ msgstr "说明符"
+
+#~ msgid "Description"
+#~ msgstr "描述"
+
+#~ msgid "Example"
+#~ msgstr "示例"
+
+#~ msgid "Set message colors"
+#~ msgstr "设置邮件颜色"
+
+#~ msgid "Colors"
+#~ msgstr "颜色"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "引文－第一级"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "引文－第二级"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "引文－第三级"
+
+#~ msgid "URI link"
+#~ msgstr "URI 链接"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "循环使用引文颜色"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "选择引文级别 1 的颜色"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "选择引文级别 2 的颜色"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "选择引文级别 3 的颜色"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "选择URI的颜色"
+
+#~ msgid "Description of symbols"
+#~ msgstr "符号的描述"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "日期\n"
+#~ "发件人\n"
+#~ "发信人的全名\n"
+#~ "发信人的名\n"
+#~ "发信人的姓\n"
+#~ "主题\n"
+#~ "收件人\n"
+#~ "抄送\n"
+#~ "新闻组\n"
+#~ "邮件标识号"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "如果 x 设置了值则显示 expr"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "邮件内容\n"
+#~ "引用的邮件内容\n"
+#~ "没有签名的邮件内容\n"
+#~ "没有签名的引文内容\n"
+#~ "%"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "反斜线\n"
+#~ "问号\n"
+#~ "左括号\n"
+#~ "右括号"
+
+#~ msgid "Key bindings"
+#~ msgstr "键盘关联"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "选择预置的键关联。\n"
+#~ "您也可以将鼠标放在菜单项上并按下任何键\n"
+#~ "(或组合键)来修改菜单快捷键。"
+
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "旧式的Sylpheed"
+
 #~ msgid "Font selection"
 #~ msgstr "字体选择"
 
@@ -6598,9 +6307,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "设置 widgets..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "正在移动邮件 %s%c%d 到 %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\t正在标记邮件..."
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index a799cb37..13c921c3 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:17+0900\n"
+"POT-Creation-Date: 2005-09-07 19:48+0900\n"
 "PO-Revision-Date: 2004-12-04 08:24+0800\n"
 "Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -14,13 +14,396 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: src/filter.c:833 src/prefs_account.c:586 src/prefs_account.c:600
-#: src/prefs_customheader.c:383 src/prefs_customheader.c:429
-#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
+#: libsylph/account.c:54
+msgid "Reading all config for each account...\n"
+msgstr "讀取所有帳號的設定中...\n"
+
+#: libsylph/filter.c:871 libsylph/prefs.c:196 libsylph/prefs.c:224
+#: libsylph/prefs.c:269 libsylph/prefs_account.c:211
+#: libsylph/prefs_account.c:225 src/prefs_display_header.c:413
+#: src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "寫入組態設定時失敗。\n"
 
+#: libsylph/imap.c:463
+#, c-format
+msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgstr "到 %s 的 IMAP4 連線被中斷了。重新連線中...\n"
+
+#: libsylph/imap.c:514 libsylph/imap.c:520
+#, fuzzy
+msgid "IMAP4 server disables LOGIN.\n"
+msgstr "IMAP 伺服器目錄"
+
+#: libsylph/imap.c:595
+#, c-format
+msgid "creating IMAP4 connection to %s:%d ...\n"
+msgstr "正在產生 IMAP4 連線到 %s:%d ...\n"
+
+#: libsylph/imap.c:636
+msgid "Can't start TLS session.\n"
+msgstr "無法開啟 TLS 連線\n"
+
+#: libsylph/imap.c:1211
+#, fuzzy, c-format
+msgid "Appending messages to %s (%d / %d)"
+msgstr "送出新郵件 (%d / %d bytes)"
+
+#: libsylph/imap.c:1296
+#, fuzzy, c-format
+msgid "Moving messages %s to %s ..."
+msgstr "移動信件 %s%c%d 到 %s ...\n"
+
+#: libsylph/imap.c:1302
+#, fuzzy, c-format
+msgid "Copying messages %s to %s ..."
+msgstr "移動信件 %s%c%d 到 %s ...\n"
+
+#: libsylph/imap.c:1449
+#, fuzzy, c-format
+msgid "Removing messages %s"
+msgstr "從 %s 中取得郵件中..."
+
+#: libsylph/imap.c:1455
+#, c-format
+msgid "can't set deleted flags: %s\n"
+msgstr "無法設定刪除的旗標：%s\n"
+
+#: libsylph/imap.c:1463 libsylph/imap.c:1558
+msgid "can't expunge\n"
+msgstr "無法刪除\n"
+
+#: libsylph/imap.c:1546
+#, fuzzy, c-format
+msgid "Removing all messages in %s"
+msgstr "從 %s 中取得郵件中..."
+
+#: libsylph/imap.c:1552
+msgid "can't set deleted flags: 1:*\n"
+msgstr "無法設定刪除的旗標：1:*\n"
+
+#: libsylph/imap.c:1597
+msgid "can't close folder\n"
+msgstr "無法選擇資料夾\n"
+
+#: libsylph/imap.c:1675
+#, c-format
+msgid "root folder %s not exist\n"
+msgstr "根資料夾 %s 不存在。\n"
+
+#: libsylph/imap.c:1859 libsylph/imap.c:1867
+msgid "error occurred while getting LIST.\n"
+msgstr "取得 LIST 時發生錯誤。\n"
+
+#: libsylph/imap.c:1981
+#, c-format
+msgid "Can't create '%s'\n"
+msgstr "無法產生 %s\n"
+
+#: libsylph/imap.c:1986
+#, c-format
+msgid "Can't create '%s' under INBOX\n"
+msgstr "無法在收件夾下產生 %s\n"
+
+#: libsylph/imap.c:2047
+msgid "can't create mailbox: LIST failed\n"
+msgstr "無法產生信箱：LIST 失敗\n"
+
+#: libsylph/imap.c:2067
+msgid "can't create mailbox\n"
+msgstr "無法產生信箱\n"
+
+#: libsylph/imap.c:2163
+#, c-format
+msgid "can't rename mailbox: %s to %s\n"
+msgstr "信箱 %s 無法更名為 %s\n"
+
+#: libsylph/imap.c:2243
+msgid "can't delete mailbox\n"
+msgstr "無法刪除信箱\n"
+
+#: libsylph/imap.c:2287
+msgid "can't get envelope\n"
+msgstr "無法取得信封。\n"
+
+#: libsylph/imap.c:2300
+#, fuzzy, c-format
+msgid "Getting message headers (%d / %d)"
+msgstr "送出新郵件 (%d / %d bytes)"
+
+#: libsylph/imap.c:2309
+msgid "error occurred while getting envelope.\n"
+msgstr "取得信封時發生錯誤。\n"
+
+#: libsylph/imap.c:2330
+#, c-format
+msgid "can't parse envelope: %s\n"
+msgstr "無法解析信封：%s\n"
+
+#: libsylph/imap.c:2453
+#, c-format
+msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
+
+#: libsylph/imap.c:2460
+#, c-format
+msgid "Can't establish IMAP4 session with: %s:%d\n"
+msgstr "無法產生 IMAP4 連線：%s:%d\n"
+
+#: libsylph/imap.c:2535
+msgid "can't get namespace\n"
+msgstr "無法取得信封。\n"
+
+#: libsylph/imap.c:3063
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr "無法選擇資料夾：%s\n"
+
+#: libsylph/imap.c:3239
+msgid "IMAP4 authentication failed.\n"
+msgstr "IMAP4 認證失敗\n"
+
+#: libsylph/imap.c:3256
+msgid "IMAP4 login failed.\n"
+msgstr "IMAP4 登入失敗。\n"
+
+#: libsylph/imap.c:3586
+#, c-format
+msgid "can't append %s to %s\n"
+msgstr "無法將信件從 %s 搬移到 %s。\n"
+
+#: libsylph/imap.c:3593
+msgid "(sending file...)"
+msgstr "（送出檔案 ...）"
+
+#: libsylph/imap.c:3621
+#, c-format
+msgid "can't append message to %s\n"
+msgstr "無法附加訊息到 %s\n"
+
+#: libsylph/imap.c:3653
+#, c-format
+msgid "can't copy %s to %s\n"
+msgstr "無法將信件 %s 移到 %s\n"
+
+#: libsylph/imap.c:3677
+#, c-format
+msgid "error while imap command: STORE %s %s\n"
+msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
+
+#: libsylph/imap.c:3691
+msgid "error while imap command: EXPUNGE\n"
+msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
+
+#: libsylph/imap.c:3704
+msgid "error while imap command: CLOSE\n"
+msgstr "imap 發生錯誤，命令為： CLOSE\n"
+
+#: libsylph/imap.c:3937
+#, c-format
+msgid "iconv cannot convert UTF-7 to %s\n"
+msgstr "無法將 UTF-7 轉換為 %s\n"
+
+#: libsylph/imap.c:3967
+#, c-format
+msgid "iconv cannot convert %s to UTF-7\n"
+msgstr "無法轉換 %s 為 UTF-7\n"
+
+#: libsylph/mh.c:412
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "無法將信件從 %s 搬移到 %s。\n"
+
+#: libsylph/mh.c:486 libsylph/mh.c:607
+msgid "Can't open mark file.\n"
+msgstr "無法開啟標記的檔案。\n"
+
+#: libsylph/mh.c:493 libsylph/mh.c:613
+msgid "the src folder is identical to the dest.\n"
+msgstr "來源與目的資料夾相同。\n"
+
+#: libsylph/mh.c:616
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr ""
+
+#: libsylph/mh.c:783
+#, c-format
+msgid "Last number in dir %s = %d\n"
+msgstr ""
+
+#: libsylph/mh.c:826 src/main.c:138
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Can't create folder."
+msgstr ""
+"檔案 `%s' 已存在。\n"
+"無法產生資料夾。"
+
+#: libsylph/mh.c:1321
+#, c-format
+msgid ""
+"Directory name\n"
+"'%s' is not a valid UTF-8 string.\n"
+"Maybe the locale encoding is used for filename.\n"
+"If that is the case, you must set the following environmental variable\n"
+"(see README for detail):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+msgstr ""
+
+#: libsylph/news.c:207
+#, c-format
+msgid "creating NNTP connection to %s:%d ...\n"
+msgstr "產生新聞通訊協定連線到 %s:%d , 請稍候...\n"
+
+#: libsylph/news.c:276
+#, c-format
+msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
+msgstr "到 %s:%d 的新聞通訊協定連線被中斷了。重新連線中...\n"
+
+#: libsylph/news.c:367
+#, c-format
+msgid "article %d has been already cached.\n"
+msgstr ""
+
+#: libsylph/news.c:387
+#, c-format
+msgid "getting article %d...\n"
+msgstr ""
+
+#: libsylph/news.c:391
+#, c-format
+msgid "can't read article %d\n"
+msgstr "無法讀取文章 %d\n"
+
+#: libsylph/news.c:545
+msgid "can't retrieve newsgroup list\n"
+msgstr "無法取得新聞群組列表\n"
+
+#: libsylph/news.c:658
+msgid "can't post article.\n"
+msgstr "無法發表文章\n"
+
+#: libsylph/news.c:684
+#, c-format
+msgid "can't retrieve article %d\n"
+msgstr "無法取得文章 %d\n"
+
+#: libsylph/news.c:741
+#, c-format
+msgid "can't select group: %s\n"
+msgstr "無法選擇新聞群組：%s\n"
+
+#: libsylph/news.c:778
+#, c-format
+msgid "invalid article range: %d - %d\n"
+msgstr "錯誤的文章範圍：%d - %d\n"
+
+#: libsylph/news.c:791
+msgid "no new articles.\n"
+msgstr "沒有新文章。\n"
+
+#: libsylph/news.c:801
+#, c-format
+msgid "getting xover %d - %d in %s...\n"
+msgstr ""
+
+#: libsylph/news.c:805
+msgid "can't get xover\n"
+msgstr "無法取得 xover\n"
+
+#: libsylph/news.c:815
+msgid "error occurred while getting xover.\n"
+msgstr "取得 xover 時發生錯誤。\n"
+
+#: libsylph/news.c:825
+#, c-format
+msgid "invalid xover line: %s\n"
+msgstr "xover 內容錯誤：%s\n"
+
+#: libsylph/news.c:844 libsylph/news.c:876
+msgid "can't get xhdr\n"
+msgstr "無法取得 xover\n"
+
+#: libsylph/news.c:856 libsylph/news.c:888
+msgid "error occurred while getting xhdr.\n"
+msgstr "取得 xover 時發生錯誤。\n"
+
+#: libsylph/nntp.c:68
+#, c-format
+msgid "Can't connect to NNTP server: %s:%d\n"
+msgstr "無法連線到新聞伺服器：%s:%d\n"
+
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
+#, c-format
+msgid "protocol error: %s\n"
+msgstr "通訊協定有錯誤：%s\n"
+
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
+msgid "protocol error\n"
+msgstr "通訊協定有錯誤\n"
+
+#: libsylph/nntp.c:283
+msgid "Error occurred while posting\n"
+msgstr "發表文章時發生錯誤\n"
+
+#: libsylph/nntp.c:363
+msgid "Error occurred while sending command\n"
+msgstr "送出命令時發生錯誤。\n"
+
+#: libsylph/pop.c:149
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "在通訊中找不到 APOP 的 timestamp。\n"
+
+#: libsylph/pop.c:156
+msgid "Timestamp syntax error in greeting\n"
+msgstr "通訊中的 timestamp 語法錯誤\n"
+
+#: libsylph/pop.c:182 libsylph/pop.c:209
+msgid "POP3 protocol error\n"
+msgstr "POP3 協定有錯誤\n"
+
+#: libsylph/pop.c:254
+#, c-format
+msgid "invalid UIDL response: %s\n"
+msgstr "UIDL 回應錯誤：%s\n"
+
+#: libsylph/pop.c:616
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: 刪除過期的信件 %d\n"
+
+#: libsylph/pop.c:624
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: 略過郵件 %d (%d bytes)\n"
+
+#: libsylph/pop.c:655
+msgid "mailbox is locked\n"
+msgstr "信箱已被鎖定，可能前一次抓取未完成。\n"
+
+#: libsylph/pop.c:658
+msgid "session timeout\n"
+msgstr "作業逾時\n"
+
+#: libsylph/pop.c:664 libsylph/smtp.c:557
+msgid "can't start TLS session\n"
+msgstr "無法啟動 TLS\n"
+
+#: libsylph/pop.c:671 libsylph/smtp.c:492
+msgid "error occurred on authentication\n"
+msgstr "認證時發生錯誤\n"
+
+#: libsylph/pop.c:676
+msgid "command not supported\n"
+msgstr "命令未支援\n"
+
+#: libsylph/pop.c:680
+msgid "error occurred on POP3 session\n"
+msgstr "使用 POP3 通訊協定時發生錯誤\n"
+
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
@@ -30,6 +413,53 @@ msgstr "找到 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "組態設定已儲存。\n"
 
+#: libsylph/prefs_common.c:421
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "資料夾："
+
+#: libsylph/procmime.c:761
+msgid "procmime_get_text_content(): Code conversion failed.\n"
+msgstr "procmime_get_text_content(): 轉碼失敗。\n"
+
+#: libsylph/procmsg.c:535
+msgid "can't open mark file\n"
+msgstr "無法開啟標示的檔案 \n"
+
+#: libsylph/procmsg.c:964
+#, c-format
+msgid "can't fetch message %d\n"
+msgstr "無法抓取信件 %d\n"
+
+#: libsylph/procmsg.c:1140 src/compose.c:953 src/compose.c:1023
+msgid "Can't get text part\n"
+msgstr "沒有文字\n"
+
+#: libsylph/procmsg.c:1183
+#, c-format
+msgid "Print command line is invalid: `%s'\n"
+msgstr "列印命令錯誤：`%s'\n"
+
+#: libsylph/recv.c:112
+msgid "error occurred while retrieving data.\n"
+msgstr "抓取資料時發生錯誤。\n"
+
+#: libsylph/recv.c:154 libsylph/recv.c:196 libsylph/recv.c:211
+msgid "Can't write to file.\n"
+msgstr "無法寫入檔案。\n"
+
+#: libsylph/smtp.c:156
+msgid "SMTP AUTH not available\n"
+msgstr "不支援 SMTP 認證\n"
+
+#: libsylph/smtp.c:462 libsylph/smtp.c:512
+msgid "bad SMTP response\n"
+msgstr "SMTP 回覆錯誤\n"
+
+#: libsylph/smtp.c:483 libsylph/smtp.c:501 libsylph/smtp.c:598
+msgid "error occurred on SMTP session\n"
+msgstr "SMTP 認證時發生錯誤\n"
+
 #: libsylph/ssl.c:54
 msgid "SSLv23 not available\n"
 msgstr "不支援 SSLv23\n"
@@ -148,78 +578,6 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account.c:137
-msgid "Reading all config for each account...\n"
-msgstr "讀取所有帳號的設定中...\n"
-
-#: src/account.c:357
-msgid ""
-"Some composing windows are open.\n"
-"Please close all the composing windows before editing the accounts."
-msgstr ""
-"您正在撰寫郵件，\n"
-"請關掉所有撰寫中的郵件再進行帳號設定。"
-
-#: src/account.c:363
-msgid "Opening account edit window...\n"
-msgstr "開啟帳號編輯視窗中...\n"
-
-#: src/account.c:614
-msgid "Creating account edit window...\n"
-msgstr "產生帳號編輯視窗中...\n"
-
-#: src/account.c:619
-msgid "Edit accounts"
-msgstr "編輯帳號設定"
-
-#: src/account.c:637
-msgid ""
-"New messages will be checked in this order. Check the boxes\n"
-"on the `G' column to enable message retrieval by `Get all'."
-msgstr ""
-"檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
-"來決定是否在「全部檢查」時要檢查該帳號的郵件。"
-
-#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4086 src/editaddress.c:200 src/editaddress.c:942
-#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
-#: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:201 src/prefs_filter.c:259 src/prefs_folder_item.c:171
-#: src/select-keys.c:319
-msgid "Name"
-msgstr "名稱"
-
-#: src/account.c:696 src/prefs_account.c:858
-msgid "Protocol"
-msgstr "通訊協定"
-
-#: src/account.c:701
-msgid "Server"
-msgstr "伺服器"
-
-#: src/account.c:725 src/prefs_filter.c:324
-msgid "Edit"
-msgstr "編輯"
-
-#: src/account.c:759
-#, fuzzy
-msgid " _Set as default account "
-msgstr "設為預設帳號"
-
-#: src/account.c:812
-#, fuzzy, c-format
-msgid "Do you really want to delete the account '%s'?"
-msgstr "您確定要刪除這個帳號嗎？"
-
-#: src/account.c:814 src/prefs_filter.c:764
-#, fuzzy
-msgid "(Untitled)"
-msgstr "無標題"
-
-#: src/account.c:815
-msgid "Delete account"
-msgstr "刪除帳號"
-
 #: src/action.c:331
 #, c-format
 msgid "Could not get message file %d"
@@ -319,6 +677,14 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將位址加入位址簿"
 
+#: src/addressadd.c:192 src/addressbook.c:491 src/compose.c:4086
+#: src/editaddress.c:200 src/editaddress.c:942 src/editaddress.c:990
+#: src/editbook.c:196 src/editgroup.c:265 src/editjpilot.c:271
+#: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:201
+#: src/prefs_filter.c:259 src/prefs_folder_item.c:171 src/select-keys.c:319
+msgid "Name"
+msgstr "名稱"
+
 #: src/addressadd.c:202 src/compose.c:4533 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
@@ -333,8 +699,8 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇位址簿資料夾"
 
-#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:462
-#: src/messageview.c:137
+#: src/addressbook.c:336 src/compose.c:494 src/mainwindow.c:465
+#: src/messageview.c:138
 msgid "/_File"
 msgstr "/檔案(_F)"
 
@@ -355,9 +721,9 @@ msgid "/_File/New _Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:499
-#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:480
-#: src/mainwindow.c:483 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/mainwindow.c:490 src/messageview.c:140
+#: src/compose.c:504 src/compose.c:508 src/mainwindow.c:483
+#: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
+#: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
@@ -373,7 +739,7 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:509 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
@@ -405,8 +771,8 @@ msgstr "/位址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/位址(_A)/刪除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:717
-#: src/messageview.c:256
+#: src/addressbook.c:358 src/compose.c:618 src/mainwindow.c:720
+#: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
@@ -414,13 +780,13 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:767
-#: src/messageview.c:274
+#: src/addressbook.c:360 src/compose.c:631 src/mainwindow.c:770
+#: src/messageview.c:275
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:778
-#: src/messageview.c:275
+#: src/addressbook.c:361 src/compose.c:632 src/mainwindow.c:781
+#: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
@@ -437,17 +803,17 @@ msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:488
-#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
-#: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
-#: src/folderview.c:275 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:242
+#: src/folderview.c:253 src/folderview.c:255 src/folderview.c:257
+#: src/folderview.c:261 src/folderview.c:271 src/folderview.c:273
+#: src/folderview.c:276 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:511
-#: src/mainwindow.c:494 src/messageview.c:143
+#: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
@@ -459,7 +825,7 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail位址"
 
-#: src/addressbook.c:496 src/compose.c:4534 src/prefs_common.c:2396
+#: src/addressbook.c:496 src/compose.c:4534
 msgid "Address book"
 msgstr "位址簿"
 
@@ -469,14 +835,14 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2281 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2284 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:231
+#: src/prefs_template.c:232
 msgid "Delete"
 msgstr "刪除"
 
 #: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
-#: src/prefs_actions.c:254 src/prefs_customheader.c:236
+#: 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:1572
 msgid "Add"
@@ -487,11 +853,11 @@ msgid "Lookup"
 msgstr "尋找"
 
 #: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:312
-#: src/prefs_template.c:174 src/summary_search.c:221
+#: src/prefs_template.c:175 src/summary_search.c:221
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:176
+#: src/addressbook.c:650 src/prefs_folder_item.c:329 src/prefs_template.c:177
 msgid "Cc:"
 msgstr "副本"
 
@@ -517,7 +883,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的位址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的位址紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2145
+#: src/addressbook.c:1674 src/folderview.c:2148
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -625,7 +991,7 @@ msgstr "轉換位址簿格式時發生錯誤"
 msgid "Addressbook Conversion"
 msgstr "位址簿格式轉換"
 
-#: src/addressbook.c:3072 src/prefs_common.c:966
+#: src/addressbook.c:3072
 msgid "Interface"
 msgstr "介面"
 
@@ -645,8 +1011,7 @@ msgstr "電子郵件信箱"
 msgid "Group"
 msgstr "群組"
 
-#. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:346 src/prefs_account.c:1875
+#: src/addressbook.c:3152 src/folderview.c:347
 msgid "Folder"
 msgstr "資料夾"
 
@@ -670,15 +1035,15 @@ msgstr "共用位址紀錄"
 msgid "Personal address"
 msgstr "私人位址紀錄"
 
-#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:470
+#: src/alertpanel.c:138 src/compose.c:5220 src/main.c:480
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:151 src/main.c:560
+#: src/alertpanel.c:151 src/main.c:573
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:164 src/inc.c:574
+#: src/alertpanel.c:164 src/inc.c:573
 msgid "Error"
 msgstr "錯誤"
 
@@ -733,8 +1098,8 @@ msgstr "/新增...(_A)"
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:489 src/folderview.c:243 src/folderview.c:262
-#: src/folderview.c:277
+#: src/compose.c:489 src/folderview.c:244 src/folderview.c:263
+#: src/folderview.c:278
 msgid "/_Properties..."
 msgstr "/內容...(_P)"
 
@@ -774,8 +1139,8 @@ msgstr "/編輯(_E)/復原(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:498
-#: src/messageview.c:146
+#: src/compose.c:514 src/compose.c:521 src/mainwindow.c:501
+#: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
@@ -783,7 +1148,7 @@ msgstr "/編輯(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_t)"
 
-#: src/compose.c:516 src/mainwindow.c:495 src/messageview.c:144
+#: src/compose.c:516 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
@@ -795,7 +1160,7 @@ msgstr "/編輯(_E)/貼上(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_q)"
 
-#: src/compose.c:520 src/mainwindow.c:496 src/messageview.c:145
+#: src/compose.c:520 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_a)"
 
@@ -811,7 +1176,7 @@ msgstr "/編輯(_E)/將所有過長的行折行(_l)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動換行(_o)"
 
-#: src/compose.c:527 src/mainwindow.c:503 src/messageview.c:150
+#: src/compose.c:527 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/顯示(_V)"
@@ -833,9 +1198,9 @@ msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
 #: src/compose.c:532 src/compose.c:534 src/compose.c:536 src/compose.c:538
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:550
-#: src/mainwindow.c:574 src/mainwindow.c:667 src/mainwindow.c:671
-#: src/messageview.c:233
+#: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:553
+#: src/mainwindow.c:577 src/mainwindow.c:670 src/mainwindow.c:674
+#: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
@@ -851,7 +1216,7 @@ msgstr "/顯示(_V)/尺規(_u)"
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:544 src/mainwindow.c:581 src/messageview.c:157
+#: src/compose.c:544 src/mainwindow.c:584 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
@@ -863,127 +1228,127 @@ msgstr ""
 #: src/compose.c:547 src/compose.c:553 src/compose.c:559 src/compose.c:563
 #: src/compose.c:569 src/compose.c:573 src/compose.c:579 src/compose.c:583
 #: src/compose.c:593 src/compose.c:597 src/compose.c:607 src/compose.c:611
-#: src/mainwindow.c:577 src/mainwindow.c:584 src/messageview.c:153
+#: src/mainwindow.c:580 src/mainwindow.c:587 src/messageview.c:154
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:161
+#: src/compose.c:549 src/mainwindow.c:588 src/messageview.c:162
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字集(_C)/7位元 ASCII 字集(US-ASC_II)"
 
-#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:164
+#: src/compose.c:551 src/mainwindow.c:590 src/messageview.c:165
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字集(_C)/Unicode (_UTF-8)"
 
-#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:167
+#: src/compose.c:555 src/mainwindow.c:594 src/messageview.c:168
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:593 src/messageview.c:169
+#: src/compose.c:557 src/mainwindow.c:596 src/messageview.c:170
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:172
+#: src/compose.c:561 src/mainwindow.c:600 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字集(_C)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:175
+#: src/compose.c:565 src/mainwindow.c:604 src/messageview.c:176
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字集(_C)/_波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:567 src/mainwindow.c:603 src/messageview.c:177
+#: src/compose.c:567 src/mainwindow.c:606 src/messageview.c:178
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字集(_C)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:571 src/mainwindow.c:607 src/messageview.c:180
+#: src/compose.c:571 src/mainwindow.c:610 src/messageview.c:181
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:183
+#: src/compose.c:575 src/mainwindow.c:614 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:185
+#: src/compose.c:577 src/mainwindow.c:616 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:581 src/mainwindow.c:617 src/messageview.c:188
+#: src/compose.c:581 src/mainwindow.c:620 src/messageview.c:189
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字集(_C)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:585 src/mainwindow.c:621 src/messageview.c:191
+#: src/compose.c:585 src/mainwindow.c:624 src/messageview.c:192
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:587 src/mainwindow.c:623 src/messageview.c:193
+#: src/compose.c:587 src/mainwindow.c:626 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:589 src/mainwindow.c:625 src/messageview.c:195
+#: src/compose.c:589 src/mainwindow.c:628 src/messageview.c:196
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:591 src/mainwindow.c:627 src/messageview.c:197
+#: src/compose.c:591 src/mainwindow.c:630 src/messageview.c:198
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:595 src/mainwindow.c:631 src/messageview.c:200
+#: src/compose.c:595 src/mainwindow.c:634 src/messageview.c:201
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:599 src/mainwindow.c:641 src/messageview.c:209
+#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
 
-#: src/compose.c:601 src/mainwindow.c:643 src/messageview.c:211
+#: src/compose.c:601 src/mainwindow.c:646 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
 
-#: src/compose.c:603 src/mainwindow.c:645 src/messageview.c:213
+#: src/compose.c:603 src/mainwindow.c:648 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字集(_C)/繁體中文 (_Big5)"
 
-#: src/compose.c:605 src/mainwindow.c:647 src/messageview.c:215
+#: src/compose.c:605 src/mainwindow.c:650 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/顯示(_V)/字集(_C)/繁體中文 (EUC-_TW)"
 
-#: src/compose.c:609 src/mainwindow.c:653 src/messageview.c:220
+#: src/compose.c:609 src/mainwindow.c:656 src/messageview.c:221
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字集(_C)/韓文 (EUC-_KR)"
 
-#: src/compose.c:613 src/mainwindow.c:659 src/messageview.c:225
+#: src/compose.c:613 src/mainwindow.c:662 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字集(_C)/泰文 (TIS-620)"
 
-#: src/compose.c:615 src/mainwindow.c:661 src/messageview.c:227
+#: src/compose.c:615 src/mainwindow.c:664 src/messageview.c:228
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字集(_C)/泰文 (Windows-874)"
 
-#: src/compose.c:619 src/mainwindow.c:718 src/messageview.c:257
+#: src/compose.c:619 src/mainwindow.c:721 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/位址簿(_A)"
 
@@ -991,14 +1356,14 @@ msgstr "/工具(_T)/位址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用信件樣板(_T)"
 
-#: src/compose.c:621 src/mainwindow.c:741 src/messageview.c:272
+#: src/compose.c:621 src/mainwindow.c:744 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_n)"
 
-#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:721
-#: src/mainwindow.c:735 src/mainwindow.c:740 src/mainwindow.c:742
-#: src/mainwindow.c:745 src/mainwindow.c:747 src/messageview.c:260
-#: src/messageview.c:271
+#: src/compose.c:622 src/compose.c:626 src/mainwindow.c:724
+#: src/mainwindow.c:738 src/mainwindow.c:743 src/mainwindow.c:745
+#: src/mainwindow.c:748 src/mainwindow.c:750 src/messageview.c:261
+#: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
@@ -1019,10 +1384,6 @@ msgstr "/工具(_T)/PGP 加密(_E)"
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:953 src/compose.c:1023 src/procmsg.c:1353
-msgid "Can't get text part\n"
-msgstr "沒有文字\n"
-
 #: src/compose.c:1419
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
@@ -1099,7 +1460,7 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2571 src/send_message.c:297
+#: src/compose.c:2571 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
@@ -1190,8 +1551,7 @@ msgstr "MIME 型態"
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4454 src/mainwindow.c:2214 src/prefs_account.c:728
-#: src/prefs_common.c:950
+#: src/compose.c:4454 src/mainwindow.c:2217
 msgid "Send"
 msgstr "送出"
 
@@ -1231,8 +1591,7 @@ msgstr "附加"
 msgid "Attach file"
 msgstr "附加檔案"
 
-#. signature
-#: src/compose.c:4503 src/prefs_account.c:1400 src/prefs_common.c:1359
+#: src/compose.c:4503
 msgid "Signature"
 msgstr "簽名"
 
@@ -1240,7 +1599,7 @@ msgstr "簽名"
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/compose.c:4513 src/prefs_common.c:1381 src/prefs_common.c:2376
+#: src/compose.c:4513
 msgid "Editor"
 msgstr "編輯器"
 
@@ -1437,7 +1796,7 @@ msgstr "變更"
 msgid "Clear"
 msgstr "清除"
 
-#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:207
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "值"
 
@@ -1470,7 +1829,6 @@ msgid " Check File "
 msgstr "檢查檔案(_C)"
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account.c:1411
 msgid "File"
 msgstr "/檔案(_F)"
 
@@ -1526,12 +1884,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1924
-#: src/folderview.c:1930
+#: src/editgroup.c:524 src/foldersel.c:540 src/folderview.c:1927
+#: src/folderview.c:1933
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1931
+#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:1934
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -1548,7 +1906,7 @@ msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account.c:1903 src/prefs_common.c:2031
+#: src/importldif.c:534
 msgid " ... "
 msgstr "..."
 
@@ -1612,7 +1970,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account.c:724
+#: src/editldap.c:471
 msgid "Basic"
 msgstr "基本設定"
 
@@ -1669,7 +2027,6 @@ msgid "Exporting file:"
 msgstr "匯出檔名："
 
 #: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
-#: src/prefs_account.c:1115
 msgid " Select... "
 msgstr "選擇..."
 
@@ -1693,161 +2050,161 @@ msgstr "您要取代已存在的檔案嗎？"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:359 src/folderview.c:1069 src/prefs_folder_item.c:216
+#: src/foldersel.c:359 src/folderview.c:1070 src/prefs_folder_item.c:216
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:363 src/folderview.c:1075 src/prefs_folder_item.c:217
+#: src/foldersel.c:363 src/folderview.c:1076 src/prefs_folder_item.c:217
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:367 src/folderview.c:1081 src/prefs_folder_item.c:219
+#: src/foldersel.c:367 src/folderview.c:1082 src/prefs_folder_item.c:219
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:371 src/folderview.c:1087 src/prefs_folder_item.c:220
+#: src/foldersel.c:371 src/folderview.c:1088 src/prefs_folder_item.c:220
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:375 src/folderview.c:1093 src/prefs_folder_item.c:218
+#: src/foldersel.c:375 src/folderview.c:1094 src/prefs_folder_item.c:218
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:1928 src/folderview.c:1932
+#: src/foldersel.c:542 src/folderview.c:1931 src/folderview.c:1935
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:550 src/folderview.c:1940 src/folderview.c:1996
+#: src/foldersel.c:550 src/folderview.c:1943 src/folderview.c:1999
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有 `%c' 這個字元。"
 
-#: src/foldersel.c:560 src/folderview.c:1950 src/folderview.c:2003
+#: src/foldersel.c:560 src/folderview.c:1953 src/folderview.c:2006
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾 `%s' 已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:1957
+#: src/foldersel.c:568 src/folderview.c:1960
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法刪除資料夾 `%s'。"
 
-#: src/folderview.c:231 src/folderview.c:248
+#: src/folderview.c:232 src/folderview.c:249
 msgid "/Create _new folder..."
 msgstr "/產生新的資料夾 (_n)"
 
-#: src/folderview.c:232 src/folderview.c:249
+#: src/folderview.c:233 src/folderview.c:250
 msgid "/_Rename folder..."
 msgstr "/重新命名資料夾(_R)..."
 
-#: src/folderview.c:233 src/folderview.c:250
+#: src/folderview.c:234 src/folderview.c:251
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/重新命名資料夾(_R)..."
 
-#: src/folderview.c:234 src/folderview.c:251
+#: src/folderview.c:235 src/folderview.c:252
 msgid "/_Delete folder"
 msgstr "/刪除資料夾(_D)"
 
-#: src/folderview.c:236 src/folderview.c:253
+#: src/folderview.c:237 src/folderview.c:254
 msgid "/Empty _trash"
 msgstr "/清空刪除的郵件(_t)"
 
-#: src/folderview.c:238 src/folderview.c:257 src/folderview.c:273
+#: src/folderview.c:239 src/folderview.c:258 src/folderview.c:274
 msgid "/_Check for new messages"
 msgstr "/檢查新郵件(_C)"
 
-#: src/folderview.c:240 src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:260
 msgid "/R_ebuild folder tree"
 msgstr "/重建資料夾結構(_e)"
 
-#: src/folderview.c:242 src/folderview.c:261 src/folderview.c:276
+#: src/folderview.c:243 src/folderview.c:262 src/folderview.c:277
 msgid "/_Search messages..."
 msgstr "/尋找信件 (_S)"
 
-#: src/folderview.c:255 src/folderview.c:271
+#: src/folderview.c:256 src/folderview.c:272
 msgid "/Down_load"
 msgstr "/下載 (_l)"
 
-#: src/folderview.c:267
+#: src/folderview.c:268
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/預訂新聞群組 (_b)"
 
-#: src/folderview.c:269
+#: src/folderview.c:270
 msgid "/_Remove newsgroup"
 msgstr "/移除新聞群組(_R)"
 
-#: src/folderview.c:298
+#: src/folderview.c:299
 msgid "Creating folder view...\n"
 msgstr "產生資料夾...\n"
 
-#: src/folderview.c:377
+#: src/folderview.c:378
 msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:391 src/prefs_summary_column.c:71
+#: src/folderview.c:392 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未讀的"
 
-#: src/folderview.c:405
+#: src/folderview.c:406
 msgid "#"
 msgstr ""
 
-#: src/folderview.c:520
+#: src/folderview.c:521
 msgid "Setting folder info...\n"
 msgstr "設定資料夾...\n"
 
-#: src/folderview.c:521
+#: src/folderview.c:522
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:805 src/mainwindow.c:3279 src/setup.c:81
+#: src/folderview.c:806 src/mainwindow.c:3282 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:809 src/mainwindow.c:3284 src/setup.c:86
+#: src/folderview.c:810 src/mainwindow.c:3287 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:851
+#: src/folderview.c:852
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:852
+#: src/folderview.c:853
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:861
+#: src/folderview.c:862
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:938
+#: src/folderview.c:939
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1685
+#: src/folderview.c:1688
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1843
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載信件中..."
 
-#: src/folderview.c:1875
+#: src/folderview.c:1878
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載信件時出現錯誤。"
 
-#: src/folderview.c:1925
+#: src/folderview.c:1928
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1857,21 +2214,21 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上 `/'）"
 
-#: src/folderview.c:1987
+#: src/folderview.c:1990
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入 `%s' 的新名稱："
 
-#: src/folderview.c:1988
+#: src/folderview.c:1991
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2079
+#: src/folderview.c:2082
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法刪除資料夾 `%s'。"
 
-#: src/folderview.c:2142
+#: src/folderview.c:2145
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1882,21 +2239,21 @@ msgstr ""
 "所有在 `%s' 資料夾下面的信件與子資料夾都將會被刪除。\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2171
+#: src/folderview.c:2174
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "無法刪除資料夾 `%s'。"
 
-#: src/folderview.c:2205
+#: src/folderview.c:2208
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2206
+#: src/folderview.c:2209
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2242
+#: src/folderview.c:2245
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1905,34 +2262,34 @@ msgstr ""
 "確定要刪除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2244
+#: src/folderview.c:2247
 msgid "Remove mailbox"
 msgstr "/刪除信箱"
 
-#: src/folderview.c:2290
+#: src/folderview.c:2293
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2291
+#: src/folderview.c:2294
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2433
+#: src/folderview.c:2436
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組 `%s' 嗎？"
 
-#: src/folderview.c:2434
+#: src/folderview.c:2437
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2481
+#: src/folderview.c:2484
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號 `%s' 嗎？"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2485
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -1993,7 +2350,7 @@ msgstr "已接收 %d 個新聞群組 (%s 已讀)"
 msgid "Newsgroups:"
 msgstr "新聞群組："
 
-#: src/headerview.c:57 src/prefs_template.c:178 src/summary_search.c:228
+#: src/headerview.c:57 src/prefs_template.c:179 src/summary_search.c:228
 msgid "Subject:"
 msgstr "標題："
 
@@ -2017,160 +2374,6 @@ msgstr "產生圖像的視窗...\n"
 msgid "Can't load the image."
 msgstr "無法載入圖像。"
 
-#: src/imap.c:461
-#, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "到 %s 的 IMAP4 連線被中斷了。重新連線中...\n"
-
-#: src/imap.c:512 src/imap.c:518
-#, fuzzy
-msgid "IMAP4 server disables LOGIN.\n"
-msgstr "IMAP 伺服器目錄"
-
-#: src/imap.c:593
-#, c-format
-msgid "creating IMAP4 connection to %s:%d ...\n"
-msgstr "正在產生 IMAP4 連線到 %s:%d ...\n"
-
-#: src/imap.c:634
-msgid "Can't start TLS session.\n"
-msgstr "無法開啟 TLS 連線\n"
-
-#: src/imap.c:1421
-#, c-format
-msgid "can't set deleted flags: %s\n"
-msgstr "無法設定刪除的旗標：%s\n"
-
-#: src/imap.c:1429 src/imap.c:1521
-msgid "can't expunge\n"
-msgstr "無法刪除\n"
-
-#: src/imap.c:1515
-msgid "can't set deleted flags: 1:*\n"
-msgstr "無法設定刪除的旗標：1:*\n"
-
-#: src/imap.c:1560
-msgid "can't close folder\n"
-msgstr "無法選擇資料夾\n"
-
-#: src/imap.c:1638
-#, c-format
-msgid "root folder %s not exist\n"
-msgstr "根資料夾 %s 不存在。\n"
-
-#: src/imap.c:1822 src/imap.c:1830
-msgid "error occurred while getting LIST.\n"
-msgstr "取得 LIST 時發生錯誤。\n"
-
-#: src/imap.c:1944
-#, c-format
-msgid "Can't create '%s'\n"
-msgstr "無法產生 %s\n"
-
-#: src/imap.c:1949
-#, c-format
-msgid "Can't create '%s' under INBOX\n"
-msgstr "無法在收件夾下產生 %s\n"
-
-#: src/imap.c:2010
-msgid "can't create mailbox: LIST failed\n"
-msgstr "無法產生信箱：LIST 失敗\n"
-
-#: src/imap.c:2030
-msgid "can't create mailbox\n"
-msgstr "無法產生信箱\n"
-
-#: src/imap.c:2126
-#, c-format
-msgid "can't rename mailbox: %s to %s\n"
-msgstr "信箱 %s 無法更名為 %s\n"
-
-#: src/imap.c:2206
-msgid "can't delete mailbox\n"
-msgstr "無法刪除信箱\n"
-
-#: src/imap.c:2245
-msgid "can't get envelope\n"
-msgstr "無法取得信封。\n"
-
-#: src/imap.c:2253
-msgid "error occurred while getting envelope.\n"
-msgstr "取得信封時發生錯誤。\n"
-
-#: src/imap.c:2274
-#, c-format
-msgid "can't parse envelope: %s\n"
-msgstr "無法解析信封：%s\n"
-
-#: src/imap.c:2397
-#, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
-msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
-
-#: src/imap.c:2404
-#, c-format
-msgid "Can't establish IMAP4 session with: %s:%d\n"
-msgstr "無法產生 IMAP4 連線：%s:%d\n"
-
-#: src/imap.c:2479
-msgid "can't get namespace\n"
-msgstr "無法取得信封。\n"
-
-#: src/imap.c:3006
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr "無法選擇資料夾：%s\n"
-
-#: src/imap.c:3181
-msgid "IMAP4 authentication failed.\n"
-msgstr "IMAP4 認證失敗\n"
-
-#: src/imap.c:3198
-msgid "IMAP4 login failed.\n"
-msgstr "IMAP4 登入失敗。\n"
-
-#: src/imap.c:3528
-#, c-format
-msgid "can't append %s to %s\n"
-msgstr "無法將信件從 %s 搬移到 %s。\n"
-
-#: src/imap.c:3535
-msgid "(sending file...)"
-msgstr "（送出檔案 ...）"
-
-#: src/imap.c:3563
-#, c-format
-msgid "can't append message to %s\n"
-msgstr "無法附加訊息到 %s\n"
-
-#: src/imap.c:3595
-#, c-format
-msgid "can't copy %s to %s\n"
-msgstr "無法將信件 %s 移到 %s\n"
-
-#: src/imap.c:3619
-#, c-format
-msgid "error while imap command: STORE %s %s\n"
-msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
-
-#: src/imap.c:3633
-msgid "error while imap command: EXPUNGE\n"
-msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
-
-#: src/imap.c:3646
-msgid "error while imap command: CLOSE\n"
-msgstr "imap 發生錯誤，命令為： CLOSE\n"
-
-#: src/imap.c:3879
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "無法將 UTF-7 轉換為 %s\n"
-
-#: src/imap.c:3909
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "無法轉換 %s 為 UTF-7\n"
-
 #: src/import.c:144
 msgid "Import"
 msgstr "匯入"
@@ -2268,7 +2471,7 @@ msgstr "將 LDIF 檔匯入位址簿"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:768 src/mainwindow.c:2310
+#: src/importldif.c:768 src/mainwindow.c:2313
 msgid "Next"
 msgstr "下一封"
 
@@ -2284,143 +2487,143 @@ msgstr "屬性"
 msgid "Finish"
 msgstr "完成"
 
-#: src/inc.c:158
+#: src/inc.c:157
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:162
+#: src/inc.c:161
 #, fuzzy
 msgid "Sylpheed"
 msgstr "舊設定"
 
-#: src/inc.c:359
+#: src/inc.c:358
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:402
+#: src/inc.c:401
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:531 src/inc.c:580
+#: src/inc.c:530 src/inc.c:579
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:542
+#: src/inc.c:541
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:551
+#: src/inc.c:550
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Done (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:561
+#: src/inc.c:560
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:564
+#: src/inc.c:563
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:567
+#: src/inc.c:566
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:627
+#: src/inc.c:626
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:630
+#: src/inc.c:629
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:639
+#: src/inc.c:638
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:675
+#: src/inc.c:674
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:678
+#: src/inc.c:677
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:697
+#: src/inc.c:696
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:706
+#: src/inc.c:705
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:785 src/send_message.c:537
+#: src/inc.c:784 src/send_message.c:614
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:786
+#: src/inc.c:785
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:791
+#: src/inc.c:790
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:795
+#: src/inc.c:794
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:799
+#: src/inc.c:798
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:803
+#: src/inc.c:802
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:813
+#: src/inc.c:812
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:820 src/send_message.c:555
+#: src/inc.c:819 src/send_message.c:632
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:845
+#: src/inc.c:844
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:866
+#: src/inc.c:865
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
 
-#: src/inc.c:1098
+#: src/inc.c:1097
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1104
+#: src/inc.c:1103
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1109
+#: src/inc.c:1108
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2429,39 +2632,39 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1115
+#: src/inc.c:1114
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1120
+#: src/inc.c:1119
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1125
+#: src/inc.c:1124
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1131 src/send_message.c:490 src/send_message.c:678
+#: src/inc.c:1130 src/send_message.c:567 src/send_message.c:755
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1137
+#: src/inc.c:1136
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次抓取未完成。"
 
-#: src/inc.c:1141
+#: src/inc.c:1140
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1147 src/send_message.c:663
+#: src/inc.c:1146 src/send_message.c:740
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1152 src/send_message.c:666
+#: src/inc.c:1151 src/send_message.c:743
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2470,15 +2673,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1157 src/send_message.c:682
+#: src/inc.c:1156 src/send_message.c:759
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1193
+#: src/inc.c:1192
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1276
+#: src/inc.c:1275
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -2496,29 +2699,20 @@ msgstr "輸入密碼"
 msgid "Protocol log"
 msgstr "通訊協定紀錄"
 
-#: src/main.c:135 src/mh.c:826
-#, c-format
-msgid ""
-"File `%s' already exists.\n"
-"Can't create folder."
-msgstr ""
-"檔案 `%s' 已存在。\n"
-"無法產生資料夾。"
-
-#: src/main.c:183
+#: src/main.c:186
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 不支援 g_thread。\n"
 
-#: src/main.c:319
+#: src/main.c:329
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:322
+#: src/main.c:332
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    直接開啟撰寫郵件視窗"
 
-#: src/main.c:323
+#: src/main.c:333
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2527,46 +2721,46 @@ msgstr ""
 "  --attach file1 [file2]...\n"
 "                         開啟撰寫郵件視窗，並將指定的檔案附加上去"
 
-#: src/main.c:326
+#: src/main.c:336
 msgid "  --receive              receive new messages"
 msgstr "  --receive              直接接收新郵件"
 
-#: src/main.c:327
+#: src/main.c:337
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          直接接收所有帳號的新郵件"
 
-#: src/main.c:328
+#: src/main.c:338
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送出所有暫存資料夾中的信件"
 
-#: src/main.c:329
+#: src/main.c:339
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   顯示資料夾內總共有多少信件"
 
-#: src/main.c:330
+#: src/main.c:340
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [folder]...     顯示每個資料夾中有多少信件"
 
-#: src/main.c:332
+#: src/main.c:342
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:333
+#: src/main.c:343
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 顯示本說明並離開"
 
-#: src/main.c:334
+#: src/main.c:344
 msgid "  --version              output version information and exit"
 msgstr "  --version              顯示版本資訊"
 
-#: src/main.c:422
+#: src/main.c:432
 #, fuzzy
 msgid "Filename encoding"
 msgstr "輸出字集"
 
-#: src/main.c:423
+#: src/main.c:433
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2580,19 +2774,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:471
+#: src/main.c:481
 msgid "Composing message exists. Really quit?"
 msgstr "有信件正在編輯。確定要離開嗎？"
 
-#: src/main.c:479
+#: src/main.c:489
 msgid "Queued messages"
 msgstr "有未送出信件"
 
-#: src/main.c:480
+#: src/main.c:490
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "有些信件正在暫存資料夾中尚未送出。確定要離開嗎？"
 
-#: src/main.c:561
+#: src/main.c:574
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2601,644 +2795,644 @@ msgstr ""
 "關閉 OpenPGP 支援項目。"
 
 #. remote command mode
-#: src/main.c:608
+#: src/main.c:621
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:808
+#: src/main.c:821
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "外部指令設定"
 
-#: src/main.c:809
+#: src/main.c:822
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:466
 msgid "/_File/_Folder"
 msgstr "/檔案(_F)/資料夾管理(_F)"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:467
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/新增資料夾(_n)"
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:469
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:470
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/檔案(_F)/資料夾管理(_F)/刪除資料夾(_D)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Mailbox"
 msgstr "/檔案(_F)/信箱(_M)"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:473
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/檔案(_F)/信箱(_M)/新增信箱(_m)..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/檔案(_F)/信箱(_M)/刪除信箱 (_R)"
 
-#: src/mainwindow.c:472 src/mainwindow.c:477
+#: src/mainwindow.c:475 src/mainwindow.c:480
 msgid "/_File/_Mailbox/---"
 msgstr "/檔案(_F)/信箱(_M)/---"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:476
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/檔案(_F)/信箱(_M)/檢查新郵件(_C)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/檔案(_F)/信箱(_M)/檢查所有信箱中的新郵件(_a)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/檔案(_F)/信箱(_M)/重建資料夾結構(_e)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:484
 msgid "/_File/_Import mbox file..."
 msgstr "/檔案(_F)/匯入郵件(_I)"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:485
 msgid "/_File/_Export to mbox file..."
 msgstr "/檔案(_F)/匯出資料夾(_E)"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:487
 msgid "/_File/Empty all _trash"
 msgstr "/檔案(_F)/清空刪除的郵件(_t)"
 
-#: src/mainwindow.c:486 src/messageview.c:138
+#: src/mainwindow.c:489 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:487 src/messageview.c:139
+#: src/mainwindow.c:490 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/檔案(_F)/列印...(_P)"
 
-#: src/mainwindow.c:489
+#: src/mainwindow.c:492
 msgid "/_File/_Work offline"
 msgstr "/檔案(_F)/離線工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:492
+#: src/mainwindow.c:495
 msgid "/_File/E_xit"
 msgstr "/檔案(_F)/離開(_X)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:500
 msgid "/_Edit/Select _thread"
 msgstr "/編輯(_E)/選取串列(_t)"
 
-#: src/mainwindow.c:499 src/messageview.c:147
+#: src/mainwindow.c:502 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/編輯(_E)/在目前信件中尋找(_F)"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:504
 msgid "/_Edit/_Search messages..."
 msgstr "/編輯(_E)/尋找信件(_S)"
 
-#: src/mainwindow.c:504
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de"
 msgstr "/顯示(_V)/顯示或隱藏(_d)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:508
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/資料夾列表(_F)"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:510
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/信件預覽(_M)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:514
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/圖樣與文字(_a)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:516
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/圖樣(_I)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:518
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/文字(_T)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:520
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/不顯示(_N)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:522
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/狀態列(_b)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:525
 msgid "/_View/Separate f_older tree"
 msgstr "/顯示(_V)/將資料夾列表分離(_o)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/顯示(_V)/將信件預覽分離(_e)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:528
 msgid "/_View/_Sort"
 msgstr "/顯示(_V)/排序(_S)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:529
 msgid "/_View/_Sort/by _number"
 msgstr "/顯示(_V)/排序(_S)/用編號排序(_n)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by s_ize"
 msgstr "/顯示(_V)/排序(_S)/用大小排序(_i)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by _date"
 msgstr "/顯示(_V)/排序(_S)/用日期排序(_d)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _from"
 msgstr "/顯示(_V)/排序(_S)/用來源排序(_f)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _recipient"
 msgstr "/顯示(_V)/排序(_S)/用收件人排序(_i)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _subject"
 msgstr "/顯示(_V)/排序(_S)/用標題排序(_s)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by _color label"
 msgstr "/顯示(_V)/排序(_S)/用標記顏色排序(_c)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _mark"
 msgstr "/顯示(_V)/排序(_S)/用標記排序(_m)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _unread"
 msgstr "/顯示(_V)/排序(_S)/依已讀或未讀排序(_u)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/顯示(_V)/排序(_S)/用附加檔排序(_t)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:541
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/顯示(_V)/排序(_S)/不排序(_o)"
 
-#: src/mainwindow.c:539 src/mainwindow.c:542
+#: src/mainwindow.c:542 src/mainwindow.c:545
 msgid "/_View/_Sort/---"
 msgstr "/顯示(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/Ascending"
 msgstr "/顯示(_V)/排序(_S)/遞增排序"
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/Descending"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/顯示(_V)/排序(_S)/用信件串列排序(_A)"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:548
 msgid "/_View/Th_read view"
 msgstr "/顯示(_V)/將信件串列顯示(_r)"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:549
 msgid "/_View/E_xpand all threads"
 msgstr "/顯示(_V)/展開所有信件串列(_x)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:550
 msgid "/_View/Co_llapse all threads"
 msgstr "/顯示(_V)/解除所有信件串列(_l)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "/_View/Set display _item..."
 msgstr "/顯示(_V)/設定顯示的項目...(_i)"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:554
 msgid "/_View/_Go to"
 msgstr "/顯示(_V)/前往(_G)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "/_View/_Go to/_Prev message"
 msgstr "/顯示(_V)/前往...(_G)/前一封信件(_P)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:556
 msgid "/_View/_Go to/_Next message"
 msgstr "/顯示(_V)/前往...(_G)/下一封信件(_N)"
 
-#: src/mainwindow.c:554 src/mainwindow.c:559 src/mainwindow.c:562
-#: src/mainwindow.c:567 src/mainwindow.c:572
+#: src/mainwindow.c:557 src/mainwindow.c:562 src/mainwindow.c:565
+#: src/mainwindow.c:570 src/mainwindow.c:575
 msgid "/_View/_Go to/---"
 msgstr "/顯示(_V)/前往...(_G)/---"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/顯示(_V)/前往...(_G)/前一封未讀信件(_r)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/顯示(_V)/前往...(_G)/下一封未讀信件(_e)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/顯示(_V)/前往...(_G)/前一封新信件(_w)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:564
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/顯示(_V)/前往...(_G)/下一封新信件(_x)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/顯示(_V)/前往...(_G)/前一封已標記信件(_m)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/顯示(_V)/前往...(_G)/下一封已標記信件(_a)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/顯示(_V)/前往...(_G)/前一封已標記顏色之信件(_l)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/顯示(_V)/前往...(_G)/下一封已標記顏色之信件(_b)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往...(_G)/到其他資料夾(_f)"
 
-#: src/mainwindow.c:582 src/messageview.c:158
+#: src/mainwindow.c:585 src/messageview.c:159
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字集(_C)/自動偵測(_A)"
 
-#: src/mainwindow.c:633 src/messageview.c:202
+#: src/mainwindow.c:636 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:635 src/messageview.c:204
+#: src/mainwindow.c:638 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:637 src/messageview.c:206
+#: src/mainwindow.c:640 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:649 src/messageview.c:217
+#: src/mainwindow.c:652 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字集(_C)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:655 src/messageview.c:222
+#: src/mainwindow.c:658 src/messageview.c:223
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字集(_C)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:668 src/summaryview.c:401
+#: src/mainwindow.c:671 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_w)"
 
-#: src/mainwindow.c:669 src/messageview.c:234
+#: src/mainwindow.c:672 src/messageview.c:235
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看信件原始碼(_a)"
 
-#: src/mainwindow.c:670 src/messageview.c:235
+#: src/mainwindow.c:673 src/messageview.c:236
 msgid "/_View/Show all _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_h)"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:675
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新信件列表(_U)"
 
-#: src/mainwindow.c:674 src/messageview.c:237
+#: src/mainwindow.c:677 src/messageview.c:238
 msgid "/_Message"
 msgstr "/信件(_M)"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:678
 msgid "/_Message/Recei_ve"
 msgstr "/信件(_M)/接收(_v)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:679
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/信件(_M)/接收(_v)/從目前帳號中接收新郵件(_c)"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:681
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/信件(_M)/接收(_v)/從所有帳號中接收新郵件(_a)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/信件(_M)/接收(_v)/取消接收(_g)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:685
 msgid "/_Message/Recei_ve/---"
 msgstr "/信件(_M)/接收(_v)/---"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:686
 msgid "/_Message/_Send queued messages"
 msgstr "/信件(_M)/將暫存資料夾中的信件送出(_S)"
 
-#: src/mainwindow.c:684 src/mainwindow.c:686 src/mainwindow.c:693
-#: src/mainwindow.c:698 src/mainwindow.c:702 src/mainwindow.c:711
-#: src/mainwindow.c:714 src/messageview.c:240 src/messageview.c:248
-#: src/messageview.c:253
+#: src/mainwindow.c:687 src/mainwindow.c:689 src/mainwindow.c:696
+#: src/mainwindow.c:701 src/mainwindow.c:705 src/mainwindow.c:714
+#: src/mainwindow.c:717 src/messageview.c:241 src/messageview.c:249
+#: src/messageview.c:254
 msgid "/_Message/---"
 msgstr "/信件(_M)/---"
 
-#: src/mainwindow.c:685 src/messageview.c:238
+#: src/mainwindow.c:688 src/messageview.c:239
 msgid "/_Message/Compose _new message"
 msgstr "/信件(_M)/撰寫郵件(_n)"
 
-#: src/mainwindow.c:687 src/messageview.c:241
+#: src/mainwindow.c:690 src/messageview.c:242
 msgid "/_Message/_Reply"
 msgstr "/信件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:691
 msgid "/_Message/Repl_y to"
 msgstr "/信件(_M)/回覆給(_y)"
 
-#: src/mainwindow.c:689 src/messageview.c:242
+#: src/mainwindow.c:692 src/messageview.c:243
 msgid "/_Message/Repl_y to/_all"
 msgstr "/信件(_M)/回覆給(_y)/所有收件人(_a)"
 
-#: src/mainwindow.c:690 src/messageview.c:244
+#: src/mainwindow.c:693 src/messageview.c:245
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/信件(_M)/回覆給(_y)/原作者(_s)"
 
-#: src/mainwindow.c:691 src/messageview.c:246
+#: src/mainwindow.c:694 src/messageview.c:247
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/信件(_M)/回覆給(_y)/Mailing List(_l)"
 
-#: src/mainwindow.c:694 src/messageview.c:249
+#: src/mainwindow.c:697 src/messageview.c:250
 msgid "/_Message/_Forward"
 msgstr "/信件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:695 src/messageview.c:250
+#: src/mainwindow.c:698 src/messageview.c:251
 msgid "/_Message/For_ward as attachment"
 msgstr "/信件(_M)/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:697 src/messageview.c:252
+#: src/mainwindow.c:700 src/messageview.c:253
 msgid "/_Message/Redirec_t"
 msgstr "/信件(_M)/信件導向(_t)"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:702
 msgid "/_Message/M_ove..."
 msgstr "/信件(_M)/移動...(_o)"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:703
 msgid "/_Message/_Copy..."
 msgstr "/信件(_M)/複製...(_C)"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:704
 msgid "/_Message/_Delete"
 msgstr "/信件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:706
 msgid "/_Message/_Mark"
 msgstr "/信件(_M)/標記(_M)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:707
 msgid "/_Message/_Mark/_Mark"
 msgstr "/信件(_M)/標記(_M)/標記(_M)"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:708
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/信件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:709
 msgid "/_Message/_Mark/---"
 msgstr "/信件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:710
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/信件(_M)/標記(_M)/標記成未讀(_e)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/信件(_M)/標記(_M)/標記成已讀(_d)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/信件(_M)/標記(_M)/標記所有信件成已讀(_d)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:715
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/信件(_M)/接收新郵件(_i)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/信件(_M)/接收新郵件(_i)"
 
-#: src/mainwindow.c:715 src/messageview.c:254
+#: src/mainwindow.c:718 src/messageview.c:255
 msgid "/_Message/Re-_edit"
 msgstr "/信件(_M)/重新編輯(_e)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:722
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/將寄信人加入位址簿(_k)"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:725
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有信件(_F)"
 
-#: src/mainwindow.c:724
+#: src/mainwindow.c:727
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的信件(_F)"
 
-#: src/mainwindow.c:726 src/messageview.c:261
+#: src/mainwindow.c:729 src/messageview.c:262
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生信件過濾規則(_C)"
 
-#: src/mainwindow.c:727 src/messageview.c:263
+#: src/mainwindow.c:730 src/messageview.c:264
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:729 src/messageview.c:265
+#: src/mainwindow.c:732 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:731 src/messageview.c:267
+#: src/mainwindow.c:734 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:733 src/messageview.c:269
+#: src/mainwindow.c:736 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依標題(_S)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/過濾資料夾中所有信件(_F)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:741
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/過濾選擇的信件(_F)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:746
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的信件(_p)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:749
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/執行(_x)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:751
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:753
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:754
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定...(_C)"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:756
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/信件過濾設定...(_F)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:758
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/信件樣板設定...(_T)"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定...(_A)"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:760
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:763
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號...(_n)"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:765
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號...(_E)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_h)"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:771
 msgid "/_Help/_Manual"
 msgstr "/說明(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "/_Help/_Manual/_English"
 msgstr "/說明(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/說明(_H)/說明文件(_M)/日文(_J)"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "/_Help/_FAQ"
 msgstr "/說明(_H)/常問問題解答(_F)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "/_Help/_FAQ/_English"
 msgstr "/說明(_H)/常問問題解答(_F)/英文(_E)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:776
 msgid "/_Help/_FAQ/_German"
 msgstr "/說明(_H)/常問問題解答(_F)/德文(_F)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:777
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/說明(_H)/常問問題解答(_F)/西班牙文(_S)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "/_Help/_FAQ/_French"
 msgstr "/說明(_H)/常問問題解答(_F)/法文(_F)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_E)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:780
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:822
 msgid "Creating main window...\n"
 msgstr "產生主視窗...\n"
 
-#: src/mainwindow.c:980
+#: src/mainwindow.c:983
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1064 src/summaryview.c:2021 src/summaryview.c:2106
+#: src/mainwindow.c:1067 src/summaryview.c:2021 src/summaryview.c:2106
 #: src/summaryview.c:3343 src/summaryview.c:3416 src/summaryview.c:3729
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1189 src/mainwindow.c:1230 src/mainwindow.c:1258
+#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1259
+#: src/mainwindow.c:1262
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1309
+#: src/mainwindow.c:1312
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changing window separation type from %d to %d\n"
 
-#: src/mainwindow.c:1529
+#: src/mainwindow.c:1532
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1533
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1544
+#: src/mainwindow.c:1547
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1545
+#: src/mainwindow.c:1548
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1573
+#: src/mainwindow.c:1576
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1574
+#: src/mainwindow.c:1577
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3248,16 +3442,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱。\n"
 "系統將會自動判別是否信箱已存在。"
 
-#: src/mainwindow.c:1580
+#: src/mainwindow.c:1583
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱 %s 已存在。"
 
-#: src/mainwindow.c:1585 src/setup.c:57
+#: src/mainwindow.c:1588 src/setup.c:57
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1591 src/setup.c:63
+#: src/mainwindow.c:1594 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3266,150 +3460,149 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:1982
+#: src/mainwindow.c:1985
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾列表"
 
-#: src/mainwindow.c:2002 src/messageview.c:368
+#: src/mainwindow.c:2005 src/messageview.c:369
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 信件列表"
 
-#: src/mainwindow.c:2149 src/summaryview.c:370
+#: src/mainwindow.c:2152 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2153
 msgid "/Reply to _all"
 msgstr "/全部回覆(_a)"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2154
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_s)"
 
-#: src/mainwindow.c:2152
+#: src/mainwindow.c:2155
 msgid "/Reply to mailing _list"
 msgstr "/回覆到 Mailing list(_l)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:377
+#: src/mainwindow.c:2160 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:378
+#: src/mainwindow.c:2161 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:2159 src/summaryview.c:379
+#: src/mainwindow.c:2162 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/信件導向(_t)"
 
-#: src/mainwindow.c:2195
+#: src/mainwindow.c:2198
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2196
+#: src/mainwindow.c:2199
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2203
+#: src/mainwindow.c:2206
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2204
+#: src/mainwindow.c:2207
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2218
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的信件送出"
 
-#: src/mainwindow.c:2225 src/prefs_account.c:730 src/prefs_common.c:952
-#: src/prefs_folder_item.c:138
+#: src/mainwindow.c:2228 src/prefs_folder_item.c:138
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2234 src/prefs_common.c:1451
+#: src/mainwindow.c:2237
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2235 src/mainwindow.c:2248
+#: src/mainwindow.c:2238 src/mainwindow.c:2251
 msgid "Reply to the message"
 msgstr "回覆信件"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2255
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2253
+#: src/mainwindow.c:2256
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2261 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2262 src/mainwindow.c:2275
+#: src/mainwindow.c:2265 src/mainwindow.c:2278
 msgid "Forward the message"
 msgstr "轉寄信件"
 
-#: src/mainwindow.c:2282
+#: src/mainwindow.c:2285
 msgid "Delete the message"
 msgstr "刪除信件"
 
-#: src/mainwindow.c:2290 src/prefs_common.c:1982
+#: src/mainwindow.c:2293
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2291
+#: src/mainwindow.c:2294
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "設為預設帳號"
 
-#: src/mainwindow.c:2300
+#: src/mainwindow.c:2303
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2301
+#: src/mainwindow.c:2304
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2311
+#: src/mainwindow.c:2314
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2324
+#: src/mainwindow.c:2327
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2332 src/prefs_folder_item.c:262
+#: src/mainwindow.c:2335 src/prefs_folder_item.c:262
 #: src/prefs_folder_item.c:273 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2505
+#: src/mainwindow.c:2508
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2516
+#: src/mainwindow.c:2519
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2709
+#: src/mainwindow.c:2712
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
@@ -3527,32 +3720,32 @@ msgstr "搜尋已到尾端。要從頂端繼續搜尋嗎？"
 msgid "Search finished"
 msgstr "搜尋結束"
 
-#: src/messageview.c:258
+#: src/messageview.c:259
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/將寄信人加入位址簿(_k)"
 
-#: src/messageview.c:288
+#: src/messageview.c:289
 msgid "Creating message view...\n"
 msgstr "產生信件視窗...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1647
+#: src/messageview.c:314
 msgid "Text"
 msgstr "文字"
 
-#: src/messageview.c:318
+#: src/messageview.c:319
 msgid "Attachments"
 msgstr "附加檔"
 
-#: src/messageview.c:658 src/summaryview.c:2944
+#: src/messageview.c:659 src/summaryview.c:2944
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案 `%s'。"
 
-#: src/messageview.c:713 src/prefs_common.c:2365 src/summaryview.c:2963
+#: src/messageview.c:714 src/summaryview.c:2963
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:714 src/summaryview.c:2964
+#: src/messageview.c:715 src/summaryview.c:2964
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3561,7 +3754,7 @@ msgstr ""
 "請輸入列印指令：\n"
 "（ `%s' 將會被置換為檔名）"
 
-#: src/messageview.c:720 src/summaryview.c:2970
+#: src/messageview.c:721 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3570,41 +3763,6 @@ msgstr ""
 "輸入的列印指令有誤：\n"
 "`%s'"
 
-#: src/mh.c:412
-#, c-format
-msgid "can't copy message %s to %s\n"
-msgstr "無法將信件從 %s 搬移到 %s。\n"
-
-#: src/mh.c:486 src/mh.c:607
-msgid "Can't open mark file.\n"
-msgstr "無法開啟標記的檔案。\n"
-
-#: src/mh.c:493 src/mh.c:613
-msgid "the src folder is identical to the dest.\n"
-msgstr "來源與目的資料夾相同。\n"
-
-#: src/mh.c:616
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr ""
-
-#: src/mh.c:783
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr ""
-
-#: src/mh.c:1321
-#, c-format
-msgid ""
-"Directory name\n"
-"'%s' is not a valid UTF-8 string.\n"
-"Maybe the locale encoding is used for filename.\n"
-"If that is the case, you must set the following environmental variable\n"
-"(see README for detail):\n"
-"\n"
-"\tG_FILENAME_ENCODING=@locale\n"
-msgstr ""
-
 #: src/mimeview.c:124
 msgid "/_Open"
 msgstr "/開啟(_O)"
@@ -3691,115 +3849,15 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "開啟此 MIME 型態的命令是錯誤的：`%s'"
 
-#: src/news.c:209
-#, c-format
-msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "產生新聞通訊協定連線到 %s:%d , 請稍候...\n"
-
-#: src/news.c:279
-#, c-format
-msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
-msgstr "到 %s:%d 的新聞通訊協定連線被中斷了。重新連線中...\n"
-
-#: src/news.c:370
-#, c-format
-msgid "article %d has been already cached.\n"
-msgstr ""
-
-#: src/news.c:390
-#, c-format
-msgid "getting article %d...\n"
-msgstr ""
-
-#: src/news.c:394
-#, c-format
-msgid "can't read article %d\n"
-msgstr "無法讀取文章 %d\n"
-
-#: src/news.c:548
-msgid "can't retrieve newsgroup list\n"
-msgstr "無法取得新聞群組列表\n"
-
-#: src/news.c:661
-msgid "can't post article.\n"
-msgstr "無法發表文章\n"
-
-#: src/news.c:687
-#, c-format
-msgid "can't retrieve article %d\n"
-msgstr "無法取得文章 %d\n"
-
-#: src/news.c:744
-#, c-format
-msgid "can't select group: %s\n"
-msgstr "無法選擇新聞群組：%s\n"
-
-#: src/news.c:781
-#, c-format
-msgid "invalid article range: %d - %d\n"
-msgstr "錯誤的文章範圍：%d - %d\n"
-
-#: src/news.c:794
-msgid "no new articles.\n"
-msgstr "沒有新文章。\n"
-
-#: src/news.c:804
-#, c-format
-msgid "getting xover %d - %d in %s...\n"
-msgstr ""
-
-#: src/news.c:808
-msgid "can't get xover\n"
-msgstr "無法取得 xover\n"
-
-#: src/news.c:818
-msgid "error occurred while getting xover.\n"
-msgstr "取得 xover 時發生錯誤。\n"
-
-#: src/news.c:828
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr "xover 內容錯誤：%s\n"
-
-#: src/news.c:847 src/news.c:879
-msgid "can't get xhdr\n"
-msgstr "無法取得 xover\n"
-
-#: src/news.c:859 src/news.c:891
-msgid "error occurred while getting xhdr.\n"
-msgstr "取得 xover 時發生錯誤。\n"
-
-#: src/nntp.c:68
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "無法連線到新聞伺服器：%s:%d\n"
-
-#: src/nntp.c:164 src/nntp.c:227
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "通訊協定有錯誤：%s\n"
-
-#: src/nntp.c:187 src/nntp.c:233
-msgid "protocol error\n"
-msgstr "通訊協定有錯誤\n"
-
-#: src/nntp.c:283
-msgid "Error occurred while posting\n"
-msgstr "發表文章時發生錯誤\n"
-
-#: src/nntp.c:363
-msgid "Error occurred while sending command\n"
-msgstr "送出命令時發生錯誤。\n"
-
-#: src/passphrase.c:88
+#: src/passphrase.c:90
 msgid "Passphrase"
 msgstr "密碼片語"
 
-#: src/passphrase.c:239
+#: src/passphrase.c:241
 msgid "[no user id]"
 msgstr "[找不到使用者]"
 
-#: src/passphrase.c:247
+#: src/passphrase.c:249
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3808,7 +3866,7 @@ msgid ""
 "(%.*s)\n"
 msgstr "%s請輸入 %.*s (%.*s) 的密碼片語:\n"
 
-#: src/passphrase.c:251
+#: src/passphrase.c:253
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3816,451 +3874,6 @@ msgstr ""
 "無效的密碼片語! 請再試一次...\n"
 "\n"
 
-#: src/pop.c:149
-msgid "Required APOP timestamp not found in greeting\n"
-msgstr "在通訊中找不到 APOP 的 timestamp。\n"
-
-#: src/pop.c:156
-msgid "Timestamp syntax error in greeting\n"
-msgstr "通訊中的 timestamp 語法錯誤\n"
-
-#: src/pop.c:182 src/pop.c:209
-msgid "POP3 protocol error\n"
-msgstr "POP3 協定有錯誤\n"
-
-#: src/pop.c:254
-#, c-format
-msgid "invalid UIDL response: %s\n"
-msgstr "UIDL 回應錯誤：%s\n"
-
-#: src/pop.c:616
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: 刪除過期的信件 %d\n"
-
-#: src/pop.c:624
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: 略過郵件 %d (%d bytes)\n"
-
-#: src/pop.c:655
-msgid "mailbox is locked\n"
-msgstr "信箱已被鎖定，可能前一次抓取未完成。\n"
-
-#: src/pop.c:658
-msgid "session timeout\n"
-msgstr "作業逾時\n"
-
-#: src/pop.c:664 src/smtp.c:557
-msgid "can't start TLS session\n"
-msgstr "無法啟動 TLS\n"
-
-#: src/pop.c:671 src/smtp.c:492
-msgid "error occurred on authentication\n"
-msgstr "認證時發生錯誤\n"
-
-#: src/pop.c:676
-msgid "command not supported\n"
-msgstr "命令未支援\n"
-
-#: src/pop.c:680
-msgid "error occurred on POP3 session\n"
-msgstr "使用 POP3 通訊協定時發生錯誤\n"
-
-#: src/prefs_account.c:631
-msgid "Opening account preferences window...\n"
-msgstr "開啟帳號設定的視窗...\n"
-
-#: src/prefs_account.c:659
-#, c-format
-msgid "Account%d"
-msgstr "帳號 %d"
-
-#: src/prefs_account.c:678
-msgid "Preferences for new account"
-msgstr "新帳號設定"
-
-#: src/prefs_account.c:683
-msgid "Account preferences"
-msgstr "帳號設定"
-
-#: src/prefs_account.c:706
-msgid "Creating account preferences window...\n"
-msgstr "產生帳號設定的視窗...\n"
-
-#: src/prefs_account.c:726 src/prefs_common.c:948
-msgid "Receive"
-msgstr "接收設定"
-
-#: src/prefs_account.c:733 src/prefs_common.c:963
-msgid "Privacy"
-msgstr "私人資料"
-
-#: src/prefs_account.c:737
-msgid "SSL"
-msgstr ""
-
-#: src/prefs_account.c:740 src/prefs_common.c:970
-msgid "Advanced"
-msgstr "進階設定"
-
-#: src/prefs_account.c:789
-msgid "Name of this account"
-msgstr "這個帳號的名稱"
-
-#: src/prefs_account.c:798
-msgid "Set as default"
-msgstr "設為預設帳號"
-
-#: src/prefs_account.c:802
-msgid "Personal information"
-msgstr "個人資訊"
-
-#: src/prefs_account.c:811
-msgid "Full name"
-msgstr "全名"
-
-#: src/prefs_account.c:817
-msgid "Mail address"
-msgstr "電子郵件地址"
-
-#: src/prefs_account.c:823
-msgid "Organization"
-msgstr "服務公司/組織"
-
-#: src/prefs_account.c:847
-msgid "Server information"
-msgstr "伺服器資訊"
-
-#: src/prefs_account.c:868 src/prefs_account.c:1023 src/prefs_account.c:1659
-msgid "POP3"
-msgstr ""
-
-#: src/prefs_account.c:870 src/prefs_account.c:1128 src/prefs_account.c:1676
-#: src/prefs_account.c:1851
-msgid "IMAP4"
-msgstr ""
-
-#: src/prefs_account.c:872
-msgid "News (NNTP)"
-msgstr "新聞 (NNTP)"
-
-#: src/prefs_account.c:874
-msgid "None (local)"
-msgstr "無 (local)"
-
-#: src/prefs_account.c:887
-msgid "This server requires authentication"
-msgstr "這個伺服器需要認證"
-
-#: src/prefs_account.c:926
-msgid "News server"
-msgstr "新聞伺服器"
-
-#: src/prefs_account.c:932
-msgid "Server for receiving"
-msgstr "接收郵件伺服器"
-
-#: src/prefs_account.c:938
-msgid "SMTP server (send)"
-msgstr "發送郵件伺服器 (SMTP)"
-
-#: src/prefs_account.c:945 src/prefs_account.c:1320
-msgid "User ID"
-msgstr "帳號"
-
-#: src/prefs_account.c:951 src/prefs_account.c:1329
-msgid "Password"
-msgstr "密碼"
-
-#: src/prefs_account.c:1031
-msgid "Use secure authentication (APOP)"
-msgstr "使用安全認證（APOP）"
-
-#: src/prefs_account.c:1034
-msgid "Remove messages on server when received"
-msgstr "接收郵件時一併從伺服器上移除。"
-
-#: src/prefs_account.c:1045
-msgid "Remove after"
-msgstr "在幾天後刪除："
-
-#: src/prefs_account.c:1054
-msgid "days"
-msgstr "天"
-
-#: src/prefs_account.c:1071
-msgid "(0 days: remove immediately)"
-msgstr "(設為 0 則為立即刪除)"
-
-#: src/prefs_account.c:1078
-msgid "Download all messages on server"
-msgstr "接收伺服器上所有的郵件。"
-
-#: src/prefs_account.c:1084
-msgid "Receive size limit"
-msgstr "接收郵件大小限制"
-
-#: src/prefs_account.c:1091 src/prefs_filter_edit.c:643
-#: src/prefs_filter_edit.c:1047
-msgid "KB"
-msgstr ""
-
-#: src/prefs_account.c:1098
-msgid "Filter messages on receiving"
-msgstr "接收信件時進行過濾"
-
-#: src/prefs_account.c:1106
-msgid "Default inbox"
-msgstr "預設的收件夾"
-
-#: src/prefs_account.c:1126
-#, fuzzy
-msgid "Unfiltered messages will be stored in this folder."
-msgstr "（未經過濾的信件將會被送到這個資料夾上）"
-
-#: src/prefs_account.c:1139 src/prefs_account.c:1290
-msgid "Authentication method"
-msgstr "認證方法"
-
-#: src/prefs_account.c:1149 src/prefs_account.c:1300 src/prefs_common.c:1297
-msgid "Automatic"
-msgstr "自動"
-
-#: src/prefs_account.c:1155
-msgid "News"
-msgstr "新聞"
-
-#: src/prefs_account.c:1167
-#, fuzzy
-msgid "Maximum number of articles to download"
-msgstr ""
-"一次下載文章數量上限\n"
-"(設為 0 則不限制數量)"
-
-#: src/prefs_account.c:1184
-#, fuzzy
-msgid "No limit if 0 is specified."
-msgstr "沒有指定收件人。"
-
-#: src/prefs_account.c:1188
-msgid "`Get all' checks for new messages on this account"
-msgstr "「全部檢查」時檢查這個帳號的新郵件"
-
-#: src/prefs_account.c:1240 src/prefs_customheader.c:190
-msgid "Header"
-msgstr "信件標頭設定"
-
-#: src/prefs_account.c:1247
-msgid "Add Date header field"
-msgstr "加入日期"
-
-#: src/prefs_account.c:1248
-msgid "Generate Message-ID"
-msgstr "產生郵件識別碼"
-
-#: src/prefs_account.c:1255
-msgid "Add user-defined header"
-msgstr "加入使用者定義的標頭"
-
-#: src/prefs_account.c:1257 src/prefs_common.c:1804 src/prefs_common.c:1829
-msgid " Edit... "
-msgstr "編輯..."
-
-#: src/prefs_account.c:1267
-msgid "Authentication"
-msgstr "認證"
-
-#: src/prefs_account.c:1275
-msgid "SMTP Authentication (SMTP AUTH)"
-msgstr "SMTP 認證"
-
-#: src/prefs_account.c:1351
-#, fuzzy
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr "若是此欄空白，將使用接收時的帳號與密碼。"
-
-#: src/prefs_account.c:1363
-msgid "Authenticate with POP3 before sending"
-msgstr "送信前先做 POP3 認證"
-
-#: src/prefs_account.c:1419
-msgid "Command output"
-msgstr "命令輸出"
-
-#: src/prefs_account.c:1430 src/prefs_folder_item.c:304
-msgid "Automatically set the following addresses"
-msgstr "在相關欄位上自動加入下列電子郵件信箱："
-
-#: src/prefs_account.c:1439
-msgid "Cc"
-msgstr "複本"
-
-#: src/prefs_account.c:1452
-msgid "Bcc"
-msgstr "密件複本"
-
-#: src/prefs_account.c:1465
-msgid "Reply-To"
-msgstr "回信地址"
-
-#: src/prefs_account.c:1518
-msgid "Sign message by default"
-msgstr "信件自動做數位簽章"
-
-#: src/prefs_account.c:1520
-msgid "Encrypt message by default"
-msgstr "信件自動加密"
-
-#: src/prefs_account.c:1522
-msgid "Encrypt when replying to encrypted message"
-msgstr ""
-
-#: src/prefs_account.c:1524
-msgid "Use ASCII-armored format for encryption"
-msgstr "使用 ASCII-armored 格式做加密"
-
-#: src/prefs_account.c:1526
-msgid "Use clear text signature"
-msgstr "使用明碼簽名"
-
-#: src/prefs_account.c:1531
-msgid "Sign key"
-msgstr "簽章鑰匙"
-
-#: src/prefs_account.c:1539
-msgid "Use default GnuPG key"
-msgstr "使用預設的 GnuPG key"
-
-#: src/prefs_account.c:1548
-msgid "Select key by your email address"
-msgstr "根據你的電子郵件地址選擇 key"
-
-#: src/prefs_account.c:1557
-msgid "Specify key manually"
-msgstr "手動指定 key"
-
-#: src/prefs_account.c:1573
-msgid "User or key ID:"
-msgstr "使用者代號或 key 的識別碼："
-
-#: src/prefs_account.c:1667 src/prefs_account.c:1684 src/prefs_account.c:1700
-#: src/prefs_account.c:1718
-msgid "Don't use SSL"
-msgstr "不使用 SSL"
-
-#: src/prefs_account.c:1670
-msgid "Use SSL for POP3 connection"
-msgstr "POP3 連線時使用 SSL"
-
-#: src/prefs_account.c:1673 src/prefs_account.c:1690 src/prefs_account.c:1724
-msgid "Use STARTTLS command to start SSL session"
-msgstr "用 STARTTLS 命令來啟動 SSL"
-
-#: src/prefs_account.c:1687
-msgid "Use SSL for IMAP4 connection"
-msgstr "IMAP4 連線時使用 SSL"
-
-#: src/prefs_account.c:1693
-msgid "NNTP"
-msgstr ""
-
-#: src/prefs_account.c:1708
-msgid "Use SSL for NNTP connection"
-msgstr "NNTP 連線時使用 SSL"
-
-#: src/prefs_account.c:1710
-msgid "Send (SMTP)"
-msgstr "送信設定 (SMTP)"
-
-#: src/prefs_account.c:1721
-msgid "Use SSL for SMTP connection"
-msgstr "SMTP 連線時使用 SSL"
-
-#: src/prefs_account.c:1732
-msgid "Use non-blocking SSL"
-msgstr "使用 non-blocking SSL"
-
-#: src/prefs_account.c:1735
-#, fuzzy
-msgid "Turn this off if you have problems in SSL connection."
-msgstr "（若您使用 SSL 連線時發生問題，請關閉此選項）"
-
-#: src/prefs_account.c:1821
-msgid "Specify SMTP port"
-msgstr "指定 SMTP 連接埠"
-
-#: src/prefs_account.c:1827
-msgid "Specify POP3 port"
-msgstr "指定 POP3 連接埠"
-
-#: src/prefs_account.c:1833
-msgid "Specify IMAP4 port"
-msgstr "指定 IMAP4 連接埠"
-
-#: src/prefs_account.c:1839
-msgid "Specify NNTP port"
-msgstr "指定 NNTP 連接埠"
-
-#: src/prefs_account.c:1844
-msgid "Specify domain name"
-msgstr "指定網域"
-
-#: src/prefs_account.c:1862
-msgid "IMAP server directory"
-msgstr "IMAP 伺服器目錄"
-
-#: src/prefs_account.c:1916
-msgid "Put sent messages in"
-msgstr "將已送出之信件存到"
-
-#: src/prefs_account.c:1918
-msgid "Put draft messages in"
-msgstr "將信件草稿存到"
-
-#: src/prefs_account.c:1920
-msgid "Put deleted messages in"
-msgstr "將刪除信件存到"
-
-#: src/prefs_account.c:1981
-msgid "Account name is not entered."
-msgstr "未輸入帳號名稱。"
-
-#: src/prefs_account.c:1985
-msgid "Mail address is not entered."
-msgstr "未輸入電子郵件信箱。"
-
-#: src/prefs_account.c:1990
-msgid "SMTP server is not entered."
-msgstr "未輸入發送郵件伺服器。"
-
-#: src/prefs_account.c:1995
-msgid "User ID is not entered."
-msgstr "未輸入使用者帳號。"
-
-#: src/prefs_account.c:2000
-msgid "POP3 server is not entered."
-msgstr "未輸入接收郵件伺服器。"
-
-#: src/prefs_account.c:2005
-msgid "IMAP4 server is not entered."
-msgstr "未輸入接收郵件伺服器。"
-
-#: src/prefs_account.c:2010
-msgid "NNTP server is not entered."
-msgstr "未輸入新聞伺服器。"
-
-#: src/prefs_account.c:2092
-msgid ""
-"It's not recommended to use the old style ASCII-armored\n"
-"mode for encrypted messages. It doesn't comply with the\n"
-"RFC 3156 - MIME Security with OpenPGP."
-msgstr ""
-"注意：不建議您使用舊式的 ASCII-armored 模式來加密。因為\n"
-"它與 RFC 3156 - MIME Security with OpenPGP 不相容。"
-
 #: src/prefs_actions.c:172
 msgid "Actions configuration"
 msgstr "外部指令設定"
@@ -4320,17 +3933,17 @@ msgstr "語法說明"
 msgid "Registered actions"
 msgstr "已加入之指令目錄"
 
-#: src/prefs_actions.c:309 src/prefs_customheader.c:282
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
 #: src/prefs_display_header.c:286 src/prefs_summary_column.c:284
 msgid "Up"
 msgstr "向上"
 
-#: src/prefs_actions.c:315 src/prefs_customheader.c:288
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
 #: src/prefs_display_header.c:292 src/prefs_summary_column.c:288
 msgid "Down"
 msgstr "向下"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:315
+#: src/prefs_actions.c:422 src/prefs_template.c:316
 msgid "(New)"
 msgstr "（新）"
 
@@ -4373,828 +3986,31 @@ msgstr "刪除指令"
 msgid "Do you really want to delete this action?"
 msgstr "您確定要刪除這個指令嗎？"
 
-#: src/prefs_common.c:918
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "資料夾："
-
-#: src/prefs_common.c:928
-msgid "Creating common preferences window...\n"
-msgstr "產生一般設定視窗...\n"
-
-#: src/prefs_common.c:932
-msgid "Common Preferences"
-msgstr "一般設定"
-
-#: src/prefs_common.c:954
-msgid "Quote"
-msgstr "引言"
-
-#: src/prefs_common.c:956
-msgid "Display"
-msgstr "顯示"
-
-#: src/prefs_common.c:958
-msgid "Message"
-msgstr "信件"
-
-#: src/prefs_common.c:960
-msgid "Junk mail"
-msgstr ""
-
-#: src/prefs_common.c:968 src/select-keys.c:344
-msgid "Other"
-msgstr "其他"
-
-#: src/prefs_common.c:1012
-msgid "Use external program for incorporation"
-msgstr "用其他外部程式來收信"
-
-#: src/prefs_common.c:1024 src/prefs_common.c:1113 src/prefs_common.c:1189
-msgid "Command"
-msgstr "命令列"
-
-#: src/prefs_common.c:1039
-#, fuzzy
-msgid "Incorporate from local spool"
-msgstr "從 spool 取得信件"
-
-#: src/prefs_common.c:1052
-msgid "Filter on incorporation"
-msgstr "收信時過濾"
-
-#: src/prefs_common.c:1058
-msgid "Spool path"
-msgstr "Spool 路徑"
-
-#: src/prefs_common.c:1076
-msgid "Auto-check new mail"
-msgstr "自動檢查新郵件"
-
-#: src/prefs_common.c:1078
-msgid "every"
-msgstr "每"
-
-#: src/prefs_common.c:1090
-msgid "minute(s)"
-msgstr "分鐘"
-
-#: src/prefs_common.c:1099
-msgid "Check new mail on startup"
-msgstr "開啟時檢查新郵件"
-
-#: src/prefs_common.c:1101
-msgid "Update all local folders after incorporation"
-msgstr "收信後更新所有資料夾"
-
-#: src/prefs_common.c:1105
-#, fuzzy
-msgid "Execute command when new messages arrived"
-msgstr "移動或刪除信件時立即執行"
-
-#: src/prefs_common.c:1126
-#, fuzzy, c-format
-msgid "`%d' will be replaced with the number of new messages."
-msgstr "取得新郵件的數量中"
-
-#: src/prefs_common.c:1177
-msgid "Use external program for sending"
-msgstr "用其他外部程式來送信"
-
-#: src/prefs_common.c:1208
-msgid "Save sent messages to outbox"
-msgstr "將已送出之信件存到寄件夾"
-
-#: src/prefs_common.c:1210
-msgid "Apply filter rules to sent messages"
-msgstr ""
-
-#: src/prefs_common.c:1216
-#, fuzzy
-msgid "Outgoing encoding"
-msgstr "輸出字集"
-
-#: src/prefs_common.c:1231
-msgid "Automatic (Recommended)"
-msgstr "自動選擇（推薦使用）"
-
-#: src/prefs_common.c:1233
-msgid "7bit ascii (US-ASCII)"
-msgstr "7位元 ASCII 字集"
-
-#: src/prefs_common.c:1235
-msgid "Unicode (UTF-8)"
-msgstr ""
-
-#: src/prefs_common.c:1237
-msgid "Western European (ISO-8859-1)"
-msgstr "西歐語系 (ISO-8859-1)"
-
-#: src/prefs_common.c:1238
-msgid "Western European (ISO-8859-15)"
-msgstr "西歐語系 (ISO-8859-15)"
-
-#: src/prefs_common.c:1240
-msgid "Central European (ISO-8859-2)"
-msgstr "中歐語系 (ISO-8859-2)"
-
-#: src/prefs_common.c:1242
-msgid "Baltic (ISO-8859-13)"
-msgstr "波羅的海語系 (ISO-8859-13)"
-
-#: src/prefs_common.c:1243
-msgid "Baltic (ISO-8859-4)"
-msgstr "波羅的海語系 (ISO-8859-4)"
-
-#: src/prefs_common.c:1245
-msgid "Greek (ISO-8859-7)"
-msgstr "希臘語 (ISO-8859-7)"
-
-#: src/prefs_common.c:1247
-#, fuzzy
-msgid "Hebrew (ISO-8859-8)"
-msgstr "希臘語 (ISO-8859-7)"
-
-#: src/prefs_common.c:1248
-#, fuzzy
-msgid "Hebrew (Windows-1255)"
-msgstr "斯拉夫語 (Windows-1251)"
-
-#: src/prefs_common.c:1250
-msgid "Turkish (ISO-8859-9)"
-msgstr "土耳其語 (ISO-8859-9)"
-
-#: src/prefs_common.c:1252
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "斯拉夫語 (ISO-8859-5)"
-
-#: src/prefs_common.c:1253
-msgid "Cyrillic (KOI8-R)"
-msgstr "斯拉夫語 (KOI8-R)"
-
-#: src/prefs_common.c:1254
-msgid "Cyrillic (KOI8-U)"
-msgstr "斯拉夫語 (KOI8-U)"
-
-#: src/prefs_common.c:1255
-msgid "Cyrillic (Windows-1251)"
-msgstr "斯拉夫語 (Windows-1251)"
-
-#: src/prefs_common.c:1257
-msgid "Japanese (ISO-2022-JP)"
-msgstr "日文 (ISO-2022-JP)"
-
-#: src/prefs_common.c:1259
-msgid "Japanese (EUC-JP)"
-msgstr "日文 (EUC-JP)"
-
-#: src/prefs_common.c:1260
-msgid "Japanese (Shift_JIS)"
-msgstr "日文 (Shift_JIS)"
-
-#: src/prefs_common.c:1263
-msgid "Simplified Chinese (GB2312)"
-msgstr "簡體中文 (GB2312)"
-
-#: src/prefs_common.c:1264
-#, fuzzy
-msgid "Simplified Chinese (GBK)"
-msgstr "簡體中文 (GB2312)"
-
-#: src/prefs_common.c:1265
-msgid "Traditional Chinese (Big5)"
-msgstr "繁體中文 (Big5)"
-
-#: src/prefs_common.c:1267
-msgid "Traditional Chinese (EUC-TW)"
-msgstr "繁體中文 (EUC-TW)"
-
-#: src/prefs_common.c:1268
-msgid "Chinese (ISO-2022-CN)"
-msgstr "中文 (ISO-2022-CN)"
-
-#: src/prefs_common.c:1271
-msgid "Korean (EUC-KR)"
-msgstr "韓文 (EUC-KR)"
-
-#: src/prefs_common.c:1273
-msgid "Thai (TIS-620)"
-msgstr "泰文 (TIS-620)"
-
-#: src/prefs_common.c:1274
-msgid "Thai (Windows-874)"
-msgstr "泰文 (Windows-874)"
-
-#: src/prefs_common.c:1280
-#, fuzzy
-msgid ""
-"If `Automatic' is selected, the optimal encoding for the current locale will "
-"be used."
-msgstr ""
-"若是選用「自動選擇」，系統將為自動為您判斷使用最\n"
-"合用的語系設定。"
-
-#: src/prefs_common.c:1287
-msgid "Transfer encoding"
-msgstr "傳送之編碼"
-
-#: src/prefs_common.c:1306
-#, fuzzy
-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters."
-msgstr "請指定當郵件主體內容包含非 ASCII 字元時，使用哪種編碼來傳送內容。"
-
-#: src/prefs_common.c:1370
-msgid "Signature separator"
-msgstr "簽名分隔符號"
-
-#: src/prefs_common.c:1379
-msgid "Insert automatically"
-msgstr "自動加入簽名"
-
-#: src/prefs_common.c:1389
-msgid "Automatically launch the external editor"
-msgstr "自動呼叫外部編輯器"
-
-#: src/prefs_common.c:1399
-msgid "Undo level"
-msgstr "復原紀錄"
-
-#: src/prefs_common.c:1419
-msgid "Wrap messages at"
-msgstr "每行最多"
-
-#: src/prefs_common.c:1431
-msgid "characters"
-msgstr "個字元"
-
-#: src/prefs_common.c:1441
-msgid "Wrap quotation"
-msgstr "折行時顯示符號"
-
-#: src/prefs_common.c:1447
-msgid "Wrap on input"
-msgstr "切割輸入過長的文字行"
-
-#: src/prefs_common.c:1449
-msgid "Wrap before sending"
-msgstr "寄送之前自動折行"
-
-#: src/prefs_common.c:1459
-msgid "Automatically select account for replies"
-msgstr "回信時在相關欄位上自動加入下列電子郵件信箱："
-
-#: src/prefs_common.c:1461
-msgid "Quote message when replying"
-msgstr "回信時引用原文"
-
-#: src/prefs_common.c:1463
-msgid "Reply button invokes mailing list reply"
-msgstr "讀取 Mailing List 信件時按下「回覆」鈕表示回覆給 Mailing list"
-
-#. reply
-#: src/prefs_common.c:1509
-msgid "Reply format"
-msgstr "回覆格式"
-
-#: src/prefs_common.c:1524 src/prefs_common.c:1566
-msgid "Quotation mark"
-msgstr "引言符號"
-
-#. forward
-#: src/prefs_common.c:1551
-msgid "Forward format"
-msgstr "轉寄格式"
-
-#: src/prefs_common.c:1598
-msgid " Description of symbols "
-msgstr "特殊符號代表的意義"
-
-#: src/prefs_common.c:1638
-msgid "Font"
-msgstr "字型"
-
-#: src/prefs_common.c:1663
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "將標頭名稱翻譯出來"
-
-#: src/prefs_common.c:1666
-msgid "Display unread number next to folder name"
-msgstr "若有未讀信件，就顯示在資料夾名稱後面"
-
-#: src/prefs_common.c:1675
-msgid "Abbreviate newsgroups longer than"
-msgstr "新聞群組縮寫長度大於"
-
-#: src/prefs_common.c:1690
-msgid "letters"
-msgstr "個字母"
-
-#. ---- Summary ----
-#: src/prefs_common.c:1696
-msgid "Summary View"
-msgstr "信件列表"
-
-#: src/prefs_common.c:1705
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "若發信人是你自己，就在信件列表的來源中顯示收信人"
-
-#: src/prefs_common.c:1707
-msgid "Expand threads"
-msgstr "自動展開信件串列"
-
-#: src/prefs_common.c:1715 src/prefs_common.c:2685 src/prefs_common.c:2723
-msgid "Date format"
-msgstr "日期格式"
-
-#: src/prefs_common.c:1736
-msgid " Set display item of summary... "
-msgstr "設定信件列表選項..."
-
-#: src/prefs_common.c:1800
-msgid "Enable coloration of message"
-msgstr "信件中的引言與超連結顯示變色"
-
-#: src/prefs_common.c:1814
-msgid ""
-"Display multi-byte alphabet and numeric as\n"
-"ASCII character (Japanese only)"
-msgstr "將全形英文與數字以半形來顯示 (只適用日文)"
-
-#: src/prefs_common.c:1820
-msgid "Display header pane above message view"
-msgstr "在顯示信件欄上方加入標頭資訊"
-
-#: src/prefs_common.c:1827
-msgid "Display short headers on message view"
-msgstr "在信件預覽中顯示信件標頭"
-
-#: src/prefs_common.c:1839
-msgid "Render HTML messages as text"
-msgstr ""
-
-#: src/prefs_common.c:1843
-#, fuzzy
-msgid "Display cursor in message view"
-msgstr "在信件預覽中顯示信件標頭"
-
-#: src/prefs_common.c:1856
-msgid "Line space"
-msgstr "行間距"
-
-#: src/prefs_common.c:1870 src/prefs_common.c:1908
-msgid "pixel(s)"
-msgstr "像素 (pixels)"
-
-#: src/prefs_common.c:1875
-msgid "Scroll"
-msgstr "捲軸"
-
-#: src/prefs_common.c:1882
-msgid "Half page"
-msgstr "一次半頁"
-
-#: src/prefs_common.c:1888
-msgid "Smooth scroll"
-msgstr "平滑捲動"
-
-#: src/prefs_common.c:1894
-msgid "Step"
-msgstr "每次捲動"
-
-#: src/prefs_common.c:1914
-msgid "Images"
-msgstr ""
-
-#: src/prefs_common.c:1922
-msgid "Resize attached large images to fit in the window"
-msgstr "調整附加影像大小"
-
-#: src/prefs_common.c:1924
-#, fuzzy
-msgid "Display images as inline"
-msgstr "顯示標頭設定"
-
-#: src/prefs_common.c:1965
-msgid "Enable Junk mail control"
-msgstr ""
-
-#: src/prefs_common.c:1973
-#, fuzzy
-msgid "Learning command:"
-msgstr "執行命令"
-
-#: src/prefs_common.c:1994
-msgid "Not Junk"
-msgstr ""
-
-#: src/prefs_common.c:2009
-#, fuzzy
-msgid "Classifying command"
-msgstr "執行命令"
-
-#: src/prefs_common.c:2023
-#, fuzzy
-msgid "Junk folder"
-msgstr "資料夾："
-
-#: src/prefs_common.c:2041
-msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr ""
-
-#: src/prefs_common.c:2047
-#, fuzzy
-msgid "Filter messages classified as junk on receiving"
-msgstr "接收信件時進行過濾"
-
-#: src/prefs_common.c:2051
-#, fuzzy
-msgid ""
-"Filtered messages will be moved to the junk folder and deleted from the "
-"server."
-msgstr "（未經過濾的信件將會被送到這個資料夾上）"
-
-#: src/prefs_common.c:2089
-msgid "Automatically check signatures"
-msgstr "自動檢查數位簽章"
-
-#: src/prefs_common.c:2092
-msgid "Show signature check result in a popup window"
-msgstr "將數位簽章檢查結果顯示在另一視窗"
-
-#: src/prefs_common.c:2095
-msgid "Store passphrase in memory temporarily"
-msgstr "將密碼片語暫時存在記憶體中"
-
-#: src/prefs_common.c:2110
-msgid "Expired after"
-msgstr "期限："
-
-#: src/prefs_common.c:2123
-msgid "minute(s) "
-msgstr "分鐘"
-
-#: src/prefs_common.c:2137
-#, fuzzy
-msgid "Setting to '0' will store the passphrase for the whole session."
-msgstr "（若設定為 '0' 則表示沒有期限）"
-
-#: src/prefs_common.c:2146
-msgid "Grab input while entering a passphrase"
-msgstr "輸入 passphrase 時抓取輸入"
-
-#: src/prefs_common.c:2151
-msgid "Display warning on startup if GnuPG doesn't work"
-msgstr "若 GnuPG 無法運作，則在啟動時發出警告"
-
-#: src/prefs_common.c:2204
-msgid "Always open messages in summary when selected"
-msgstr "在信件列表選擇信件時開啟信件。"
-
-#: src/prefs_common.c:2208
-msgid "Open first unread message when entering a folder"
-msgstr "進入資料夾時直接跳到第一封未讀信件上"
-
-#: src/prefs_common.c:2212
-msgid "Only mark message as read when opened in new window"
-msgstr "只在開啟新信件時標示為未讀"
-
-#: src/prefs_common.c:2216
-msgid "Go to inbox after receiving new mail"
-msgstr "接收完新郵件後直接進入收件夾中"
-
-#: src/prefs_common.c:2224
-msgid "Execute immediately when moving or deleting messages"
-msgstr "移動或刪除信件時立即執行"
-
-#: src/prefs_common.c:2236
-#, fuzzy
-msgid "Messages will be marked until execution if this is turned off."
-msgstr "（若此選項關閉，則必須按下「執行」才會執行移動或刪除）"
-
-#: src/prefs_common.c:2239
-msgid "Receive dialog"
-msgstr "接收進度對話盒"
-
-#: src/prefs_common.c:2249
-msgid "Show receive dialog"
-msgstr "顯示接收信件的進度對話盒"
-
-#: src/prefs_common.c:2259
-msgid "Always"
-msgstr "一律顯示"
-
-#: src/prefs_common.c:2260
-msgid "Only on manual receiving"
-msgstr "只在手動收取郵件時顯示"
-
-#: src/prefs_common.c:2262
-msgid "Never"
-msgstr "不顯示"
-
-#: src/prefs_common.c:2267
-msgid "Don't popup error dialog on receive error"
-msgstr "接收錯誤時不要開啟錯誤視窗。"
-
-#: src/prefs_common.c:2270
-msgid "Close receive dialog when finished"
-msgstr "完成時關閉接收信件的進度對話盒"
-
-#: src/prefs_common.c:2273
-msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
-
-#: src/prefs_common.c:2279
-msgid " Set key bindings... "
-msgstr "設定熱鍵"
-
-#: src/prefs_common.c:2333
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "外部指令（%s 將會被置換成檔名或 URI）"
-
-#: src/prefs_common.c:2342
-msgid "Web browser"
-msgstr "瀏覽器"
-
-#: src/prefs_common.c:2405
-msgid "Add address to destination when double-clicked"
-msgstr "在位址簿中，可利用雙擊直接將該電子郵件加入收信人中"
-
-#: src/prefs_common.c:2407
-msgid "On exit"
-msgstr "離開設定"
-
-#: src/prefs_common.c:2415
-msgid "Confirm on exit"
-msgstr "離開時確認"
-
-#: src/prefs_common.c:2422
-msgid "Empty trash on exit"
-msgstr "離開時清空刪除的郵件"
-
-#: src/prefs_common.c:2424
-msgid "Ask before emptying"
-msgstr "清除時確認"
-
-#: src/prefs_common.c:2428
-msgid "Warn if there are queued messages"
-msgstr "離開時若有尚未送出之信件即發出警告"
-
-#: src/prefs_common.c:2468
-#, fuzzy
-msgid "Enable strict checking of the integrity of summary caches"
-msgstr "寫入快取(%s)..."
-
-#: src/prefs_common.c:2471
-msgid ""
-"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 ""
-
-#: src/prefs_common.c:2478
-msgid "Socket I/O timeout:"
-msgstr "Socket I/O 等待時間："
-
-#: src/prefs_common.c:2491
-msgid "second(s)"
-msgstr "秒"
-
-#: src/prefs_common.c:2661
-msgid "the full abbreviated weekday name"
-msgstr "週一、週二、..."
-
-#: src/prefs_common.c:2662
-msgid "the full weekday name"
-msgstr "星期一、星期二、..."
-
-#: src/prefs_common.c:2663
-msgid "the abbreviated month name"
-msgstr "1月、2月、..."
-
-#: src/prefs_common.c:2664
-msgid "the full month name"
-msgstr "一月、二月、..."
-
-#: src/prefs_common.c:2665
-msgid "the preferred date and time for the current locale"
-msgstr "完整的西元日期與時間（本地時間）"
-
-#: src/prefs_common.c:2666
-msgid "the century number (year/100)"
-msgstr "世紀 (年/100)"
-
-#: src/prefs_common.c:2667
-msgid "the day of the month as a decimal number"
-msgstr "今天是幾號 (以數字表示)"
-
-#: src/prefs_common.c:2668
-msgid "the hour as a decimal number using a 24-hour clock"
-msgstr "現在幾點鐘 (廿四時制，以數字表示)"
-
-#: src/prefs_common.c:2669
-msgid "the hour as a decimal number using a 12-hour clock"
-msgstr "現在幾點鐘 (十二時制，以數字表示)"
-
-#: src/prefs_common.c:2670
-msgid "the day of the year as a decimal number"
-msgstr "今天是今年的第幾天 (以數字表示)"
-
-#: src/prefs_common.c:2671
-msgid "the month as a decimal number"
-msgstr "現在是幾月 (以數字表示)"
-
-#: src/prefs_common.c:2672
-msgid "the minute as a decimal number"
-msgstr "現在是幾分 (以數字表示)"
-
-#: src/prefs_common.c:2673
-msgid "either AM or PM"
-msgstr "上午或下午"
-
-#: src/prefs_common.c:2674
-msgid "the second as a decimal number"
-msgstr "現在是幾秒 (以數字表示)"
-
-#: src/prefs_common.c:2675
-msgid "the day of the week as a decimal number"
-msgstr "現在是一週的第幾天 (以數字表示)"
-
-#: src/prefs_common.c:2676
-msgid "the preferred date for the current locale"
-msgstr "完整的西元日期 (本地時間)"
-
-#: src/prefs_common.c:2677
-msgid "the last two digits of a year"
-msgstr "西元年份的後兩位數字"
-
-#: src/prefs_common.c:2678
-msgid "the year as a decimal number"
-msgstr "西元年份 (以數字表示)"
-
-#: src/prefs_common.c:2679
-msgid "the time zone or name or abbreviation"
-msgstr "時區"
-
-#: src/prefs_common.c:2700
-msgid "Specifier"
-msgstr "特殊符號"
-
-#: src/prefs_common.c:2701
-msgid "Description"
-msgstr "描述"
-
-#: src/prefs_common.c:2741
-msgid "Example"
-msgstr "範例"
-
-#: src/prefs_common.c:2821
-msgid "Set message colors"
-msgstr "設定顏色"
-
-#: src/prefs_common.c:2829
-msgid "Colors"
-msgstr "顏色"
-
-#: src/prefs_common.c:2863
-msgid "Quoted Text - First Level"
-msgstr "引言內容 - 第一層"
-
-#: src/prefs_common.c:2869
-msgid "Quoted Text - Second Level"
-msgstr "引言內容 - 第二層"
-
-#: src/prefs_common.c:2875
-msgid "Quoted Text - Third Level"
-msgstr "引言內容 - 第三層"
-
-#: src/prefs_common.c:2881
-msgid "URI link"
-msgstr "超連結"
-
-#: src/prefs_common.c:2888
-msgid "Recycle quote colors"
-msgstr "三層以上引言則重複使用指定的顏色"
-
-#: src/prefs_common.c:2948
-msgid "Pick color for quotation level 1"
-msgstr "選擇第一層引言的顏色"
-
-#: src/prefs_common.c:2951
-msgid "Pick color for quotation level 2"
-msgstr "選擇第二層引言的顏色"
-
-#: src/prefs_common.c:2954
-msgid "Pick color for quotation level 3"
-msgstr "選擇第三層引言的顏色"
-
-#: src/prefs_common.c:2957
-msgid "Pick color for URI"
-msgstr "選擇超連結的顏色"
-
-#: src/prefs_common.c:3097
-msgid "Description of symbols"
-msgstr "特殊符號代表的意義"
-
-#: src/prefs_common.c:3153
-msgid ""
-"Date\n"
-"From\n"
-"Full Name of Sender\n"
-"First Name of Sender\n"
-"Initial of Sender\n"
-"Subject\n"
-"To\n"
-"Cc\n"
-"Newsgroups\n"
-"Message-ID"
-msgstr ""
-"日期\n"
-"來源\n"
-"發信人全名\n"
-"發信人的名\n"
-"發信人縮寫\n"
-"主題\n"
-"收信人\n"
-"複本\n"
-"新聞群組\n"
-"信件識別碼"
-
-#: src/prefs_common.c:3166
-msgid "If x is set, displays expr"
-msgstr "若 x 已設定則顯示常規表示式"
-
-#: src/prefs_common.c:3170
-msgid ""
-"Message body\n"
-"Quoted message body\n"
-"Message body without signature\n"
-"Quoted message body without signature\n"
-"Literal %"
-msgstr ""
-"信件內容\n"
-"引言\n"
-"信件內容（不含簽名）\n"
-"引言（不含簽名）\n"
-"% 符號"
-
-#: src/prefs_common.c:3178
-msgid ""
-"Literal backslash\n"
-"Literal question mark\n"
-"Literal opening curly brace\n"
-"Literal closing curly brace"
-msgstr ""
-"反斜線\n"
-"問號\n"
-"左大括弧\n"
-"右大括弧"
-
-#: src/prefs_common.c:3224
-msgid "Key bindings"
-msgstr "熱鍵設定"
-
-#: src/prefs_common.c:3238
-msgid ""
-"Select the preset of key bindings.\n"
-"You can also modify each menu's shortcuts by pressing\n"
-"any key(s) when placing the mouse pointer on the item."
-msgstr ""
-"請選擇要使用的熱鍵。\n"
-"您也可以更改每個目錄的熱鍵，您只需要將滑鼠指標指過去，\n"
-"並按下任何鍵即可。"
-
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
-msgid "Default"
-msgstr "預設值"
-
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
-msgid "Old Sylpheed"
-msgstr "舊設定"
-
-#: src/prefs_customheader.c:165
+#: src/prefs_customheader.c:161
 msgid "Custom header setting"
 msgstr "使用者自定標頭"
 
-#: src/prefs_customheader.c:242 src/prefs_filter_edit.c:1575
+#: src/prefs_customheader.c:186
+msgid "Header"
+msgstr "信件標頭設定"
+
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1575
 msgid " Delete "
 msgstr "刪除"
 
-#: src/prefs_customheader.c:261
+#: src/prefs_customheader.c:257
 msgid "Custom headers"
 msgstr "標頭"
 
-#: src/prefs_customheader.c:482 src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "標頭未設定"
 
-#: src/prefs_customheader.c:540
+#: src/prefs_customheader.c:409
 msgid "Delete header"
 msgstr "刪除資料夾"
 
-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:410
 msgid "Do you really want to delete this header?"
 msgstr "您確定要刪除這項規則嗎？"
 
@@ -5242,12 +4058,21 @@ msgstr "信件過濾設定"
 msgid "Enabled"
 msgstr "已開啟"
 
-#: src/prefs_filter.c:763
+#: src/prefs_filter.c:324
+msgid "Edit"
+msgstr "編輯"
+
+#: src/prefs_filter.c:685
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "您確定要刪除這項規則嗎？"
 
-#: src/prefs_filter.c:765
+#: src/prefs_filter.c:686
+#, fuzzy
+msgid "(Untitled)"
+msgstr "無標題"
+
+#: src/prefs_filter.c:687
 msgid "Delete rule"
 msgstr "刪除規則"
 
@@ -5331,6 +4156,10 @@ msgstr "長於"
 msgid "is shorter than"
 msgstr "短於"
 
+#: src/prefs_filter_edit.c:643 src/prefs_filter_edit.c:1047
+msgid "KB"
+msgstr ""
+
 #: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "移動到"
@@ -5453,6 +4282,10 @@ msgstr "回覆時刪除信件標題前面的中括號 [] 或小括號 ()"
 msgid "Apply to subfolders"
 msgstr "應用到子資料夾"
 
+#: src/prefs_folder_item.c:304
+msgid "Automatically set the following addresses"
+msgstr "在相關欄位上自動加入下列電子郵件信箱："
+
 #: src/prefs_folder_item.c:327
 msgid "use also on reply"
 msgstr "回覆信件時也使用"
@@ -5526,64 +4359,46 @@ msgstr "指定顯示項目"
 msgid " Revert to default "
 msgstr "還原預設值"
 
-#: src/prefs_template.c:159
+#: src/prefs_template.c:160
 msgid "Template name"
 msgstr "信件樣板名稱"
 
-#: src/prefs_template.c:219
+#: src/prefs_template.c:220
 msgid "Register"
 msgstr "加入"
 
-#: src/prefs_template.c:225
+#: src/prefs_template.c:226
 msgid " Substitute "
 msgstr "替換"
 
-#: src/prefs_template.c:237
+#: src/prefs_template.c:238
 msgid " Symbols "
 msgstr " 符號 "
 
-#: src/prefs_template.c:251
+#: src/prefs_template.c:252
 msgid "Registered templates"
 msgstr "已紀錄之信件樣板符號"
 
-#: src/prefs_template.c:272
+#: src/prefs_template.c:273
 msgid "Templates"
 msgstr "信件樣板設定"
 
-#: src/prefs_template.c:389
+#: src/prefs_template.c:390
 msgid "Template"
 msgstr "信件樣板"
 
-#: src/prefs_template.c:458
+#: src/prefs_template.c:459
 msgid "Template format error."
 msgstr "信件樣板格式錯誤。"
 
-#: src/prefs_template.c:534
+#: src/prefs_template.c:535
 msgid "Delete template"
 msgstr "刪除信件樣板"
 
-#: src/prefs_template.c:535
+#: src/prefs_template.c:536
 msgid "Do you really want to delete this template?"
 msgstr "您確定要刪除這個信件樣板嗎？"
 
-#: src/procmime.c:773
-msgid "procmime_get_text_content(): Code conversion failed.\n"
-msgstr "procmime_get_text_content(): 轉碼失敗。\n"
-
-#: src/procmsg.c:544
-msgid "can't open mark file\n"
-msgstr "無法開啟標示的檔案 \n"
-
-#: src/procmsg.c:973
-#, c-format
-msgid "can't fetch message %d\n"
-msgstr "無法抓取信件 %d\n"
-
-#: src/procmsg.c:1396
-#, c-format
-msgid "Print command line is invalid: `%s'\n"
-msgstr "列印命令錯誤：`%s'\n"
-
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
 msgstr ""
@@ -5592,29 +4407,21 @@ msgstr ""
 msgid "Status"
 msgstr "狀態"
 
-#: src/recv.c:112
-msgid "error occurred while retrieving data.\n"
-msgstr "抓取資料時發生錯誤。\n"
-
-#: src/recv.c:154 src/recv.c:196 src/recv.c:211
-msgid "Can't write to file.\n"
-msgstr "無法寫入檔案。\n"
-
-#: src/rfc2015.c:133
+#: src/rfc2015.c:134
 msgid "Cannot find user ID for this key."
 msgstr "無法在這個 key 中找到使用者代號"
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:145
 #, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:169
+#: src/rfc2015.c:170
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "產生簽章於 %s\n"
 
-#: src/rfc2015.c:275 src/sigstatus.c:266
+#: src/rfc2015.c:276 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "檢查簽章時發生錯誤"
 
@@ -5640,6 +4447,10 @@ msgstr "鑰匙識別碼"
 msgid "Val"
 msgstr "值"
 
+#: src/select-keys.c:344
+msgid "Other"
+msgstr "其他"
+
 #: src/select-keys.c:468
 msgid "Add key"
 msgstr "新增鑰匙"
@@ -5660,84 +4471,84 @@ msgid ""
 "Do you trust it enough to use it anyway?"
 msgstr ""
 
-#: src/send_message.c:181
+#: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "暫存資料夾中的信件標頭錯誤。\n"
 
-#: src/send_message.c:319
+#: src/send_message.c:396
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "送出新郵件 (%d / %d bytes)"
 
-#: src/send_message.c:328
+#: src/send_message.c:405
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "無法執行外部指令：%s\n"
 
-#: src/send_message.c:363
+#: src/send_message.c:440
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "送出命令時發生錯誤。\n"
 
-#: src/send_message.c:458
+#: src/send_message.c:535
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/send_message.c:460
+#: src/send_message.c:537
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "連線到 SMTP 伺服器 %s..."
 
-#: src/send_message.c:527
+#: src/send_message.c:604
 msgid "Sending HELO..."
 msgstr "送出 HELO 標頭..."
 
-#: src/send_message.c:528 src/send_message.c:533 src/send_message.c:538
+#: src/send_message.c:605 src/send_message.c:610 src/send_message.c:615
 msgid "Authenticating"
 msgstr "認證"
 
-#: src/send_message.c:529 src/send_message.c:534
+#: src/send_message.c:606 src/send_message.c:611
 msgid "Sending message..."
 msgstr "送出信件中..."
 
-#: src/send_message.c:532
+#: src/send_message.c:609
 msgid "Sending EHLO..."
 msgstr "送出 EHLO 標頭..."
 
-#: src/send_message.c:541
+#: src/send_message.c:618
 msgid "Sending MAIL FROM..."
 msgstr "送出 MAIL FROM 標頭..."
 
-#: src/send_message.c:542 src/send_message.c:546 src/send_message.c:551
+#: src/send_message.c:619 src/send_message.c:623 src/send_message.c:628
 msgid "Sending"
 msgstr "送信中"
 
-#: src/send_message.c:545
+#: src/send_message.c:622
 msgid "Sending RCPT TO..."
 msgstr "送出 RCPT TO 標頭..."
 
-#: src/send_message.c:550
+#: src/send_message.c:627
 msgid "Sending DATA..."
 msgstr "送出信件資料 DATA..."
 
-#: src/send_message.c:554
+#: src/send_message.c:631
 msgid "Quitting..."
 msgstr "離開"
 
-#: src/send_message.c:582
+#: src/send_message.c:659
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "送出新郵件 (%d / %d bytes)"
 
-#: src/send_message.c:610
+#: src/send_message.c:687
 msgid "Sending message"
 msgstr "送出信件"
 
-#: src/send_message.c:654 src/send_message.c:674
+#: src/send_message.c:731 src/send_message.c:751
 msgid "Error occurred while sending the message."
 msgstr "送信時發生錯誤。"
 
-#: src/send_message.c:657
+#: src/send_message.c:734
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5839,32 +4650,20 @@ msgstr "簽章檢查錯誤"
 msgid "No public key to verify the signature"
 msgstr "沒有公開鑰匙供檢查簽章"
 
-#: src/smtp.c:156
-msgid "SMTP AUTH not available\n"
-msgstr "不支援 SMTP 認證\n"
-
-#: src/smtp.c:462 src/smtp.c:512
-msgid "bad SMTP response\n"
-msgstr "SMTP 回覆錯誤\n"
-
-#: src/smtp.c:483 src/smtp.c:501 src/smtp.c:598
-msgid "error occurred on SMTP session\n"
-msgstr "SMTP 認證時發生錯誤\n"
-
-#: src/sourcewindow.c:61
+#: src/sourcewindow.c:62
 msgid "Creating source window...\n"
 msgstr "產生來源視窗中...\n"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "信件原始碼"
 
-#: src/sourcewindow.c:135
+#: src/sourcewindow.c:136
 #, c-format
 msgid "Displaying the source of %s ...\n"
 msgstr "顯示 %s 來源中...\n"
 
-#: src/sourcewindow.c:137
+#: src/sourcewindow.c:138
 #, c-format
 msgid "%s - Source"
 msgstr "%s - 原始碼"
@@ -6259,6 +5058,895 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid ""
+#~ "Some composing windows are open.\n"
+#~ "Please close all the composing windows before editing the accounts."
+#~ msgstr ""
+#~ "您正在撰寫郵件，\n"
+#~ "請關掉所有撰寫中的郵件再進行帳號設定。"
+
+#~ msgid "Opening account edit window...\n"
+#~ msgstr "開啟帳號編輯視窗中...\n"
+
+#~ msgid "Creating account edit window...\n"
+#~ msgstr "產生帳號編輯視窗中...\n"
+
+#~ msgid "Edit accounts"
+#~ msgstr "編輯帳號設定"
+
+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the `G' column to enable message retrieval by `Get all'."
+#~ msgstr ""
+#~ "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
+#~ "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
+
+#~ msgid "Protocol"
+#~ msgstr "通訊協定"
+
+#~ msgid "Server"
+#~ msgstr "伺服器"
+
+#, fuzzy
+#~ msgid " _Set as default account "
+#~ msgstr "設為預設帳號"
+
+#, fuzzy
+#~ msgid "Do you really want to delete the account '%s'?"
+#~ msgstr "您確定要刪除這個帳號嗎？"
+
+#~ msgid "Delete account"
+#~ msgstr "刪除帳號"
+
+#~ msgid "Opening account preferences window...\n"
+#~ msgstr "開啟帳號設定的視窗...\n"
+
+#~ msgid "Account%d"
+#~ msgstr "帳號 %d"
+
+#~ msgid "Preferences for new account"
+#~ msgstr "新帳號設定"
+
+#~ msgid "Account preferences"
+#~ msgstr "帳號設定"
+
+#~ msgid "Creating account preferences window...\n"
+#~ msgstr "產生帳號設定的視窗...\n"
+
+#~ msgid "Receive"
+#~ msgstr "接收設定"
+
+#~ msgid "Privacy"
+#~ msgstr "私人資料"
+
+#~ msgid "Advanced"
+#~ msgstr "進階設定"
+
+#~ msgid "Name of this account"
+#~ msgstr "這個帳號的名稱"
+
+#~ msgid "Set as default"
+#~ msgstr "設為預設帳號"
+
+#~ msgid "Personal information"
+#~ msgstr "個人資訊"
+
+#~ msgid "Full name"
+#~ msgstr "全名"
+
+#~ msgid "Mail address"
+#~ msgstr "電子郵件地址"
+
+#~ msgid "Organization"
+#~ msgstr "服務公司/組織"
+
+#~ msgid "Server information"
+#~ msgstr "伺服器資訊"
+
+#~ msgid "News (NNTP)"
+#~ msgstr "新聞 (NNTP)"
+
+#~ msgid "None (local)"
+#~ msgstr "無 (local)"
+
+#~ msgid "This server requires authentication"
+#~ msgstr "這個伺服器需要認證"
+
+#~ msgid "News server"
+#~ msgstr "新聞伺服器"
+
+#~ msgid "Server for receiving"
+#~ msgstr "接收郵件伺服器"
+
+#~ msgid "SMTP server (send)"
+#~ msgstr "發送郵件伺服器 (SMTP)"
+
+#~ msgid "User ID"
+#~ msgstr "帳號"
+
+#~ msgid "Password"
+#~ msgstr "密碼"
+
+#~ msgid "Use secure authentication (APOP)"
+#~ msgstr "使用安全認證（APOP）"
+
+#~ msgid "Remove messages on server when received"
+#~ msgstr "接收郵件時一併從伺服器上移除。"
+
+#~ msgid "Remove after"
+#~ msgstr "在幾天後刪除："
+
+#~ msgid "days"
+#~ msgstr "天"
+
+#~ msgid "(0 days: remove immediately)"
+#~ msgstr "(設為 0 則為立即刪除)"
+
+#~ msgid "Download all messages on server"
+#~ msgstr "接收伺服器上所有的郵件。"
+
+#~ msgid "Receive size limit"
+#~ msgstr "接收郵件大小限制"
+
+#~ msgid "Filter messages on receiving"
+#~ msgstr "接收信件時進行過濾"
+
+#~ msgid "Default inbox"
+#~ msgstr "預設的收件夾"
+
+#, fuzzy
+#~ msgid "Unfiltered messages will be stored in this folder."
+#~ msgstr "（未經過濾的信件將會被送到這個資料夾上）"
+
+#~ msgid "Authentication method"
+#~ msgstr "認證方法"
+
+#~ msgid "Automatic"
+#~ msgstr "自動"
+
+#~ msgid "News"
+#~ msgstr "新聞"
+
+#, fuzzy
+#~ msgid "Maximum number of articles to download"
+#~ msgstr ""
+#~ "一次下載文章數量上限\n"
+#~ "(設為 0 則不限制數量)"
+
+#, fuzzy
+#~ msgid "No limit if 0 is specified."
+#~ msgstr "沒有指定收件人。"
+
+#~ msgid "`Get all' checks for new messages on this account"
+#~ msgstr "「全部檢查」時檢查這個帳號的新郵件"
+
+#~ msgid "Add Date header field"
+#~ msgstr "加入日期"
+
+#~ msgid "Generate Message-ID"
+#~ msgstr "產生郵件識別碼"
+
+#~ msgid "Add user-defined header"
+#~ msgstr "加入使用者定義的標頭"
+
+#~ msgid " Edit... "
+#~ msgstr "編輯..."
+
+#~ msgid "Authentication"
+#~ msgstr "認證"
+
+#~ msgid "SMTP Authentication (SMTP AUTH)"
+#~ msgstr "SMTP 認證"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you leave these entries empty, the same user ID and password as "
+#~ "receiving will be used."
+#~ msgstr "若是此欄空白，將使用接收時的帳號與密碼。"
+
+#~ msgid "Authenticate with POP3 before sending"
+#~ msgstr "送信前先做 POP3 認證"
+
+#~ msgid "Command output"
+#~ msgstr "命令輸出"
+
+#~ msgid "Cc"
+#~ msgstr "複本"
+
+#~ msgid "Bcc"
+#~ msgstr "密件複本"
+
+#~ msgid "Reply-To"
+#~ msgstr "回信地址"
+
+#~ msgid "Sign message by default"
+#~ msgstr "信件自動做數位簽章"
+
+#~ msgid "Encrypt message by default"
+#~ msgstr "信件自動加密"
+
+#~ msgid "Use ASCII-armored format for encryption"
+#~ msgstr "使用 ASCII-armored 格式做加密"
+
+#~ msgid "Use clear text signature"
+#~ msgstr "使用明碼簽名"
+
+#~ msgid "Sign key"
+#~ msgstr "簽章鑰匙"
+
+#~ msgid "Use default GnuPG key"
+#~ msgstr "使用預設的 GnuPG key"
+
+#~ msgid "Select key by your email address"
+#~ msgstr "根據你的電子郵件地址選擇 key"
+
+#~ msgid "Specify key manually"
+#~ msgstr "手動指定 key"
+
+#~ msgid "User or key ID:"
+#~ msgstr "使用者代號或 key 的識別碼："
+
+#~ msgid "Don't use SSL"
+#~ msgstr "不使用 SSL"
+
+#~ msgid "Use SSL for POP3 connection"
+#~ msgstr "POP3 連線時使用 SSL"
+
+#~ msgid "Use STARTTLS command to start SSL session"
+#~ msgstr "用 STARTTLS 命令來啟動 SSL"
+
+#~ msgid "Use SSL for IMAP4 connection"
+#~ msgstr "IMAP4 連線時使用 SSL"
+
+#~ msgid "Use SSL for NNTP connection"
+#~ msgstr "NNTP 連線時使用 SSL"
+
+#~ msgid "Send (SMTP)"
+#~ msgstr "送信設定 (SMTP)"
+
+#~ msgid "Use SSL for SMTP connection"
+#~ msgstr "SMTP 連線時使用 SSL"
+
+#~ msgid "Use non-blocking SSL"
+#~ msgstr "使用 non-blocking SSL"
+
+#, fuzzy
+#~ msgid "Turn this off if you have problems in SSL connection."
+#~ msgstr "（若您使用 SSL 連線時發生問題，請關閉此選項）"
+
+#~ msgid "Specify SMTP port"
+#~ msgstr "指定 SMTP 連接埠"
+
+#~ msgid "Specify POP3 port"
+#~ msgstr "指定 POP3 連接埠"
+
+#~ msgid "Specify IMAP4 port"
+#~ msgstr "指定 IMAP4 連接埠"
+
+#~ msgid "Specify NNTP port"
+#~ msgstr "指定 NNTP 連接埠"
+
+#~ msgid "Specify domain name"
+#~ msgstr "指定網域"
+
+#~ msgid "IMAP server directory"
+#~ msgstr "IMAP 伺服器目錄"
+
+#~ msgid "Put sent messages in"
+#~ msgstr "將已送出之信件存到"
+
+#~ msgid "Put draft messages in"
+#~ msgstr "將信件草稿存到"
+
+#~ msgid "Put deleted messages in"
+#~ msgstr "將刪除信件存到"
+
+#~ msgid "Account name is not entered."
+#~ msgstr "未輸入帳號名稱。"
+
+#~ msgid "Mail address is not entered."
+#~ msgstr "未輸入電子郵件信箱。"
+
+#~ msgid "SMTP server is not entered."
+#~ msgstr "未輸入發送郵件伺服器。"
+
+#~ msgid "User ID is not entered."
+#~ msgstr "未輸入使用者帳號。"
+
+#~ msgid "POP3 server is not entered."
+#~ msgstr "未輸入接收郵件伺服器。"
+
+#~ msgid "IMAP4 server is not entered."
+#~ msgstr "未輸入接收郵件伺服器。"
+
+#~ msgid "NNTP server is not entered."
+#~ msgstr "未輸入新聞伺服器。"
+
+#~ msgid ""
+#~ "It's not recommended to use the old style ASCII-armored\n"
+#~ "mode for encrypted messages. It doesn't comply with the\n"
+#~ "RFC 3156 - MIME Security with OpenPGP."
+#~ msgstr ""
+#~ "注意：不建議您使用舊式的 ASCII-armored 模式來加密。因為\n"
+#~ "它與 RFC 3156 - MIME Security with OpenPGP 不相容。"
+
+#~ msgid "Creating common preferences window...\n"
+#~ msgstr "產生一般設定視窗...\n"
+
+#~ msgid "Common Preferences"
+#~ msgstr "一般設定"
+
+#~ msgid "Quote"
+#~ msgstr "引言"
+
+#~ msgid "Display"
+#~ msgstr "顯示"
+
+#~ msgid "Message"
+#~ msgstr "信件"
+
+#~ msgid "Use external program for incorporation"
+#~ msgstr "用其他外部程式來收信"
+
+#~ msgid "Command"
+#~ msgstr "命令列"
+
+#, fuzzy
+#~ msgid "Incorporate from local spool"
+#~ msgstr "從 spool 取得信件"
+
+#~ msgid "Filter on incorporation"
+#~ msgstr "收信時過濾"
+
+#~ msgid "Spool path"
+#~ msgstr "Spool 路徑"
+
+#~ msgid "Auto-check new mail"
+#~ msgstr "自動檢查新郵件"
+
+#~ msgid "every"
+#~ msgstr "每"
+
+#~ msgid "minute(s)"
+#~ msgstr "分鐘"
+
+#~ msgid "Check new mail on startup"
+#~ msgstr "開啟時檢查新郵件"
+
+#~ msgid "Update all local folders after incorporation"
+#~ msgstr "收信後更新所有資料夾"
+
+#, fuzzy
+#~ msgid "Execute command when new messages arrived"
+#~ msgstr "移動或刪除信件時立即執行"
+
+#, fuzzy
+#~ msgid "`%d' will be replaced with the number of new messages."
+#~ msgstr "取得新郵件的數量中"
+
+#~ msgid "Use external program for sending"
+#~ msgstr "用其他外部程式來送信"
+
+#~ msgid "Save sent messages to outbox"
+#~ msgstr "將已送出之信件存到寄件夾"
+
+#, fuzzy
+#~ msgid "Outgoing encoding"
+#~ msgstr "輸出字集"
+
+#~ msgid "Automatic (Recommended)"
+#~ msgstr "自動選擇（推薦使用）"
+
+#~ msgid "7bit ascii (US-ASCII)"
+#~ msgstr "7位元 ASCII 字集"
+
+#~ msgid "Western European (ISO-8859-1)"
+#~ msgstr "西歐語系 (ISO-8859-1)"
+
+#~ msgid "Western European (ISO-8859-15)"
+#~ msgstr "西歐語系 (ISO-8859-15)"
+
+#~ msgid "Central European (ISO-8859-2)"
+#~ msgstr "中歐語系 (ISO-8859-2)"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "波羅的海語系 (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "波羅的海語系 (ISO-8859-4)"
+
+#~ msgid "Greek (ISO-8859-7)"
+#~ msgstr "希臘語 (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (ISO-8859-8)"
+#~ msgstr "希臘語 (ISO-8859-7)"
+
+#, fuzzy
+#~ msgid "Hebrew (Windows-1255)"
+#~ msgstr "斯拉夫語 (Windows-1251)"
+
+#~ msgid "Turkish (ISO-8859-9)"
+#~ msgstr "土耳其語 (ISO-8859-9)"
+
+#~ msgid "Cyrillic (ISO-8859-5)"
+#~ msgstr "斯拉夫語 (ISO-8859-5)"
+
+#~ msgid "Cyrillic (KOI8-R)"
+#~ msgstr "斯拉夫語 (KOI8-R)"
+
+#~ msgid "Cyrillic (KOI8-U)"
+#~ msgstr "斯拉夫語 (KOI8-U)"
+
+#~ msgid "Cyrillic (Windows-1251)"
+#~ msgstr "斯拉夫語 (Windows-1251)"
+
+#~ msgid "Japanese (ISO-2022-JP)"
+#~ msgstr "日文 (ISO-2022-JP)"
+
+#~ msgid "Japanese (EUC-JP)"
+#~ msgstr "日文 (EUC-JP)"
+
+#~ msgid "Japanese (Shift_JIS)"
+#~ msgstr "日文 (Shift_JIS)"
+
+#~ msgid "Simplified Chinese (GB2312)"
+#~ msgstr "簡體中文 (GB2312)"
+
+#, fuzzy
+#~ msgid "Simplified Chinese (GBK)"
+#~ msgstr "簡體中文 (GB2312)"
+
+#~ msgid "Traditional Chinese (Big5)"
+#~ msgstr "繁體中文 (Big5)"
+
+#~ msgid "Traditional Chinese (EUC-TW)"
+#~ msgstr "繁體中文 (EUC-TW)"
+
+#~ msgid "Chinese (ISO-2022-CN)"
+#~ msgstr "中文 (ISO-2022-CN)"
+
+#~ msgid "Korean (EUC-KR)"
+#~ msgstr "韓文 (EUC-KR)"
+
+#~ msgid "Thai (TIS-620)"
+#~ msgstr "泰文 (TIS-620)"
+
+#~ msgid "Thai (Windows-874)"
+#~ msgstr "泰文 (Windows-874)"
+
+#, fuzzy
+#~ msgid ""
+#~ "If `Automatic' is selected, the optimal encoding for the current locale "
+#~ "will be used."
+#~ msgstr ""
+#~ "若是選用「自動選擇」，系統將為自動為您判斷使用最\n"
+#~ "合用的語系設定。"
+
+#~ msgid "Transfer encoding"
+#~ msgstr "傳送之編碼"
+
+#, fuzzy
+#~ msgid ""
+#~ "Specify Content-Transfer-Encoding used when message body contains non-"
+#~ "ASCII characters."
+#~ msgstr "請指定當郵件主體內容包含非 ASCII 字元時，使用哪種編碼來傳送內容。"
+
+#~ msgid "Signature separator"
+#~ msgstr "簽名分隔符號"
+
+#~ msgid "Insert automatically"
+#~ msgstr "自動加入簽名"
+
+#~ msgid "Automatically launch the external editor"
+#~ msgstr "自動呼叫外部編輯器"
+
+#~ msgid "Undo level"
+#~ msgstr "復原紀錄"
+
+#~ msgid "Wrap messages at"
+#~ msgstr "每行最多"
+
+#~ msgid "characters"
+#~ msgstr "個字元"
+
+#~ msgid "Wrap quotation"
+#~ msgstr "折行時顯示符號"
+
+#~ msgid "Wrap on input"
+#~ msgstr "切割輸入過長的文字行"
+
+#~ msgid "Wrap before sending"
+#~ msgstr "寄送之前自動折行"
+
+#~ msgid "Automatically select account for replies"
+#~ msgstr "回信時在相關欄位上自動加入下列電子郵件信箱："
+
+#~ msgid "Quote message when replying"
+#~ msgstr "回信時引用原文"
+
+#~ msgid "Reply button invokes mailing list reply"
+#~ msgstr "讀取 Mailing List 信件時按下「回覆」鈕表示回覆給 Mailing list"
+
+#~ msgid "Reply format"
+#~ msgstr "回覆格式"
+
+#~ msgid "Quotation mark"
+#~ msgstr "引言符號"
+
+#~ msgid "Forward format"
+#~ msgstr "轉寄格式"
+
+#~ msgid " Description of symbols "
+#~ msgstr "特殊符號代表的意義"
+
+#~ msgid "Font"
+#~ msgstr "字型"
+
+#~ msgid "Translate header name (such as `From:', `Subject:')"
+#~ msgstr "將標頭名稱翻譯出來"
+
+#~ msgid "Display unread number next to folder name"
+#~ msgstr "若有未讀信件，就顯示在資料夾名稱後面"
+
+#~ msgid "Abbreviate newsgroups longer than"
+#~ msgstr "新聞群組縮寫長度大於"
+
+#~ msgid "letters"
+#~ msgstr "個字母"
+
+#~ msgid "Summary View"
+#~ msgstr "信件列表"
+
+#~ msgid "Display recipient on `From' column if sender is yourself"
+#~ msgstr "若發信人是你自己，就在信件列表的來源中顯示收信人"
+
+#~ msgid "Expand threads"
+#~ msgstr "自動展開信件串列"
+
+#~ msgid "Date format"
+#~ msgstr "日期格式"
+
+#~ msgid " Set display item of summary... "
+#~ msgstr "設定信件列表選項..."
+
+#~ msgid "Enable coloration of message"
+#~ msgstr "信件中的引言與超連結顯示變色"
+
+#~ msgid ""
+#~ "Display multi-byte alphabet and numeric as\n"
+#~ "ASCII character (Japanese only)"
+#~ msgstr "將全形英文與數字以半形來顯示 (只適用日文)"
+
+#~ msgid "Display header pane above message view"
+#~ msgstr "在顯示信件欄上方加入標頭資訊"
+
+#~ msgid "Display short headers on message view"
+#~ msgstr "在信件預覽中顯示信件標頭"
+
+#, fuzzy
+#~ msgid "Display cursor in message view"
+#~ msgstr "在信件預覽中顯示信件標頭"
+
+#~ msgid "Line space"
+#~ msgstr "行間距"
+
+#~ msgid "pixel(s)"
+#~ msgstr "像素 (pixels)"
+
+#~ msgid "Scroll"
+#~ msgstr "捲軸"
+
+#~ msgid "Half page"
+#~ msgstr "一次半頁"
+
+#~ msgid "Smooth scroll"
+#~ msgstr "平滑捲動"
+
+#~ msgid "Step"
+#~ msgstr "每次捲動"
+
+#~ msgid "Resize attached large images to fit in the window"
+#~ msgstr "調整附加影像大小"
+
+#, fuzzy
+#~ msgid "Display images as inline"
+#~ msgstr "顯示標頭設定"
+
+#, fuzzy
+#~ msgid "Learning command:"
+#~ msgstr "執行命令"
+
+#, fuzzy
+#~ msgid "Classifying command"
+#~ msgstr "執行命令"
+
+#, fuzzy
+#~ msgid "Junk folder"
+#~ msgstr "資料夾："
+
+#, fuzzy
+#~ msgid "Filter messages classified as junk on receiving"
+#~ msgstr "接收信件時進行過濾"
+
+#, fuzzy
+#~ msgid ""
+#~ "Filtered messages will be moved to the junk folder and deleted from the "
+#~ "server."
+#~ msgstr "（未經過濾的信件將會被送到這個資料夾上）"
+
+#~ msgid "Automatically check signatures"
+#~ msgstr "自動檢查數位簽章"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "將數位簽章檢查結果顯示在另一視窗"
+
+#~ msgid "Store passphrase in memory temporarily"
+#~ msgstr "將密碼片語暫時存在記憶體中"
+
+#~ msgid "Expired after"
+#~ msgstr "期限："
+
+#~ msgid "minute(s) "
+#~ msgstr "分鐘"
+
+#, fuzzy
+#~ msgid "Setting to '0' will store the passphrase for the whole session."
+#~ msgstr "（若設定為 '0' 則表示沒有期限）"
+
+#~ msgid "Grab input while entering a passphrase"
+#~ msgstr "輸入 passphrase 時抓取輸入"
+
+#~ msgid "Display warning on startup if GnuPG doesn't work"
+#~ msgstr "若 GnuPG 無法運作，則在啟動時發出警告"
+
+#~ msgid "Always open messages in summary when selected"
+#~ msgstr "在信件列表選擇信件時開啟信件。"
+
+#~ msgid "Open first unread message when entering a folder"
+#~ msgstr "進入資料夾時直接跳到第一封未讀信件上"
+
+#~ msgid "Only mark message as read when opened in new window"
+#~ msgstr "只在開啟新信件時標示為未讀"
+
+#~ msgid "Go to inbox after receiving new mail"
+#~ msgstr "接收完新郵件後直接進入收件夾中"
+
+#~ msgid "Execute immediately when moving or deleting messages"
+#~ msgstr "移動或刪除信件時立即執行"
+
+#, fuzzy
+#~ msgid "Messages will be marked until execution if this is turned off."
+#~ msgstr "（若此選項關閉，則必須按下「執行」才會執行移動或刪除）"
+
+#~ msgid "Receive dialog"
+#~ msgstr "接收進度對話盒"
+
+#~ msgid "Show receive dialog"
+#~ msgstr "顯示接收信件的進度對話盒"
+
+#~ msgid "Always"
+#~ msgstr "一律顯示"
+
+#~ msgid "Only on manual receiving"
+#~ msgstr "只在手動收取郵件時顯示"
+
+#~ msgid "Never"
+#~ msgstr "不顯示"
+
+#~ msgid "Don't popup error dialog on receive error"
+#~ msgstr "接收錯誤時不要開啟錯誤視窗。"
+
+#~ msgid "Close receive dialog when finished"
+#~ msgstr "完成時關閉接收信件的進度對話盒"
+
+#~ msgid " Set key bindings... "
+#~ msgstr "設定熱鍵"
+
+#~ msgid "External commands (%s will be replaced with file name / URI)"
+#~ msgstr "外部指令（%s 將會被置換成檔名或 URI）"
+
+#~ msgid "Web browser"
+#~ msgstr "瀏覽器"
+
+#~ msgid "Add address to destination when double-clicked"
+#~ msgstr "在位址簿中，可利用雙擊直接將該電子郵件加入收信人中"
+
+#~ msgid "On exit"
+#~ msgstr "離開設定"
+
+#~ msgid "Confirm on exit"
+#~ msgstr "離開時確認"
+
+#~ msgid "Empty trash on exit"
+#~ msgstr "離開時清空刪除的郵件"
+
+#~ msgid "Ask before emptying"
+#~ msgstr "清除時確認"
+
+#~ msgid "Warn if there are queued messages"
+#~ msgstr "離開時若有尚未送出之信件即發出警告"
+
+#, fuzzy
+#~ msgid "Enable strict checking of the integrity of summary caches"
+#~ msgstr "寫入快取(%s)..."
+
+#~ msgid "Socket I/O timeout:"
+#~ msgstr "Socket I/O 等待時間："
+
+#~ msgid "second(s)"
+#~ msgstr "秒"
+
+#~ msgid "the full abbreviated weekday name"
+#~ msgstr "週一、週二、..."
+
+#~ msgid "the full weekday name"
+#~ msgstr "星期一、星期二、..."
+
+#~ msgid "the abbreviated month name"
+#~ msgstr "1月、2月、..."
+
+#~ msgid "the full month name"
+#~ msgstr "一月、二月、..."
+
+#~ msgid "the preferred date and time for the current locale"
+#~ msgstr "完整的西元日期與時間（本地時間）"
+
+#~ msgid "the century number (year/100)"
+#~ msgstr "世紀 (年/100)"
+
+#~ msgid "the day of the month as a decimal number"
+#~ msgstr "今天是幾號 (以數字表示)"
+
+#~ msgid "the hour as a decimal number using a 24-hour clock"
+#~ msgstr "現在幾點鐘 (廿四時制，以數字表示)"
+
+#~ msgid "the hour as a decimal number using a 12-hour clock"
+#~ msgstr "現在幾點鐘 (十二時制，以數字表示)"
+
+#~ msgid "the day of the year as a decimal number"
+#~ msgstr "今天是今年的第幾天 (以數字表示)"
+
+#~ msgid "the month as a decimal number"
+#~ msgstr "現在是幾月 (以數字表示)"
+
+#~ msgid "the minute as a decimal number"
+#~ msgstr "現在是幾分 (以數字表示)"
+
+#~ msgid "either AM or PM"
+#~ msgstr "上午或下午"
+
+#~ msgid "the second as a decimal number"
+#~ msgstr "現在是幾秒 (以數字表示)"
+
+#~ msgid "the day of the week as a decimal number"
+#~ msgstr "現在是一週的第幾天 (以數字表示)"
+
+#~ msgid "the preferred date for the current locale"
+#~ msgstr "完整的西元日期 (本地時間)"
+
+#~ msgid "the last two digits of a year"
+#~ msgstr "西元年份的後兩位數字"
+
+#~ msgid "the year as a decimal number"
+#~ msgstr "西元年份 (以數字表示)"
+
+#~ msgid "the time zone or name or abbreviation"
+#~ msgstr "時區"
+
+#~ msgid "Specifier"
+#~ msgstr "特殊符號"
+
+#~ msgid "Description"
+#~ msgstr "描述"
+
+#~ msgid "Example"
+#~ msgstr "範例"
+
+#~ msgid "Set message colors"
+#~ msgstr "設定顏色"
+
+#~ msgid "Colors"
+#~ msgstr "顏色"
+
+#~ msgid "Quoted Text - First Level"
+#~ msgstr "引言內容 - 第一層"
+
+#~ msgid "Quoted Text - Second Level"
+#~ msgstr "引言內容 - 第二層"
+
+#~ msgid "Quoted Text - Third Level"
+#~ msgstr "引言內容 - 第三層"
+
+#~ msgid "URI link"
+#~ msgstr "超連結"
+
+#~ msgid "Recycle quote colors"
+#~ msgstr "三層以上引言則重複使用指定的顏色"
+
+#~ msgid "Pick color for quotation level 1"
+#~ msgstr "選擇第一層引言的顏色"
+
+#~ msgid "Pick color for quotation level 2"
+#~ msgstr "選擇第二層引言的顏色"
+
+#~ msgid "Pick color for quotation level 3"
+#~ msgstr "選擇第三層引言的顏色"
+
+#~ msgid "Pick color for URI"
+#~ msgstr "選擇超連結的顏色"
+
+#~ msgid "Description of symbols"
+#~ msgstr "特殊符號代表的意義"
+
+#~ msgid ""
+#~ "Date\n"
+#~ "From\n"
+#~ "Full Name of Sender\n"
+#~ "First Name of Sender\n"
+#~ "Initial of Sender\n"
+#~ "Subject\n"
+#~ "To\n"
+#~ "Cc\n"
+#~ "Newsgroups\n"
+#~ "Message-ID"
+#~ msgstr ""
+#~ "日期\n"
+#~ "來源\n"
+#~ "發信人全名\n"
+#~ "發信人的名\n"
+#~ "發信人縮寫\n"
+#~ "主題\n"
+#~ "收信人\n"
+#~ "複本\n"
+#~ "新聞群組\n"
+#~ "信件識別碼"
+
+#~ msgid "If x is set, displays expr"
+#~ msgstr "若 x 已設定則顯示常規表示式"
+
+#~ msgid ""
+#~ "Message body\n"
+#~ "Quoted message body\n"
+#~ "Message body without signature\n"
+#~ "Quoted message body without signature\n"
+#~ "Literal %"
+#~ msgstr ""
+#~ "信件內容\n"
+#~ "引言\n"
+#~ "信件內容（不含簽名）\n"
+#~ "引言（不含簽名）\n"
+#~ "% 符號"
+
+#~ msgid ""
+#~ "Literal backslash\n"
+#~ "Literal question mark\n"
+#~ "Literal opening curly brace\n"
+#~ "Literal closing curly brace"
+#~ msgstr ""
+#~ "反斜線\n"
+#~ "問號\n"
+#~ "左大括弧\n"
+#~ "右大括弧"
+
+#~ msgid "Key bindings"
+#~ msgstr "熱鍵設定"
+
+#~ msgid ""
+#~ "Select the preset of key bindings.\n"
+#~ "You can also modify each menu's shortcuts by pressing\n"
+#~ "any key(s) when placing the mouse pointer on the item."
+#~ msgstr ""
+#~ "請選擇要使用的熱鍵。\n"
+#~ "您也可以更改每個目錄的熱鍵，您只需要將滑鼠指標指過去，\n"
+#~ "並按下任何鍵即可。"
+
+#~ msgid "Default"
+#~ msgstr "預設值"
+
+#~ msgid "Old Sylpheed"
+#~ msgstr "舊設定"
+
 #~ msgid "Font selection"
 #~ msgstr "選擇字型"
 
@@ -6606,9 +6294,6 @@ msgstr ""
 #~ msgid "Setting widgets..."
 #~ msgstr "設定視窗..."
 
-#~ msgid "Moving message %s%c%d to %s ...\n"
-#~ msgstr "移動信件 %s%c%d 到 %s ...\n"
-
 #~ msgid "\tMarking the messages..."
 #~ msgstr "將信件加上標記中..."