aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-12-24 08:50:16 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-12-24 08:50:16 +0000
commit1a52f5f2d153bbae0f630930e17c0b7492be9cec (patch)
tree2c6e2dc51e2e68b676a8d5573a7b67be537e2742
parentcd8efb110d1f9d26fe31ba5b350b394bfd466100 (diff)
made 3.1.0beta6 release.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2772 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog4
-rw-r--r--NEWS15
-rw-r--r--po/be.po222
-rw-r--r--po/bg.po226
-rw-r--r--po/cs.po222
-rw-r--r--po/da.po226
-rw-r--r--po/de.po222
-rw-r--r--po/el.po222
-rw-r--r--po/es.po222
-rw-r--r--po/et.po226
-rw-r--r--po/fr.po222
-rw-r--r--po/gl.po226
-rw-r--r--po/hr.po226
-rw-r--r--po/hu.po222
-rw-r--r--po/it.po222
-rw-r--r--po/ja.po222
-rw-r--r--po/ko.po226
-rw-r--r--po/lt.po222
-rw-r--r--po/nl.po224
-rw-r--r--po/pl.po222
-rw-r--r--po/pt_BR.po222
-rw-r--r--po/ro.po222
-rw-r--r--po/ru.po222
-rw-r--r--po/sk.po226
-rw-r--r--po/sl.po226
-rw-r--r--po/sr.po226
-rw-r--r--po/sv.po224
-rw-r--r--po/tr.po226
-rw-r--r--po/uk.po222
-rw-r--r--po/vi.po224
-rw-r--r--po/zh_CN.po226
-rw-r--r--po/zh_TW.po224
32 files changed, 3375 insertions, 3356 deletions
diff --git a/ChangeLog b/ChangeLog
index 750e9743..a10948e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-12-24
+ * version 3.1.0beta6
+
+2010-12-24
+
* src/main.c: win32: always check if text font is loadable on startup.
2010-12-24
diff --git a/NEWS b/NEWS
index a96b2eb4..e870c475 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
Changes of Sylpheed
+* 3.1.0beta6 (development)
+
+ * A new option 'Set only mail address when entering recipient from address
+ book' was added.
+ * The menu items 'Add to recipient/Cc/Bcc' were added to the address book.
+ * On junk mail filtering, appropriate Junk folder for accounts will be
+ selected.
+ * When going offline, all current network sessions will be disconnected.
+ * Low priority will be used for long timeout interval.
+ * The behavior on opening folders and mark-read timing was modified again.
+ * The HTML parser was fixed to handle 'a' tag correctly.
+ * Win32: The text font setting will be checked always on startup
+ (Japanese locale only).
+ * The Japanese manual was updated.
+
* 3.1.0beta5 (development)
* Win32: The crash on update check was fixed.
diff --git a/po/be.po b/po/be.po
index d4ee7bc8..ba0d61bf 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 3.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-02-22 15:22+0300\n"
"Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -16,6 +16,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Чытанне ўсіх канфігурацый для кожнага акаунта...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Фільтр непажаданай пошты (ручны)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Фільтр непажаданай пошты"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -216,34 +224,34 @@ msgstr "iconv не можа канвертаваць UTF-7 у %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv не можа канвертаваць %s у UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "нельга запісаць у часовы файл\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Атрыманне паведамленняў з %s у %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "нельга прачытаць файл mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "няправільны фармат mbox: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "пашкоджаная скрынка: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "нельга адкрыць часовы файл\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -252,43 +260,43 @@ msgstr ""
"знойдзены 'unescaped' From:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "нельга стварыць файл блакіроўкі %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "калі магчыма, ўжывайце 'flock' замест 'file'.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "нельга стварыць %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "скрынка кантралюецца другім працэсам, чаканне...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "нельга блакіраваць %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "няправільны тып блакіроўкі\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "нельга разблакіраваць %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "нельга ўкараціць скрынку да нуля.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Экспартаванне паведамленняў з %s у %s...\n"
@@ -307,7 +315,7 @@ msgstr "крынічны каталог ідэнтычны з прызначэн
msgid "Copying message %s/%d to %s ...\n"
msgstr "Капіраванне паведамленняў %s/%d у %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -501,14 +509,6 @@ msgstr "Знайдзена: %s\n"
msgid "Configuration is saved.\n"
msgstr "Канфігурацыя запісаная.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Фільтр непажаданай пошты (ручны)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Фільтр непажаданай пошты"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmine_get_text_content(): Канверсія коду схібіла.\n"
@@ -1248,15 +1248,15 @@ msgstr "Супольны адрас"
msgid "Personal address"
msgstr "Асабовы адрас"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Заўвага"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Папярэджанне"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Памылка"
@@ -1299,7 +1299,7 @@ msgstr "Карычневы"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Няма"
@@ -1832,7 +1832,7 @@ msgstr "Дата"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Памер"
@@ -2858,141 +2858,141 @@ msgstr "Атрыбуты"
msgid "Sylpheed: %d new messages"
msgstr "Сілфід: %d новых паведамленняў"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Аўтэнтыфікацыя POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Атрыманне новых паведамленняў"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Скасавана"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Чаканне"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Скасавана"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Атрыманне"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d паведамленне(яў) (%s) атрымана"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "няма новых паведамленняў"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Зроблена"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Злучэнне не атрымалася"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Аўтарызацыя схібіла"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Замкнута"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Таймаут"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Завершана (%d новы(х) ліст(оў))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Завершана (няма новых паведамленняў)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Здарыліся памылкі пад час атрымання пошты."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "атрыманне новых паведамленняў акаунта %s ...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Аўтэнтыфікацыя POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Атрыманне новых паведамленняў"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Злучэнне з POP3 серверам: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Аўтэнтыфікацыя..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Атрыманне паведамленняў з %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Атрыманне колькасці новых паведамленняў (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Атрыманне колькасці новых паведамленняў (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Атрыманне колькасці новых паведамленняў (UIDL)"
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Атрыманне памеру паведамленняў (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Сціранне паведамлення %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Адлучэнне"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Атрыманне ліста (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3000,15 +3000,15 @@ msgstr ""
"Выкананне загаду фільтравання спаму схібіла.\n"
"Калі ласка, праверце настаўленні кантролю спаму."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Злучэнне не атрымалася."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Памылка здарылася пад час апрацоўкі пошты."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3017,29 +3017,29 @@ msgstr ""
"Здарылася памылка пад час апрацоўкі пошты:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Не засталося месца на дыску."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Нельга запісаць файл."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Памылка сокета."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Злучэнне закрытае аддаленым серверам."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Скрынка замкнутая."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3048,11 +3048,11 @@ msgstr ""
"Паштовая скрынка замкнутая:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Аўтэнтыфікацыя схібіла."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3061,15 +3061,15 @@ msgstr ""
"Аўтэнтыфікацыя схібіла:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Таймаут сеансу."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Атрыманне скасавана\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Атрыманне новых паведамленняў з %s у %s...\n"
@@ -3087,16 +3087,16 @@ msgstr "Увядзіце пароль"
msgid "Protocol log"
msgstr "Журнал пратакола"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Ужыванне: %s [ОПЦЫЯ]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [адрас] адкрыць акно напісання паведамлення"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3106,23 +3106,23 @@ msgstr ""
" адкрыць акно напісання паведамлення з далучаным\n"
" дадаткам з азначанага файла (файлаў)"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive атрымаць новую пошту"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all атрымаць новую пошту для ўсіх акаунтаў"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send выслаць усе паведамленні з чаргі"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [каталог]... паказаць агульную колькасць паведамленняў"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3130,45 +3130,45 @@ msgstr ""
" --status-full [каталог]...\n"
" паказаць статус кожнага каталога"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open id_каталога/нум_ліста адкрыць паведамленне ў новым акне"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr " --configdir dirname задаць каталог з файламі канфігурацыі"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport нум_порта задаць порт для аддаленых загадаў IPC"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit выйсці з Сілфіда"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug рэжым адладкі"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help паказаць гэту даведку і выйсці"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version паказаць звесткі пра версію і выйсці"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Націсніце любую клавішу..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Кадаванне імён файлаў"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3192,19 +3192,19 @@ msgstr ""
"\n"
"Працягваць?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Паведамленне ў працэсе напісання. Сапраўды выйсці?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Лісты ў чарзе"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "У чарзе засталіся недасланыя паведамленні. Выйсці зараз?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3212,20 +3212,20 @@ msgstr ""
"Праграма GnuPG не устаноўлена як след, ці яе версія надта старая.\n"
"Падтрымка OpenPGP адключаная."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Загрузка плагінаў..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "другі экземпляр Сілфіда ужо выконваецца.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Міграцыя канфігурацыі"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3880,7 +3880,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "MainWindow: размяшчэнне колеру %d схібіла\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "зроблена.\n"
@@ -6283,19 +6283,19 @@ msgstr "Дадатак"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Тэма"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Адпраўнік"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Дата"
@@ -6305,7 +6305,7 @@ msgid "Number"
msgstr "Нумар"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Каму"
@@ -6710,7 +6710,7 @@ msgstr "_Аб праграме"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - Адлеглая скрынка POP3"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Нум."
@@ -7662,15 +7662,15 @@ msgstr "Разгрупаванне..."
msgid "Filtering (%d / %d)..."
msgstr "Фільтраванне (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "фільтраванне..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Фільтраванне..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d ліст(ы) прафільтраваны."
diff --git a/po/bg.po b/po/bg.po
index 76eca437..d5aae3c3 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -20,6 +20,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Четене на конфигурация за всеки акаунт...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Папка"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Папка"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -223,77 +233,77 @@ msgstr "iconv не може да преобразува UTF-7 до %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv не може да преобразува %s до UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "не може да се запише във временен файл\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Получаване на съобщения от %s във %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "не може да се прочете mbox файл.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "невалиден mbox формат: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "деформиран mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "не може да се отвори временен файл\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
"%s"
msgstr ""
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "не може да се създаде заключващ файл %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "използвайте 'flock' вместо 'file' ако е възможно.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "не може да се създаде %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "кутията се притежава от друг процес, изчакване...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "не може да се заключи %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "невалиден тип заключване\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "не може да се отключи %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "пощенската кутия не може да се съкрати до нула.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Изнасяне на съобщения от %s във %s...\n"
@@ -312,7 +322,7 @@ msgstr "изходната папка е еднаква с назначение
msgid "Copying message %s/%d to %s ...\n"
msgstr "Копиране на съобщение %s%c%d във %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -501,16 +511,6 @@ msgstr "Намерени %s\n"
msgid "Configuration is saved.\n"
msgstr "Настройките са запазени.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Папка"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Папка"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr ""
@@ -1267,15 +1267,15 @@ msgstr "Публичен адрес"
msgid "Personal address"
msgstr "Личен адрес"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Забележка"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Предупреждение"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Грешка"
@@ -1318,7 +1318,7 @@ msgstr "Кафяв"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Никой"
@@ -1892,7 +1892,7 @@ msgstr "Дата"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Размер"
@@ -2959,158 +2959,158 @@ msgstr "Атрибути"
msgid "Sylpheed: %d new messages"
msgstr "Завършено (%d нови съобщения)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Удостоверяване"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Получаване на нови съобщения"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Отказ"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Изчакване"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Отказан"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Получаване"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Завършено (%d съобщения (%s) получени)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Няма нови съобщения."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Изпълнено."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Връзката се провали"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Удостоверяването се провали"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Заключен"
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Пауза (сек)"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Завършено (%d нови съобщения)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Завършено (няма нови съобщения)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Възникнаха грешки при получаване на пощата."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "получаване на нови съобщения от акаунт %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Удостоверяване"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Получаване на нови съобщения"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Свързване с POP3 сървър: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Удостоверяване..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Получаване на съобщения от %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Взимане на броят на нови съобщения (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Взимане на броят на нови съобщения (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Взимане на броят на нови съобщения (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Взимане на размерът на съобщенията (LIST)... "
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Изтриване на съобщение %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Прекъсване"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Връзката провалена"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Възникна грешка при обработка на пощата"
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3119,29 +3119,29 @@ msgstr ""
"Възникна грешка при обработка на пощата:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Няма свободно място на диска"
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Файлът не може да се запише."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Грешка в сокет."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Връзката е прекратена от отдалечения хост."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Пощенската кутия е заключена."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3150,11 +3150,11 @@ msgstr ""
"Пощенската кутия е заключена:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Удостоверяването се провали."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3163,16 +3163,16 @@ msgstr ""
"Удостоверяването се провали:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
#, fuzzy
msgid "Session timed out."
msgstr "сесията е просрочена\n"
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Обединяването е отменено\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -3190,16 +3190,16 @@ msgstr "Въведете парола"
msgid "Protocol log"
msgstr "Протоколен журнал"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Употреба: %s [ОПЦИЯ]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [адрес] отваряне на прозорец за съставяне"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3209,23 +3209,23 @@ msgstr ""
" отваряне на прозорец за съставяне с прикрепени\n"
" указаните файлове."
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive получаване на нови съобщения"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all\t получаване на нови съобщения от всички акаунти"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send изпращане на всички съобщения в опашката"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [папка]... показване на пълния брой на съобщения"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3233,50 +3233,50 @@ msgstr ""
" --status-full [папка]...\n"
" показване на състоянието на всяка папка"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug режим на дебъг"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug режим на дебъг"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr ""
" --help извеждане на тази помощна информация и излизане"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version извеждане на версията и излизане"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"или натиснете бутона `y'.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Изходяща кодова таблица"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3290,20 +3290,20 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Съставя се ново съобщение. Желаете ли изход от програмата?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Съобщения в опашката"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr ""
"Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3311,21 +3311,21 @@ msgstr ""
"GnuPG не е инсталиран правилно, или версията му е твърде стара.\n"
"OpenPGP поддръжката е отменена."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "друг Sylpheed е стартиран вече.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Конфигурация на действия"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4024,7 +4024,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr ""
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "готово.\n"
@@ -6521,19 +6521,19 @@ msgstr "Притурка"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Тема"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Подател"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Дата"
@@ -6543,7 +6543,7 @@ msgid "Number"
msgstr "Номер"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "До:"
@@ -6978,7 +6978,7 @@ msgstr "Относно"
msgid "%s - POP3 Remote mailbox"
msgstr "Премахване на пощенска кутия"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "No."
@@ -7928,15 +7928,15 @@ msgstr "Махане на нишките..."
msgid "Filtering (%d / %d)..."
msgstr "Филтриране..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "филтриране..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Филтриране..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 51561d0a..52b807c2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-08-08 21:02+0200\n"
"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
"Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -24,6 +24,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Načítá se nastavení všech účtů...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Filtr nevyžádané pošty (ruční)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Filtr nevyžádané pošty"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -224,34 +232,34 @@ msgstr "iconv nemůže provést konverzi z UTF-7 na %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv nemůže provést konverzi z %s na UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "nelze zapisovat do dočasného souboru\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Získávají se zprávy z %s do %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "nelze přečíst soubor s poštovní schránkou.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "neplatný formát poštovní schránky: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "selhání poštovní schránky: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "nelze otevřít dočasný soubor\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -260,43 +268,43 @@ msgstr ""
"nalezeno nezměněné záhlaví From:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "nelze vytvořit uzamčený soubor %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "pokud to jde, použijte \"flock\" namísto \"file\".\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "nelze vytvořit %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "poštovní schránka je vlastněna jiným procesem, čekejte...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "nelze uzamknout %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "neplatný typ zámku\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "nelze odemknout %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "nelze smazat poštovní schránku.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportování zprávy z %s do %s...\n"
@@ -315,7 +323,7 @@ msgstr "zdrojová složka je stejná jako cílová.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopírování zprávy %s/%d do %s...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -509,14 +517,6 @@ msgstr "Nalezeno %s\n"
msgid "Configuration is saved.\n"
msgstr "Nastavení je uloženo.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Filtr nevyžádané pošty (ruční)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Filtr nevyžádané pošty"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
@@ -1252,15 +1252,15 @@ msgstr "Obecné adresy"
msgid "Personal address"
msgstr "Osobní adresy"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Poznámka"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Varování"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Chyba"
@@ -1303,7 +1303,7 @@ msgstr "Hnědá"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Nespecifikováno"
@@ -1836,7 +1836,7 @@ msgstr "Datum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Velikost"
@@ -2860,140 +2860,140 @@ msgstr "Atributy"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: nových zpráv %d"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Autentizace přes POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Přijímají se nové zprávy"
-#: src/inc.c:514
+#: src/inc.c:521
msgid "Cancel _all"
msgstr "Zrušit _vše"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "V pohotovosti"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Zrušeno"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Přijímá se"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "zpráv %d, přijato (%s)"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "žádné nové zprávy"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Hotovo"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autentizace selhala"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Zamknuto"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Čas vypršel"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Dokončeno (nových zpráv %d)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Dokončeno (žádné nové zprávy)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Během načítání zpráv se vyskytly chyby."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "získávají se nové zprávy z účtu %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Autentizace přes POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Přijímají se nové zprávy"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Připojování k serveru POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Nelze se spojit se serverem POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autentizace..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Přijímají se zprávy z %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Zjišťuje se počet nových zpráv (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Zjišťuje se počet nových zpráv (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Zjišťuje se počet nových zpráv (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Zjišťuje se velikost zpráv (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Vymazávání zprávy %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Ukončování"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Přijímá se zpráva (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3001,15 +3001,15 @@ msgstr ""
"Vykonání příkazu k filtrování nevyžádané pošty selhalo.\n"
"Zkontrolujte prosím nastavení kontroly nevyžádané pošty."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Spojení selhalo."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Během zpracovávání pošty se vyskytla chyba."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3018,29 +3018,29 @@ msgstr ""
"Během zpracovávání pošty se vyskytla chyba:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Na disku není volné místo."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Nelze zapisovat do souboru."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Chyba socketu."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Spojení ukončeno vzdáleným hostitelem."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Poštovní schránka je zamčena."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3049,11 +3049,11 @@ msgstr ""
"Poštovní schránka je zamčena:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Autentizace selhala."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3062,15 +3062,15 @@ msgstr ""
"Autentizace selhala:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Vypršel čas relace."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Začleňování zrušeno\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Získávají se nové zprávy z %s do %s...\n"
@@ -3088,16 +3088,16 @@ msgstr "Zadejte heslo"
msgid "Protocol log"
msgstr "Záznamový protokol"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Použití: %s [VOLBY]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adresa] otevře okno psaní nové zprávy"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3107,23 +3107,23 @@ msgstr ""
" otevře okno psaní zprávy se zadanými\n"
" soubory jako přílohou"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive přijme nové zprávy"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all přijme nové zprávy ze všech účtů"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send odešle všechny pozdržené zprávy"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [složka]... vypíše celkový počet zpráv"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3131,47 +3131,47 @@ msgstr ""
" --status-full [složka]...\n"
" vypíše stav každé ze složek"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open IDsložky/číslozprávy otevře zprávu v novém okně"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir adresář určí adresář se soubory uživatelského "
"nastavení"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport čísloportu určí port pro vzdálené příkazy IPC"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit ukončí Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug režim ladění"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help vypíše tuto nápovědu a skončí"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version vypíše informaci o verzi a skončí"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Stiskněte libovolnou klávesu..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Kódování názvu souboru"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3195,19 +3195,19 @@ msgstr ""
"\n"
"Pokračovat?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Je rozepsána zpráva. Opravdu skončit?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Pozdržené zprávy"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Některé neodeslané zprávy jsou pozdržené. Skončit nyní?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3215,20 +3215,20 @@ msgstr ""
"GnuPG není korektně instalováno nebo je příliš staré verze.\n"
"Podpora OpenPGP je zakázána."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Nahrávají se zásuvné moduly..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "aplikace Sylpheed je již spuštěna.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Přenesení uživatelského nastavení"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3882,7 +3882,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "hotovo.\n"
@@ -6285,19 +6285,19 @@ msgstr "Příloha"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Předmět"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Odesílatel"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Datum"
@@ -6307,7 +6307,7 @@ msgid "Number"
msgstr "Číslo"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Příjemce"
@@ -6710,7 +6710,7 @@ msgstr "O _aplikaci"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - Vzdálená poštovní schránka POP3"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Č."
@@ -7642,15 +7642,15 @@ msgstr "Ruší se vlákna..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrování (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrování..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrování..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "filtrovaných zpráv %d."
diff --git a/po/da.po b/po/da.po
index c696fb37..63866474 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2003-07-29 09:05+0200\n"
"Last-Translator: Andreas Hinz <news3@acci.dk>\n"
"Language-Team: \n"
@@ -18,6 +18,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Læs konfiguration for hver konto...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Mappe"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Mappe"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -223,34 +233,34 @@ msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv can ikke konvertere %s til UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "kan ikke skrive til midlertidig fil\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Modtager meddelelse fra %s til %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "Kan ikke læse mbox fil.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "ugyldigt mbox format: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "ugyldig mbox format: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "kan ikke åbne midlertidig fil\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -259,43 +269,43 @@ msgstr ""
"ukodet Fra fundet:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "kan ikke oprette lock fil %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "benyt 'flock' i stedet for 'file' hvis muligt.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "kan ikke oprette %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "mailbox hører til anden process, venter...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "kan ikke låse %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "ugyldig lock type\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "kan ikke låse %s op\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "kan ikke tømme mailbox.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Eksporterer meddelelse fra %s til %s...\n"
@@ -314,7 +324,7 @@ msgstr "fra og til mappe er ens.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -505,16 +515,6 @@ msgstr "Fundet %s\n"
msgid "Configuration is saved.\n"
msgstr "Konfiguration er gemt.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Mappe"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Mappe"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
@@ -1265,15 +1265,15 @@ msgstr "Normale adresser"
msgid "Personal address"
msgstr "Personlige adresser"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Note"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Advarsel"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Fejl"
@@ -1316,7 +1316,7 @@ msgstr "Brun"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Ingen"
@@ -1890,7 +1890,7 @@ msgstr "Dato"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Størrelse"
@@ -2958,161 +2958,161 @@ msgstr "Egenskaber"
msgid "Sylpheed: %d new messages"
msgstr "Hentet (%d nye meddelelse(r))"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Godkender"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Modtager nu meddelelse"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Afbryd"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Vent"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Afbrudt"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Modtager"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Hentet (%d meddelelse(r) (%s)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Ingen nye meddelelser."
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Afsluttet"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Forbindelse mislykkedes"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Godkendelse mislykkedes"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Låst"
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Timeout (sek)"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Hentet (%d nye meddelelse(r))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Ingen nye meddelelser"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Fejl ved hentning af e-post."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "modtager nye meddelelser fra konto %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Godkender"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: henter nye meddelelser"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Forbinder til POP3 server: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Godkender..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Modtager meddelelse fra %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Modtager antal nye meddelelser (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Modtager antal nye meddelelser (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Modtager antal nye meddelelser (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Modtager antal nye meddelelser (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Sletter meddelelse %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Afslutter"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
#, fuzzy
msgid "Connection failed."
msgstr "Forbindelse mislykkedes"
-#: src/inc.c:1381
+#: src/inc.c:1399
#, fuzzy
msgid "Error occurred while processing mail."
msgstr ""
"Fejl ved bearbejdning af e-post:\n"
"%s"
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3121,30 +3121,30 @@ msgstr ""
"Fejl ved bearbejdning af e-post:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Ingen fri disk plads."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Kan ikke skrive til fil."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Sokkel fejl."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1414
+#: src/inc.c:1432
#, fuzzy
msgid "Mailbox is locked."
msgstr "postkasse er låst\n"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3153,11 +3153,11 @@ msgstr ""
"Mailbox er låst:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Godkendelses fejlede."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3166,16 +3166,16 @@ msgstr ""
"Godkendelsesfejl:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
#, fuzzy
msgid "Session timed out."
msgstr "tid udløbet\n"
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Hentning afbrudt\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3193,16 +3193,16 @@ msgstr "Indtast adgangskode"
msgid "Protocol log"
msgstr "Protokol log"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Bruges som: %s [OPTION]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adresse] åbner nyt meddelelses vindue"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3212,23 +3212,23 @@ msgstr ""
" åbn ny meddelelse med disse filer vedhæftet\n"
" ."
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive modtager nye meddelelser"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all modtager nye meddelelser fra alle konti"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send send alle meddelelser i kø"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [mappe]... viser antal meddelelser"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3236,49 +3236,49 @@ msgstr ""
" --status-full [mappe]...\n"
" viser status for hver mappe"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug debug mode"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug debug mode"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help viser denne hjælp"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version viser version og afslutter"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"eller tast `y'.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Udgående tegnsæt"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3292,19 +3292,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Du er ved at skrive ny meddelelse. Virklig afslutte?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Meddeleser i kø"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3312,21 +3312,21 @@ msgstr ""
"GnuPG er ike korrekt installeret eller i for gammel version\n"
"OpenPGP ikke mulig."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "sylpheed kører allerede.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Handlingsopsæt"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4026,7 +4026,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "HovedVindue: fejl i farve %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "Afsluttet.\n"
@@ -6518,19 +6518,19 @@ msgstr "Vedhæftet"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Emne"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Fra"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Dato"
@@ -6540,7 +6540,7 @@ msgid "Number"
msgstr "Nummer"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Til:"
@@ -6974,7 +6974,7 @@ msgstr "Om"
msgid "%s - POP3 Remote mailbox"
msgstr "Slet mappe"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nr."
@@ -7932,15 +7932,15 @@ msgstr "Fjerner tråde"
msgid "Filtering (%d / %d)..."
msgstr "Filtrering..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrering..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrering..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, fuzzy, c-format
msgid "%d message(s) have been filtered."
msgstr "meddelelse %d er allerede gemt.\n"
diff --git a/po/de.po b/po/de.po
index ea52a2a0..60d508b4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.4.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2007-09-29 23:16+0100\n"
"Last-Translator: Joo Martin <debian@joomart.de>\n"
"Language-Team: de\n"
@@ -20,6 +20,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Lese alle Einstellungen für jeden Account...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Manueller Spam-Mail Filter"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Spam-Mail Filter"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -221,34 +229,34 @@ msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv kann %s nicht nach UTF-7 konvertieren\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "kann nicht in temporäre Datei schreiben\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Erhaltene Nachrichten von %s in %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "Kann Mbox-Datei nicht lesen.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "Ungültiges Mbox-Format: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "zerstörte Mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "kann temporäre Datei nicht öffnen\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -257,43 +265,43 @@ msgstr ""
"uncodiertes Von gefunden:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "kann Sperrdatei %s nicht erstellen\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "Benutze, wenn möglich, 'flock' anstatt 'file'.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "Kann %s nicht erstellen\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "Mailbox gehört einem anderen Prozess, warten...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "kann %s nicht sperren\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "ungültiger Sperrtyp\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "kann %s nicht entperren\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "Kann Mailbox nicht auf null setzen.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportiere Nachrichten von %s in %s...\n"
@@ -312,7 +320,7 @@ msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopiere Nachricht %s/%d nach %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -505,14 +513,6 @@ msgstr "Gefunden %s\n"
msgid "Configuration is saved.\n"
msgstr "Konfiguration wurde gespeichert.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Manueller Spam-Mail Filter"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Spam-Mail Filter"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
@@ -1257,15 +1257,15 @@ msgstr "Allgemeine Adressen"
msgid "Personal address"
msgstr "Persönliche Adressen"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Notiz"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Warnung"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Fehler"
@@ -1308,7 +1308,7 @@ msgstr "Braun"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Keine"
@@ -1846,7 +1846,7 @@ msgstr "Datum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Größe"
@@ -2895,142 +2895,142 @@ msgstr "Eigenschaften"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d neue Nachricht(en)"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Beglaubigen mit POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Empfange neue Nachricht"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Abgebrochen"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Warten"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Abgebrochen"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Empfange"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Keine neuen Nachrichten."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Fertig."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Beglaubigung fehlgeschlagen"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Blockiert"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Timeout"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Beendet (%d neue Nachricht(en))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Beendet (keine neuen Nachrichten)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Fehler während des Empfanges der E-Mails."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "erhalte neue Nachrichten vom Account %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Beglaubigen mit POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Empfange neue Nachrichten"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Verbinde mit POP3-Server: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Beglaubigen..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Erhaltene Nachrichten von %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Lösche Nachricht %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Beenden"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3038,15 +3038,15 @@ msgstr ""
"Ausführung des Spamfilter-Kommandos fehlgeschlagen.\n"
"Bite überprüfen Sie die Spamfilter-Einstellungen."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Verbindung fehlgeschlagen."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Fehler beim Verarbeiten der E-Mail."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3055,29 +3055,29 @@ msgstr ""
"Fehler beim Verarbeiten der E-Mail:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Kein Platz mehr auf der Festplatte."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Kann Datei nicht schreiben."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Socket-Fehler."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Verbindung geschlossen vom Remote-Host."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Mailbox ist blockiert."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3086,11 +3086,11 @@ msgstr ""
"Mailbox ist gesperrt:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Beglaubigung fehlgeschlagen."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3099,15 +3099,15 @@ msgstr ""
"Beglaubigung fehlgeschlagen:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Sitzungszeit abgelaufen."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Empfangen abgebrochen\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3125,16 +3125,16 @@ msgstr "Kennwort eingeben"
msgid "Protocol log"
msgstr "Mitschrift des Protokolls"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Aufruf: %s [OPTION]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [Adresse] öffnet Verfassenfenster"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3144,23 +3144,23 @@ msgstr ""
" öffne Verfassen-Fenster mit angegebenen Dateien\n"
" angehängt"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive empfängt neue Nachrichten"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all empfängt neue Nachrichten von allen Accounts"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send sendet alle Nachrichten aus der Warteschlange"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [Ablage]... zeigt die Gesamtzahl aller Nachrichten"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3168,47 +3168,47 @@ msgstr ""
" --status-full [Ablage]...\n"
" zeigt die Gesamtzahl aller Nachrichten"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open OrdnerID/msgnum öffnet Nachrichten in neuem Fenster"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
"··--configdir·dirname····gib das Verzeichnis an, in dem die "
"Konfigurationsdateien gespeichert werden"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport portnum definiert Port für \"IPC remote\" Befehle"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit Beende Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug Fehlersuche"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help diese Hilfe"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version gibt Version aus und beendet"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Drücken Sie eine Taste"
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Dateiname Zeichensatz"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3232,19 +3232,19 @@ msgstr ""
"\n"
"Weiter?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Verfasste Nachricht existiert. Wirklich beenden?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Wartende Nachrichten"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3252,20 +3252,20 @@ msgstr ""
"GnuPG is nicht richtig installiert, oder die Version ist zu alt.\n"
"OpenPGP-Unterstützung ausgeschaltet"
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "Ein anderes Sylpheed läuft schon.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Konfigurationsmigration"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3927,7 +3927,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "Fertig.\n"
@@ -6358,19 +6358,19 @@ msgstr "Anhang"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Betreff"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Von"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Datum"
@@ -6380,7 +6380,7 @@ msgid "Number"
msgstr "Nummer"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "An"
@@ -6794,7 +6794,7 @@ msgstr "_Über"
msgid "%s - POP3 Remote mailbox"
msgstr "Entferne Mailbox"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nr."
@@ -7760,15 +7760,15 @@ msgstr "Threads aufheben..."
msgid "Filtering (%d / %d)..."
msgstr "Filtern (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtern..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtern..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
diff --git a/po/el.po b/po/el.po
index 9fb0d116..ee529a39 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.4.0beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2007-03-17 00:57+0200\n"
"Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -21,6 +21,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Ανάγνωση ρυθμίσεων λογαριασμών...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας (χειροκίνητο)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -227,77 +235,77 @@ msgstr "Δεν είναι δυνατή η μετατροπή του UTF-7 σε %
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "Δεν είναι δυνατή η μετατροπή του %s σε UTF-7 από το iconv\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "δεν είναι δυνατή η εγγραφή στο προσωρινό αρχείο\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, fuzzy, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Μετακίνηση μηνυμάτων στο φάκελο %s"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "δεν είναι δυνατή η ανάγνωση από το αρχείο mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "μη έγκυρη μορφή mbox: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "κακοσχηματισμένο mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "δεν είναι δυνατό το άνοιγμα του προσωρινού αρχείου\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, fuzzy, c-format
msgid ""
"unescaped From found:\n"
"%s"
msgstr "Το αρχείο δε βρέθηκε."
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "δεν είναι δυνατή η δημιουργία αρχείου κλειδώματος %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr ""
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "δεν είναι δυνατή η δημιουργία του %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "το γραμματοκιβώτιο ανήκει σε άλλη διεργασία, αναμονή...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "δεν είναι δυνατό το κλείδωμα του %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "μη έγκυρος τύπος κλειδιού\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "δεν είναι δυνατό το ξεκλείδωμα του %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "δεν είναι δυνατή η περικοπή του γραμματοκιβωτίου σε μηδενικό.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Εξαγωγή μηνυμάτων από το %s στο %s...\n"
@@ -316,7 +324,7 @@ msgstr "ο φάκελος προορισμού είναι ο ίδιος με τ
msgid "Copying message %s/%d to %s ...\n"
msgstr "Αντιγραφή μηνύματος %s%c%d στο %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -511,14 +519,6 @@ msgstr "Βρέθηκαν %s\n"
msgid "Configuration is saved.\n"
msgstr "Οι ρυθμίσεις αποθηκεύτηκαν.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας (χειροκίνητο)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Η μετατροπή του κώδικα απέτυχε.\n"
@@ -1284,15 +1284,15 @@ msgstr "Κοινές διευθύνσεις"
msgid "Personal address"
msgstr "Προσωπικές διευθύνσεις"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Σημείωση"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Προειδοποίηση"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Σφάλμα"
@@ -1336,7 +1336,7 @@ msgstr "Καφέ"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Κανένα"
@@ -1880,7 +1880,7 @@ msgstr "Ημερομηνία"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Μέγεθος"
@@ -2945,157 +2945,157 @@ msgstr "Γνωρίσματα"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d νέα μηνύματά"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Πιστοποίηση με POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Λήψη νέων μηνυμάτων"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Ακυρώθηκε"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Σε αναμονή"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Ακυρώθηκε"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Λήψη"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Ολοκληρώθηκε (%d μηνύματα (%s) παρελήφθησαν)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Δεν υπάρχουν νέα μηνύματα."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Έγινε."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Η εντολή Auth απέτυχε"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Κλειδωμένο"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Όριο χρόνου"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Ολοκληρώθηκε (%d νέα μηνύματα)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Ολοκληρώθηκε (δεν υπάρχουν νέα μηνύματα)"
-#: src/inc.c:814
+#: src/inc.c:830
#, fuzzy
msgid "Some errors occurred while getting mail."
msgstr "Συνέβησαν σφάλματα κατά την αποστολή των μηνυμάτων στην ουρά."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "λήψη νέων μηνυμάτων λογαριασμού %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Πιστοποίηση με POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Λήψη νέων μηνυμάτων"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Σύνδεση με το διακομιστή POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Πιστοποίηση..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Λήψη μηνυμάτων από %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Λήψη αριθμού νέων μηνυμάτων (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Λήψη αριθμού νέων μηνυμάτων (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Λήψη μεγέθους μηνυμάτων (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Διαγραφή μηνύματος %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Κλείνω τη σύνδεση"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Λαμβάνεται το μήνυμα (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Η σύνδεση απέτυχε."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το μήνυμα."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3104,29 +3104,29 @@ msgstr ""
"Δημιουργήθηκε σφάλμα κατά την επεξεργασία μηνυμάτων:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Δεν είναι δυνατή η εγγραφή του αρχείου."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Σφάλμα σύνδεσης."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Η σύνδεση έκλεισε από τον απομακρυσμένο υπολογιστή."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Το γραμματοκιβώτιο είναι κλειδωμένο."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3135,11 +3135,11 @@ msgstr ""
"Το γραμματοκιβώτιο είναι κλειδωμένο:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Η πιστοποίηση απέτυχε."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3148,15 +3148,15 @@ msgstr ""
"Η πιστοποίηση απέτυχε:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Λήξη χρόνου σύνδεσης."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Η ενσωμάτωση ακυρώθηκε\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Λήψη μηνυμάτων από %s στο %s ...\n"
@@ -3174,16 +3174,16 @@ msgstr "Δώστε τον κωδικό"
msgid "Protocol log"
msgstr "Καταγραφή πρωτοκόλλου"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [διεύθυνση] άνοιγμα παραθύρου σύνθεσης"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3193,23 +3193,23 @@ msgstr ""
" άνοιγμα του παραθύρου σύνθεσης μηνύματος με\n"
" τα καθορισμένα αρχεία συνημμένα"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive λήψη νέων μηνυμάτων"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all λήψη νέων μηνυμάτων όλων των λογαριασμών"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send αποστολή όλων των μηνυμάτων στην ουρά"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [φάκελος]... εμφάνιση του συνολικού αριθμού μηνυμάτων"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3217,47 +3217,47 @@ msgstr ""
" --status-full [φάκελος]...\n"
" εμφάνιση της κατάστασης του φακέλου"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --config-dir κατάλογος ορίζει τον κατάλογο που αποθηκεύονται τα αρχεία "
"ρυθμίσεων"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit έξοδος από το Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug λειτουργία αποσφαλμάτωσης"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help εμφάνιση αυτού του κειμένου και έξοδος"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version εμφάνιση της έκδοσης και έξοδος"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Πατήστε ένα πλήκτρο..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Κωδικοποίηση ονομάτων αρχείων"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3282,19 +3282,19 @@ msgstr ""
"\n"
"Συνέχεια;"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Υπάρχει ήδη μήνυμα υπό σύνθεση. Να γίνει έξοδος;"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Μηνύματα στην ουρά"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3302,20 +3302,20 @@ msgstr ""
"Το GnuPG δεν έχει εγκατασταθεί σωστά, ή χρειάζεται αναβάθμιση.\n"
"Η υποστήριξη OpenPGP απενεργοποιήθηκε."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "Τρέχει ήδη ένα Sylpheed.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Μεταφορά ρυθμίσεων"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3985,7 +3985,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr ""
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "έγινε.\n"
@@ -6418,19 +6418,19 @@ msgstr "Συνημμένο"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Θέμα"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Από"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Ημερομηνία"
@@ -6440,7 +6440,7 @@ msgid "Number"
msgstr "Αριθμός"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Προς:"
@@ -6858,7 +6858,7 @@ msgstr "_Σχετικά"
msgid "%s - POP3 Remote mailbox"
msgstr "Αφαίρεση γραμματοκιβωτίου"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Όχι."
@@ -7813,15 +7813,15 @@ msgstr ""
msgid "Filtering (%d / %d)..."
msgstr "Εφαρμογή φίλτρων (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "Εφαρμογή φίλτρων..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Φιλτράρω..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "Φιλτραρίστηκαν %d μηνύματα."
diff --git a/po/es.po b/po/es.po
index 1fa404b8..677f8876 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-02-24 08:05+0100\n"
"Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
"Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -18,6 +18,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Leyendo configuración de cada cuenta...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Filtro de correo basura (manual)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Filtro de correo basura"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -218,34 +226,34 @@ msgstr "iconv no puede convertir UTF-7 a %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv no puede convertir %s a UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "no se puede escribir el fichero temporal\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Obteniendo mensajes desde %s en %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "no puedo leer el fichero mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "formato de mbox inválido: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "mbox mal formada: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "no se puede abrir el fichero temporal\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -254,43 +262,43 @@ msgstr ""
"Encontrado «From» sin proteger:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "no se puede crear el fichero de bloqueo %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "usar «flock» en vez de «file» si es posible.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "no puedo crear %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "el buzón esta siendo usado por otro proceso, esperando...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "no se puede bloquear %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "tipo de bloqueo no válido\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "no se puede desbloquear %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "no se puede truncar a cero el buzón.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportando mensajes de %s a %s...\n"
@@ -309,7 +317,7 @@ msgstr "las carpetas de origen y destino son idénticas.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Copiando mensaje %s/%d a %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -503,14 +511,6 @@ msgstr "Encontrado %s\n"
msgid "Configuration is saved.\n"
msgstr "Configuración guardada.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Filtro de correo basura (manual)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Filtro de correo basura"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
@@ -1253,15 +1253,15 @@ msgstr "Dirección común"
msgid "Personal address"
msgstr "Dirección personal"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Notificación"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Error"
@@ -1304,7 +1304,7 @@ msgstr "Marrón"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Ninguno"
@@ -1838,7 +1838,7 @@ msgstr "Fecha"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Tamaño"
@@ -2869,141 +2869,141 @@ msgstr "Atributos"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d mensajes nuevos"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Autentificando con POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Obteniendo nuevos mensajes"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Cancelar"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "En espera"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Cancelado"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Recuperando"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d mensaje(s) (%s) recibido(s)"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "no hay mensajes nuevos"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Hecho"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Conexión fallida"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Authorización fallida"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Bloqueado"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Tiempo límite"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Finalizado (%d mensaje(s) nuevo(s))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Finalizado (no hay mensajes nuevos)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Hubo algún error obteniendo el correo."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Autentificando con POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Recuperando nuevos mensajes"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Conectando al servidor POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "No se puede conectar al servidor POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autentificando..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Obteniendo mensajes desde %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Borrando mensaje %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Saliendo"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3011,15 +3011,15 @@ msgstr ""
"La ejecución de la orden del filtro de correo basura falló.\n"
"Por favor, compruebe la configuración del filtro de correo basura."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Conexión fallida."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Hubo un error mientras se procesaba el correo."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3028,29 +3028,29 @@ msgstr ""
"Hubo un error procesando el correo:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "No hay espacio libre en disco."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "No se puede escribir el fichero."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Error de socket."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Conexión cerrada por la máquina remota."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "El buzón esta bloqueado."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3059,11 +3059,11 @@ msgstr ""
"El buzón está bloqueado:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "La autentificación falló."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3072,15 +3072,15 @@ msgstr ""
"La autentificación falló:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Se agotó el tiempo de espera de la sesión."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Incorporación cancelada\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -3098,16 +3098,16 @@ msgstr "Contraseña"
msgid "Protocol log"
msgstr "Traza del protocolo"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPCIÓN]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [dirección] abre la ventana de composición"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3117,23 +3117,23 @@ msgstr ""
" abre la ventana de composición con los ficheros\n"
" especificados como adjuntos"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive recive los mensajes nuevos"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all recibe nuevos para todas las cuentas"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send enviar todos los mensajes en la cola"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [carpeta]... muestra el número total de mensajes"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3141,47 +3141,47 @@ msgstr ""
" --status-full [carpeta]...\n"
" muestra el estado de cada carpeta"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open idcarpeta/nºmsj abre el mensaje en una ventana nueva"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir nombredir indicar el directorio con ficheros de configuración"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
" --ipcport numpuerto especificar el puerto IPC para órdenes remotas"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit finalizar Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug modo de depuración"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help presenta esta ayuda y finaliza"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version da la información de la versión y finaliza"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Pulse cualquier tecla..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Codificación de los nombres de fichero"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3205,19 +3205,19 @@ msgstr ""
"\n"
"¿Desea continuar?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Mensajes en cola"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3225,20 +3225,20 @@ msgstr ""
"GnuPG no esta convenientemente instalado, o es una versión antigua.\n"
"Soporte para OpenPGP deshabilitado."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Cargando complementos..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "ya hay otro Sylpheed en ejecución.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Migración de la configuración"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3893,7 +3893,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "MainWindow: fallo solicitando color %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "hecho.\n"
@@ -6299,19 +6299,19 @@ msgstr "Adjunto"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Asunto"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Desde"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Fecha"
@@ -6321,7 +6321,7 @@ msgid "Number"
msgstr "Número"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Para"
@@ -6726,7 +6726,7 @@ msgstr "A_cerca de"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - Buzón remoto POP3"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "No."
@@ -7664,15 +7664,15 @@ msgstr "Deshaciendo hilos..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrando (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrando..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrando..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "se ha(n) filtrado %d mensaje(s)."
diff --git a/po/et.po b/po/et.po
index 84dfece5..5fb9559a 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -18,6 +18,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Loen kõigi kontode seaded...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Kaust"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Kaust"
+
#: libsylph/imap.c:537
#, fuzzy, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -226,34 +236,34 @@ msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "ei suuda kirjutada ajutisse faili\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Võtan kirju %s-st ja panen %s-i...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "Ei saa lugeda kirjakasti faili.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "sobimatu kirjakasti formaat: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "paha mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "ei saa avada ajutist fili\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -262,43 +272,43 @@ msgstr ""
"Vabanematuid (kellelt) leitud:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "ei saa luua lukufaili %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "kasuta 'flock'-i 'file' asemel kui võimalik.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "ei suuda luua %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "kirjakasti kasutab teine protsess, ootan...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "ei suuda lukustada %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "vale luku tüüp\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "ei saa lukku eemaldada %s-lt\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "kirjakasti ei saa lõigata nulliks.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Ekspordime teated %s-ist %s-i ...\n"
@@ -317,7 +327,7 @@ msgstr "lähtekaust on identne sihtkaustale.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -508,16 +518,6 @@ msgstr "Leiti %s\n"
msgid "Configuration is saved.\n"
msgstr "Häälestus on salvestatud.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Kaust"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Kaust"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
@@ -1272,15 +1272,15 @@ msgstr "Üldine aadress"
msgid "Personal address"
msgstr "Isiklik aadress"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Märkus"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Hoiatus"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Viga"
@@ -1323,7 +1323,7 @@ msgstr "Pruun"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Mittemiski"
@@ -1898,7 +1898,7 @@ msgstr "Kuupäev"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Suurus"
@@ -2970,216 +2970,216 @@ msgstr "Atribuudid"
msgid "Sylpheed: %d new messages"
msgstr "Lõpetatud (%d uut kirja)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Autoriseerimine"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Võtan uusi kirju"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Loobu"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "*Juures"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Katkestatud"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Tirin"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Valmis (%d kirja (%s)-st võetud)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Uusi kirju ei ole."
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Tehtud"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Ühendus ebaõnnestus"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autoriseerimine ebaõnnestus"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Lukustatud"
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Ajalimiit (sek)"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Lõpetatud (%d uut kirja)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Lõpetatud (uusi kirju pole)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Tekksiid mõned vead kirjade võtmisel."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "võtan uued kirjad kontolt %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Autoriseerimine"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Uute kirjade võtmine"
-#: src/inc.c:862
+#: src/inc.c:878
#, fuzzy, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Ühendan POP3 serveriga: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autoriseerin..."
-#: src/inc.c:963
+#: src/inc.c:979
#, fuzzy, c-format
msgid "Retrieving messages from %s..."
msgstr "Võtan kirju %s-st ja panen %s-i...\n"
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Võtan uute kirjade arvu (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Võtan uute kirjade arvu (STAT)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Võtan uute kirjade arvu (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Võtan kirjade suuruse (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Kustutan kirja %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Väljun"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Võtan kirja (%d /%d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
#, fuzzy
msgid "Connection failed."
msgstr "Ühendus ebaõnnestus"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Tekkis viga kirja protsessimisel."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, fuzzy, c-format
msgid ""
"Error occurred while processing mail:\n"
"%s"
msgstr "Tekkis viga kirja protsessimisel."
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Ketas täis."
-#: src/inc.c:1397
+#: src/inc.c:1415
#, fuzzy
msgid "Can't write file."
msgstr "Ei saa kirjutada faili.\n"
-#: src/inc.c:1402
+#: src/inc.c:1420
#, fuzzy
msgid "Socket error."
msgstr "Soketi viga\n"
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Kirjakast on lukus."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, fuzzy, c-format
msgid ""
"Mailbox is locked:\n"
"%s"
msgstr "Kirjakast on lukus."
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
#, fuzzy
msgid "Authentication failed."
msgstr "Autoriseerimise meetod"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Autoriseerimise meetod"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr ""
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Sissekanne peatatud\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -3197,16 +3197,16 @@ msgstr "Sisesta parool"
msgid "Protocol log"
msgstr "Protokolli sündmustik"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Kauta: %s [SEADED]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [aadress] ava kirjakirjutamise aken"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3216,73 +3216,73 @@ msgstr ""
" ava uue kirja aken nii, et märgitud failid\n"
" on manustatud kirjale"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive võta uued kirjad"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all võta uued kirjad kõigilt konto"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --saada saada kõik järjekorras olevad kirjad"
-#: src/main.c:593
+#: src/main.c:608
#, fuzzy
msgid " --status [folder]... show the total number of messages"
msgstr " --staatus näita kogu kirjade arvu"
-#: src/main.c:594
+#: src/main.c:609
#, fuzzy
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr " --staatus näita kogu kirjade arvu"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug veaotsimise režiim"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug veaotsimise režiim"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help näita seda teadet ja välju"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version näita versiooni informatsiooni ja välju"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"või vajuta 'y' klahvi.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Väljuva kirja kooditabel"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3296,19 +3296,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Kirjakirjutamine on pooleli. Tõesti lõpetame?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "kirjad järjekorras"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3316,21 +3316,21 @@ msgstr ""
"GnuPG pole installeeritud, või on liialt vana.\n"
"OpenPGP toetus keelustatud."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "üks teine Sylpheed juba töötab.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4031,7 +4031,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "tehtud.\n"
@@ -6524,19 +6524,19 @@ msgstr "Manus"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Pealkiri"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Kellelt"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Kuupäev"
@@ -6546,7 +6546,7 @@ msgid "Number"
msgstr "Number"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Kellele:"
@@ -6980,7 +6980,7 @@ msgstr "Sellest"
msgid "%s - POP3 Remote mailbox"
msgstr "Eemalda kirjakst"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Ei."
@@ -7932,15 +7932,15 @@ msgstr "Eemaldan teemad..."
msgid "Filtering (%d / %d)..."
msgstr "Filtreerin..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtreerin..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtreerin..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, fuzzy, c-format
msgid "%d message(s) have been filtered."
msgstr "kiri %d on juba salvestatud.\n"
diff --git a/po/fr.po b/po/fr.po
index 5731981e..d9d95ecf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-06-19 02:21+0200\n"
"Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
"Language-Team: French <gnomefr@traduc.org>\n"
@@ -28,6 +28,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Lecture de la configuration des comptes...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Tri (manuel) des indésirables"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Dossier des messages indésirables"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -228,34 +236,34 @@ msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv ne peut convertir de %s vers UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "Impossible d'écrire dans le fichier temporaire\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Réception des messages de %s dans %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "Impossible de lire le fichier mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "Format mbox invalide : %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "mbox mal formée : %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "Impossible d'ouvrir un fichier temporaire\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -264,43 +272,43 @@ msgstr ""
"From 'unescaped' trouvé :\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "Impossible de créer le fichier verrou %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "Utilisation de 'flock' à la place de 'file' si possible\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "Impossible de créer %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "mailbox utilisée par un autre processus, attente...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "Impossible de verrouiller %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "Type de verrou invalide\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "Impossible de déverrouiller %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "Impossible de vider la boîte aux lettres.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportation des messages de %s vers %s...\n"
@@ -319,7 +327,7 @@ msgstr "dossier source identique à la destination.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Copie du message %s/%d vers %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -516,14 +524,6 @@ msgstr "Trouvé %s\n"
msgid "Configuration is saved.\n"
msgstr "La configuration est enregistrée.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Tri (manuel) des indésirables"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Dossier des messages indésirables"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content() : la conversion de code a échoué.\n"
@@ -1269,15 +1269,15 @@ msgstr "Adresse courante :"
msgid "Personal address"
msgstr "Adresse personnelle :"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Information"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Avertissement"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Erreur"
@@ -1320,7 +1320,7 @@ msgstr "Brun"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Aucun"
@@ -1854,7 +1854,7 @@ msgstr "Date"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Taille"
@@ -2889,141 +2889,141 @@ msgstr "Attributs"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed : %d nouveau(x) message(s)"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Authentification POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Récupération des nouveaux messages"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Annuler"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Attente"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Annulé"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Récupération"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d message(s) (%s) reçu(s)"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "pas de nouveau message"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Terminé"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "La connexion a échoué"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "L'authentification a échoué"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Verrouillé"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Délai d'attente"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Terminé - %d nouveau(x) message(s)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Terminé - pas de nouveau(x) message(s)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Erreur lors de la récupération des messages."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "Récupération des nouveaux messages du compte %s ...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s : Authentification POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s : Récupération des nouveaux messages"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Connexion au serveur POP3 : %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Authentification..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Réception des messages de %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Récupération du nombre de nouveaux messages (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Récupération du nombre de nouveaux messages (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Récupération de la taille des messages (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Suppression du message %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Fermeture"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Récupération du message (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3031,15 +3031,15 @@ msgstr ""
"Erreur dans la gestion des messages indésirables.\n"
"Vérifier les paramètres."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "La connexion a échoué."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Une erreur est survenue pendant le traitement du message."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3048,29 +3048,29 @@ msgstr ""
"Une erreur est survenue pendant le traitement du message :\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Plus de place disponible sur le disque."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Impossible d'écrire dans le fichier."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Erreur de protocole."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "La connexion a été fermée par le serveur."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Boîte verrouillée."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3079,11 +3079,11 @@ msgstr ""
"Boîte verrouillée :\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "L'authentification à échoué."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3092,15 +3092,15 @@ msgstr ""
"L'authentification a échoué :\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Dépassement du délai de réponse (timeout) de la session."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Relève du courrier annulée\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3118,16 +3118,16 @@ msgstr "Saisissez le mot de passe"
msgid "Protocol log"
msgstr "Journal de connexion"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Utilisation : %s [OPTION]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adresse] ouvrir une fenêtre de composition de message"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3138,24 +3138,24 @@ msgstr ""
"(s)\n"
" jointe(s) le(s) fichier(s) spécifié(s)"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive récupérer les nouveaux messages"
-#: src/main.c:591
+#: src/main.c:606
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:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send envoyer les messages en attente"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [dossier]... afficher le nombre total de messages"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3163,50 +3163,50 @@ msgstr ""
" --status-full [dossier]...\n"
" afficher l'état de chaque dossier"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
" --open [id dossier]/[numéro du message] ouvrir le message dans une "
"nouvelle fenêtre"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir dossier indiquer le dossier contenant les fichiers de "
"configuration"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
" --ipcport portnum spécifier le port pour les commandes IPC distantes"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit quitter Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug afficher les informations de mise au point"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help afficher l'aide-mémoire"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version afficher les informations de version"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Appuyez sur une touche..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Jeu de caractères du nom de fichier"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3230,23 +3230,23 @@ msgstr ""
"\n"
"Poursuivre ?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr ""
"Une fenêtre de composition de message existe.\n"
"Voulez-vous vraiment quitter ?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Messages en file d'attente"
-#: src/main.c:839
+#: src/main.c:854
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:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3254,20 +3254,20 @@ msgstr ""
"GnuPG n'est pas installé correctement.\n"
"Support OpenPGP désactivé."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Chargement des plug-ins..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "une autre session de Sylpheed existe.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Migration de la configuration"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3926,7 +3926,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "terminé.\n"
@@ -6346,19 +6346,19 @@ msgstr "Pièces jointes"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Sujet"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Expéditeur"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Date"
@@ -6368,7 +6368,7 @@ msgid "Number"
msgstr "Numéro"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "À"
@@ -6775,7 +6775,7 @@ msgstr "À _propos"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - boîte POP3 à distance"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "N°"
@@ -7716,15 +7716,15 @@ msgstr "Suppression des threads..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrage (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "tri en cours..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Tri en cours..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d message(s) ont été filtré(s)."
diff --git a/po/gl.po b/po/gl.po
index 147ffca6..ff2f3f25 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2003-01-17 10:05+0100\n"
"Last-Translator: Jorge Rivas\n"
"Language-Team: Jorge Rivas\n"
@@ -18,6 +18,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Lendo configuración de cada conta...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Carpeta"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Carpeta"
+
#: libsylph/imap.c:537
#, fuzzy, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -225,34 +235,34 @@ msgstr "iconv non pode convertir UTF-7 a %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv non pode convertir %s a UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "non se pode escribir o ficheiro temporal\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Obtendo mensaxes dende %s en %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "non podo ler o ficheiro mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "formato de mbox inválido: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "mbox malformada: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "non se pode abrir o ficheiro temporal\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -261,43 +271,43 @@ msgstr ""
"Atopado Dende sin escapar:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "non se pode crear o ficheiro de bloqueo %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "usar 'flock' en vez de 'file' si é posible.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "non podo crear %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "a caixa de correo esta sendo usada por outro proceso, esperando...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "non se pode bloquear %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "tipo de bloqueo non válido\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "non se pode desbloquear %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "non se pode truncar a cero a caixa de correo.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportando mensaxes de %s a %s...\n"
@@ -316,7 +326,7 @@ msgstr "carpetas de orixen e destiño idénticas.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Copiando mensaxe %s%c%d a %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -505,16 +515,6 @@ msgstr "Atopado %s\n"
msgid "Configuration is saved.\n"
msgstr "Configuración gardada.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Carpeta"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Carpeta"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
@@ -1271,15 +1271,15 @@ msgstr "Enderezo común"
msgid "Personal address"
msgstr "Enderezo persoal"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Notificación"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Erro"
@@ -1322,7 +1322,7 @@ msgstr "Marrón"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Ningún"
@@ -1897,7 +1897,7 @@ msgstr "Data"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Tamaño"
@@ -2966,159 +2966,159 @@ msgstr "Atributos"
msgid "Sylpheed: %d new messages"
msgstr "Finalizado (%d mensaxe(s) novo(s))"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Autenticando"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Obtendo novos mensaxes"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Cancelar"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "En espera"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Cancelado"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Recuperando"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Non hai mensaxes novas."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Feito."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Conexión fallida"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autorización fallida"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Bloqueado"
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Tiempo límite (seg.)"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Finalizado (%d mensaxe(s) novo(s))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Finalizado (non hai mensaxes novos)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Ocurriu algún erro obtendo o correo."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "obtendo novas mensaxes da conta %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Autenticando"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Recuperando novas mensaxes"
-#: src/inc.c:862
+#: src/inc.c:878
#, fuzzy, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Conectando ó servidor POP3: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autenticando..."
-#: src/inc.c:963
+#: src/inc.c:979
#, fuzzy, c-format
msgid "Retrieving messages from %s..."
msgstr "Obtendo mensaxes dende %s en %s...\n"
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Obtendo o número de novas mensaxes (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Obtendo o número de novas mensaxes (STAT)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Obtendo o número de novas mensaxes (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Borrando mensaxe %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Saíndo"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
#, fuzzy
msgid "Connection failed."
msgstr "Conexión fallida"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Ocurriu un erro mentras se procesaba o correo."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3127,29 +3127,29 @@ msgstr ""
"Ocurriu un erro mentras se procesaba o correo:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Non hai espacio libre no disco."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Non se pode escribir o ficheiro."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Error de socket."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "a caixa de correo esta bloqueada."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3158,12 +3158,12 @@ msgstr ""
"a caixa de correo esta bloqueada:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
#, fuzzy
msgid "Authentication failed."
msgstr "Fallo de autenticación"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
@@ -3172,15 +3172,15 @@ msgstr ""
"Fallo de autenticación:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr ""
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Incorporación cancelada\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3198,16 +3198,16 @@ msgstr "Contrasinal"
msgid "Protocol log"
msgstr "Rexistro do protocolo"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPCIÓN]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [dirección] abre a fiestra de edición"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3217,73 +3217,73 @@ msgstr ""
" abre a fiestra de composición con os ficheiros\n"
" especificados como adxuntos"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive recibe as mensaxes novas"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all recibe novas mensaxes para todas as contas"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send enviar todas as mensaxes na cola"
-#: src/main.c:593
+#: src/main.c:608
#, fuzzy
msgid " --status [folder]... show the total number of messages"
msgstr " --status mostra o número total de mensaxes"
-#: src/main.c:594
+#: src/main.c:609
#, fuzzy
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr " --status mostra o número total de mensaxes"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug modo de depuración"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug modo de depuración"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help presenta esta axuda e finaliza"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version da a información da versión e finaliza"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"ou pulse a tecla `y'.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Codificación para enviar"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3297,19 +3297,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Está compoñendo unha mensaxe. ¿Quere sair?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Mensaxes en cola"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3317,21 +3317,21 @@ msgstr ""
"GnuPG non esta convenientemente instalado, ou é unha versión antiga.\n"
"Soporte para OpenPGP deshabilitado."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "xa hai outro Sylpheed executándose.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "configuración das accions"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4031,7 +4031,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "MainWindow: fallo solicitando cor %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "feito.\n"
@@ -6523,19 +6523,19 @@ msgstr "Adxunto"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Asunto"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Dende"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Data"
@@ -6545,7 +6545,7 @@ msgid "Number"
msgstr "Número"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Para:"
@@ -6978,7 +6978,7 @@ msgstr "Acerca de"
msgid "%s - POP3 Remote mailbox"
msgstr "Eliminar mailbox"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Non."
@@ -7931,15 +7931,15 @@ msgstr "Desfacendo xerarquía..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrando..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrando..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrando..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, fuzzy, c-format
msgid "%d message(s) have been filtered."
msgstr "o mensaxe %d xa esta en caché.\n"
diff --git a/po/hr.po b/po/hr.po
index 3e801c32..955d6bf9 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -18,6 +18,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Čitam konfiguracije za svaki račun...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Spis"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Spis"
+
#: libsylph/imap.c:537
#, fuzzy, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -227,34 +237,34 @@ msgstr ""
msgid "iconv cannot convert %s to UTF-7\n"
msgstr ""
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "ne mogu pisati u privremenu datoteku\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Primam poruke sa %s u %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "ne mogu čitati mbox datoteku.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "pogrešan mbox format: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "pokvaren mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "ne mogu otvoriti privremenu datoteku\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -263,43 +273,43 @@ msgstr ""
"neizbježan Od pronađen:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "ne mogu kreirati lock datoteku %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "koristi 'flock' umjesto 'file' ako je moguće.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "ne mogu kreirati %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "neki drugi proces koristi sandučić, čekam...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "ne mogu zaključati %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "neispravan tip zaključavanja\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "ne mogu otključati %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "ne mogu skratiti sandučić na nulu.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Izvozim poruke iz %s u %s...\n"
@@ -318,7 +328,7 @@ msgstr "izvorni spis jednak je destinaciji.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopiram poruke %s%c%d u %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -511,16 +521,6 @@ msgstr "Pronađen %s\n"
msgid "Configuration is saved.\n"
msgstr "Konfiguracija je spremljena.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Spis"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Spis"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
@@ -1269,15 +1269,15 @@ msgstr "Uobičajene adrese"
msgid "Personal address"
msgstr "Osobne adrese"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Obavijest"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Upozorenje"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Greška"
@@ -1320,7 +1320,7 @@ msgstr "Smeđa"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Ništa"
@@ -1903,7 +1903,7 @@ msgstr "Datum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Veličina"
@@ -2992,219 +2992,219 @@ msgstr "Atributi korisnika"
msgid "Sylpheed: %d new messages"
msgstr "\t%d novih poruka\n"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Autorizacija"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Primam nove poruke"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Odustani"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Standby"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Otkazano"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Primam"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Ukloni poruke sa poslužitelja nakon primanja"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Nema nepročitanih poruka."
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Gotovo"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Veza nije uspjela"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Identifikacija nije uspjela"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr ""
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Timeout (sek)"
-#: src/inc.c:802
+#: src/inc.c:818
#, fuzzy, c-format
msgid "Finished (%d new message(s))"
msgstr "\t%d novih poruka\n"
-#: src/inc.c:805
+#: src/inc.c:821
#, fuzzy, c-format
msgid "Finished (no new messages)"
msgstr "Nema nepročitanih poruka"
-#: src/inc.c:814
+#: src/inc.c:830
#, fuzzy
msgid "Some errors occurred while getting mail."
msgstr "Došlo je do grešaka prilikom primanja pošte."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "primam nove poruke s računa %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Autorizacija"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Primam nove poruke"
-#: src/inc.c:862
+#: src/inc.c:878
#, fuzzy, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Povezujem se na POP3 poslužitelj: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Prijavljujem se..."
-#: src/inc.c:963
+#: src/inc.c:979
#, fuzzy, c-format
msgid "Retrieving messages from %s..."
msgstr "Primam poruke sa %s u %s...\n"
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Primam broj novih poruka (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Primam broj novih poruka (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Primam broj novih poruka (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Primam veličinu poruka (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, fuzzy, c-format
msgid "Deleting message %d"
msgstr "Brišem poruke"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Izlazim"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Primam poruke (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
#, fuzzy
msgid "Connection failed."
msgstr "Veza nije uspjela"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Došlo je do greške pri radu s poštom."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, 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:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Nema više mjesta na disku."
-#: src/inc.c:1397
+#: src/inc.c:1415
#, fuzzy
msgid "Can't write file."
msgstr "Ne mogu pisati u datoteku.\n"
-#: src/inc.c:1402
+#: src/inc.c:1420
#, fuzzy
msgid "Socket error."
msgstr "protokol greška\n"
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1414
+#: src/inc.c:1432
#, fuzzy
msgid "Mailbox is locked."
msgstr "Postavke sandučića"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, fuzzy, c-format
msgid ""
"Mailbox is locked:\n"
"%s"
msgstr "Postavke sandučića"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
#, fuzzy
msgid "Authentication failed."
msgstr "Autorizacija"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Autorizacija"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr ""
-#: src/inc.c:1475
+#: src/inc.c:1493
#, fuzzy
msgid "Incorporation cancelled\n"
msgstr "Prima novu poštu"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Primam nove poruke s %s u %s...\n"
@@ -3222,90 +3222,90 @@ msgstr "Unesite lozinku"
msgid "Protocol log"
msgstr "Zapis protokola"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Upotreba: %s [OPCIJA]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adresa] otvara prozor za pisanje"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
" attached"
msgstr ""
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive prima nove poruke"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all prima sve poruke sa svih računa"
-#: src/main.c:592
+#: src/main.c:607
#, fuzzy
msgid " --send send all queued messages"
msgstr " --recive prikazuje broj poruka"
-#: src/main.c:593
+#: src/main.c:608
#, fuzzy
msgid " --status [folder]... show the total number of messages"
msgstr " --recive prikazuje broj poruka"
-#: src/main.c:594
+#: src/main.c:609
#, fuzzy
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr " --recive prikazuje broj poruka"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug debug način"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug debug način"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help prikazuje ovu pomoć i izlazi"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version prikazuje verziju i izlazi"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"ili pritisnite `y´ tipku.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Izlazni charset"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3319,19 +3319,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Pisanje poruke postoji. Uistinu prekinuti?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Odložene poruke"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
-#: src/main.c:964
+#: src/main.c:979
#, fuzzy
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
@@ -3340,21 +3340,21 @@ msgstr ""
"GnuPG nije pravilno instaliran.\n"
"OpenPGP podrška je onemogućena."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "drugi Sylpheed već radi.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Pišem konfiguraciju filtera...\n"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4121,7 +4121,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "MainWindow: prikaz boje %d nije uspio\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "gotovo.\n"
@@ -6611,19 +6611,19 @@ msgstr "Prilog"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Tema"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Od"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Datum"
@@ -6633,7 +6633,7 @@ msgid "Number"
msgstr "Broj"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Za:"
@@ -7070,7 +7070,7 @@ msgstr "O"
msgid "%s - POP3 Remote mailbox"
msgstr "/_Ukloni sandučić"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Ne."
@@ -8036,15 +8036,15 @@ msgstr "Rasipavam..."
msgid "Filtering (%d / %d)..."
msgstr "Filtriranje..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtriram..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtriranje..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, fuzzy, c-format
msgid "%d message(s) have been filtered."
msgstr "poruka %d već je prihvaćena.\n"
diff --git a/po/hu.po b/po/hu.po
index fcfac2a9..faaf8cc4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed-3.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-02-13 14:38+0100\n"
"Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
"Language-Team: Hungarian <NONE>\n"
@@ -20,6 +20,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Beállítások beolvasása az összes fiókhoz...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Levélszemét szűrés (kézi)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Levélszemét szűrés"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -220,34 +228,34 @@ msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "nem lehet az ideiglenes fájlba írni\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Levelek fogadása innen: %s ide: %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "az mbox fájlt nem lehet olvasni.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "érvénytelen mbox formátum: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "sérült mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "nem lehet ideiglenes fájlt megnyitni\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -256,43 +264,43 @@ msgstr ""
"kódolatlan Feladó található:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "%s zároló fájlt nem lehet létrehozni\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "'flock' használata 'file' helyett, ha lehet.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "%s nem hozható létre\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "A postaláda egy másik processzhez tartozik, várakozás...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "%s nem zárolható\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "érvénytelen zároló típus\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "%s zárolása nem oldható fel\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "nem lehet nulla méretűre változtatni a postaládát.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Levelek exportálása innen: %s ide: %s...\n"
@@ -311,7 +319,7 @@ msgstr "A forrás- és célmappa azonos.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "%s/%d levél másolása ide: %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -505,14 +513,6 @@ msgstr "Találat %s\n"
msgid "Configuration is saved.\n"
msgstr "Beállítások tárolva.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Levélszemét szűrés (kézi)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Levélszemét szűrés"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
@@ -1254,15 +1254,15 @@ msgstr "Általános cím"
msgid "Personal address"
msgstr "Személyes cím"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Megjegyzés"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Figyelmeztetés"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Hiba"
@@ -1305,7 +1305,7 @@ msgstr "Barna"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Semmi"
@@ -1840,7 +1840,7 @@ msgstr "Dátum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Méret"
@@ -2867,141 +2867,141 @@ msgstr "Tulajdonságok"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d új levél"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "POP3 azonosítás"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Új levelek fogadása"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Mégse"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Készenlét"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Megszakítva"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Fogadás"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d levél (%s) fogadva"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "nincs új levél."
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Kész"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Kapcsolat megszakadt"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Azonosítás nem sikerült"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Zárolt"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Időtúllépés"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Befejezve (%d új levél)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Befejezve (nincs új levél)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Hiba történt a levelek fogadásakor."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "új levelek letöltése %s fióknál...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: POP3 azonosítás"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Új levelek fogadása"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Azonosítás..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Levelek fogadása innen: %s ..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Új levelek számának megszerzése (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Új levelek számának megszerzése (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Új levelek számának megszerzése (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Új levelek méretének megszerzése (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "%d levél törlése"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Kilépés"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Levél letöltése (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3009,15 +3009,15 @@ msgstr ""
"A levélszemét szűréshez használt parancs futtatása nem sikerült.\n"
"Ellenőrizze a levélszemét szűrők beállításait."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Kapcsolat megszakadt."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Hiba a levelek feldolgozása közben."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3026,29 +3026,29 @@ msgstr ""
"Hiba a levelek feldolgozása közben:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Nincs több szabad hely a lemezen."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Nem lehet a fájlba írni."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Socket hiba."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "A távoli fél bezárta a kapcsolatot."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "A postaláda zárolt."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3057,11 +3057,11 @@ msgstr ""
"A postaláda zárolt:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Az azonosítás nem sikerült."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3070,15 +3070,15 @@ msgstr ""
"Az azonosítás nem sikerült:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Menet időtúllépése."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Fogadás megszakítva\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "%s új leveleinek letöltése a(z) %s mappába...\n"
@@ -3096,16 +3096,16 @@ msgstr "Adja meg a jelszót"
msgid "Protocol log"
msgstr "Protokoll napló"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Használat: %s [OPCIÓ]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [cím] szerkesztőablak megnyitása"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3115,23 +3115,23 @@ msgstr ""
" szerkesztőablak nyitása a megadott fájl(ok)\n"
" csatolásával"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive új levelek letöltése"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all új levelek letöltése minden fióknál"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send minden várakozó levél küldése"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [mappa]... kiírja a levelek számát"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3139,46 +3139,46 @@ msgstr ""
" --status-full [mappa]...\n"
" megjeleníti minden egyes mappa állapotát"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open folderid/msgnum levél megnyitása új ablakban"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir dirname a konfigurációs fájlokat tároló mappa megadása"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport portszám IPC távoli parancsok portjának megadása"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit kilépés a Sylpheedből"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug hibakereső üzemmód"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help e segítség megjelenítése és kilépés"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version verzió információk kiírása és kilépés"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Nyomjon meg egy billentyűt..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Fájlnév karakterkódolása"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3202,19 +3202,19 @@ msgstr ""
"\n"
"Folytatja?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Levél szerkesztés alatt. Tényleg kilép?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Várakozó levelek"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Vannak elküldetlen levelek. Kilépés most?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3222,20 +3222,20 @@ msgstr ""
"A GnuPG nincs megfelelően telepítve, vagy túl régi a verziója.\n"
"OpenPGP támogatás kikapcsolva."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Kiegészítések betöltése..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "egy másik Sylpheed már fut.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Beállítások migrálása"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3890,7 +3890,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Főablak: %d szín foglalása nem sikerült\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "kész.\n"
@@ -6301,19 +6301,19 @@ msgstr "Csatolás"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Tárgy"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Feladó"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Dátum"
@@ -6323,7 +6323,7 @@ msgid "Number"
msgstr "Sorszám"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Címzett"
@@ -6728,7 +6728,7 @@ msgstr "_Névjegy"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - POP3 Távoli postaláda"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Ssz."
@@ -7662,15 +7662,15 @@ msgstr "Szál lebontása..."
msgid "Filtering (%d / %d)..."
msgstr "Szűrés (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "szűrés..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Szűrés..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d levél szűrése megtörtént."
diff --git a/po/it.po b/po/it.po
index b895a850..bfba8c7e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 2.4.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2008-01-26 09:42+0100\n"
"Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,6 +19,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Lettura della configurazione per ogni account...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Filtro mail spazzatura (manuale)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Filtro mail spazzatura"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -220,34 +228,34 @@ msgstr "iconv non può convertire UTF-7 in %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv non può convertire %s in UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "impossibile scrivere sul file temporaneo\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Ricezione in %s dei messaggi da %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "impossibile leggere il file mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "formato mbox non valido: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "mbox non valida: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "impossibile aprire il file temporaneo\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -256,43 +264,43 @@ msgstr ""
"trovato un Da senza la sequenza di escape:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "impossibile creare il file di lock %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "se possibile usare «flock» al posto di «file».\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "impossibile creare %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "la casella postale è occupata da un altro processo, attendo...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "impossibile effettuare il lock %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "tipo di lock non valido\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "impossibile liberare il lock su %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "impossibile troncare a zero la casella postale.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Esportazione dei messaggi da %s in %s...\n"
@@ -311,7 +319,7 @@ msgstr "la cartella sorgente é identica a quella di destinazione.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Copia del messaggio %s%d in %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -505,14 +513,6 @@ msgstr "Trovato %s\n"
msgid "Configuration is saved.\n"
msgstr "La configurazione è stata salvata.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Filtro mail spazzatura (manuale)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Filtro mail spazzatura"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
@@ -1257,15 +1257,15 @@ msgstr "Indirizzo comune"
msgid "Personal address"
msgstr "Indirizzo personale"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Avviso"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Avvertimento"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Errore"
@@ -1308,7 +1308,7 @@ msgstr "Marrone"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Niente"
@@ -1850,7 +1850,7 @@ msgstr "Data"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Dimensione"
@@ -2901,142 +2901,142 @@ msgstr "Attibuti"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d nuovi messaggi"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Autenticazione con POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Recupero i nuovi messaggi"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Cancellato"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Attesa"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Cancellato"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Recupero"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Non esistono messaggi nuovi."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Fatto."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Connessione fallita"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autenticazione fallita"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Bloccato"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Timeout"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Finito (%d nuovo(i) messaggio(i))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Finito (non ci sono nuovi messaggi)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Ci sono stati degli errori durante la ricezione della posta."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: autenticazione con POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Recupero i nuovi messaggi"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Connessione al server POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Impossibile connettersi al server POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autenticazione..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Ricezione dei messaggi da %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Ricezione della dimensione dei messaggi (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Eliminazione del messaggio %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Esco"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3044,15 +3044,15 @@ msgstr ""
"L'esecuzione del comando del filtro spazzatura è fallita.\n"
"Controllare l'impostazione del controllo della mail spazzatura."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Connessione fallita."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Si è verificato un errore durante l'elaborazione della posta."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3061,29 +3061,29 @@ msgstr ""
"Si è verificato un errore durante l'elaborazione della posta:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Spazio su disco esaurito."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Impossibile scrivere il file."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Errore del socket."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Connessione chiusa dall'host remoto."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "La casella postale è bloccata."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3092,11 +3092,11 @@ msgstr ""
"La casella postale è bloccata:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Autenticazione fallita."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3105,15 +3105,15 @@ msgstr ""
"Autenticazione fallita:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "La sessione è andata in timeout."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Incorporazione cancellata\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3131,16 +3131,16 @@ msgstr "Inserire la password"
msgid "Protocol log"
msgstr "Log del protocollo"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPZIONE]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [indirizzo] apre una finestra di composizione"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3150,23 +3150,23 @@ msgstr ""
" apre la finestra di composizione con allegati\n"
" i file specificati"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive riceve i nuovi messaggi"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all riceve i nuovi messaggi di tutti gli account"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send invia tutti i messaggi accodati"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [cartella]... mostra il numero totale dei messaggi"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3174,47 +3174,47 @@ msgstr ""
" --status-full [cartella]...\n"
" mostra lo stato di ogni cartella"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open folderid/msgnum apre il messaggio in una nuova finestra"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir dirname specifica la directory che contiene i file di "
"configurazione"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport portnum specifca la porta per i comandi IPC da remoto"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit esce da Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug modalità di debug"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help mostra questo aiuto ed esce"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version mostra informazioni sulla versione ed esce"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Premere un tasto qualsiasi..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Codifica nome file"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3238,19 +3238,19 @@ msgstr ""
"\n"
"Continuo?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "C'è un messaggio in composizione. Uscire?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Messaggi accodati"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3258,20 +3258,20 @@ msgstr ""
"GnuPG non è installato correttamente, o questa versione è troppo vecchia.\n"
"Il supporto per OpenPGP è disabilitato."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "un altro Sylpheed è già in esecuzione.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Migrazione della configurazione"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3934,7 +3934,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "fatto.\n"
@@ -6360,19 +6360,19 @@ msgstr "Allegato"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Oggetto"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Da"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Data"
@@ -6382,7 +6382,7 @@ msgid "Number"
msgstr "Numero"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "A"
@@ -6797,7 +6797,7 @@ msgstr "Informazioni"
msgid "%s - POP3 Remote mailbox"
msgstr "Rimuovi la casella postale"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "No."
@@ -7753,15 +7753,15 @@ msgstr "Senza thread..."
msgid "Filtering (%d / %d)..."
msgstr "Filtraggio (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtraggio..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtraggio..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "sono stati filtrati %d messaggi(o)."
diff --git a/po/ja.po b/po/ja.po
index dae5c740..a37fe5e5 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -18,6 +18,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "すべてのアカウント毎の設定を読み込み中...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "迷惑メールフィルタ (手動)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "迷惑メールフィルタ"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -218,34 +226,34 @@ msgstr "iconv が UTF-7 を %s に変換できません\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv が %s を UTF-7 に変換できません\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "一時ファイルに書き込めません\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "メッセージを %s から %s に取り込んでいます...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "メールボックスファイルを読み込めません。\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "無効なメールボックスの形式: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "メールボックスが異常です: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "一時ファイルを開けません\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -254,43 +262,43 @@ msgstr ""
"エスケープされていない From が見つかりました:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "ロックファイル %s を開けません\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "可能であれば 'file' の代わりに 'flock' を使用してください。\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "%s を作成できません。\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "メールボックスは別のプロセスによって所有されています。待機中...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "%s をロックできません\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "無効なロックタイプです\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "%s をロック解除できません\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "メールボックスをゼロに切り詰められません。\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "メッセージを %s から %s に書き出しています...\n"
@@ -309,7 +317,7 @@ msgstr "移動元フォルダが移動先と同一です。\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "メッセージ %s/%d を %s にコピーしています...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -503,14 +511,6 @@ msgstr "%s が見つかりました\n"
msgid "Configuration is saved.\n"
msgstr "設定を保存しました。\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "迷惑メールフィルタ (手動)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "迷惑メールフィルタ"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
@@ -1248,15 +1248,15 @@ msgstr "共有アドレス"
msgid "Personal address"
msgstr "個人用アドレス"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "注意"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "警告"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "エラー"
@@ -1299,7 +1299,7 @@ msgstr "茶"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "なし"
@@ -1830,7 +1830,7 @@ msgstr "データ形式"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "サイズ"
@@ -2855,140 +2855,140 @@ msgstr "属性"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d 通の新着メッセージ"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "POP3で認証中"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "新着メッセージを受信中"
-#: src/inc.c:514
+#: src/inc.c:521
msgid "Cancel _all"
msgstr "すべてキャンセル(_A)"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "待機中"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "キャンセル"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "受信中"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d 通 (%s) 受信"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "新着メッセージなし"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "完了"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "接続失敗"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "認証失敗"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "ロック中"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "タイムアウト"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "完了 (%d 通の新着メッセージ)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "完了 (新着メッセージなし)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "メールの取得中にエラーが発生しました。"
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "アカウント %s の新着メッセージを取り込んでいます...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: POP3で認証中"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: 新着メッセージを受信中"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "POP3サーバ: %s に接続中..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "POP3サーバ: %s:%d に接続できません\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "認証中..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "%s からメッセージを受信中..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "新着メッセージの数を取得中 (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "新着メッセージの数を取得中 (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "新着メッセージの数を取得中 (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "メッセージのサイズを取得中 (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "メッセージ %d を削除中"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "切断中"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -2996,15 +2996,15 @@ msgstr ""
"迷惑メールフィルタコマンドの実行に失敗しました。\n"
"迷惑メール対策の設定を確認してください。"
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "接続に失敗しました。"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "メールの処理中にエラーが発生しました。"
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3013,29 +3013,29 @@ msgstr ""
"メールの処理中にエラーが発生しました:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "ディスクの空き容量がありません。"
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "ファイルに書き込めません。"
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "ソケットエラーです。"
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "リモートホストによって接続を切断されました。"
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "メールボックスはロックされています。"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3044,11 +3044,11 @@ msgstr ""
"メールボックスはロックされています:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "認証に失敗しました。"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3057,15 +3057,15 @@ msgstr ""
"認証に失敗しました:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "セッションがタイムアウトしました。"
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "受信をキャンセルしました\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -3083,16 +3083,16 @@ msgstr "パスワードの入力"
msgid "Protocol log"
msgstr "プロトコルログ"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "使用法: %s [オプション]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [address] メッセージ作成ウィンドウを開く"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3102,23 +3102,23 @@ msgstr ""
" 指定したファイルを添付してメッセージ作成\n"
" ウィンドウを開く"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive 新着メッセージを受信する"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all 全アカウントの新着メッセージを受信する"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send 送信待機中のメッセージをすべて送信する"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [folder]... メッセージの総数を表示する"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3126,45 +3126,45 @@ msgstr ""
" --status-full [folder]...\n"
" 各フォルダの状態を表示する"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open folderid/msgnum 新しいウィンドウでメッセージを開く"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr " --configdir dirname 設定ファイルを格納するディレクトリを指定する"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport portnum IPC リモートコマンド用のポートを指定する"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit Sylpheed を終了する"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug デバッグモード"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help このヘルプを表示して終了する"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version バージョン情報を出力して終了する"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "何かキーを押してください..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "ファイル名エンコーディング"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3187,19 +3187,19 @@ msgstr ""
"\n"
"続行しますか?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "作成中のメッセージが存在します。本当に終了しますか?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "送信待機中のメッセージ"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "送信待機中の未送信メッセージがあります。終了しますか?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3207,20 +3207,20 @@ msgstr ""
"GnuPG が正しくインストールされていないか、バージョンが古すぎます。\n"
"OpenPGP サポートは無効です。"
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "プラグインをロード中..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "別の Sylpheed がすでに起動しています。\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "設定の移行"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3873,7 +3873,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "完了。\n"
@@ -6263,19 +6263,19 @@ msgstr "添付"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "件名"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "差出人"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "日付"
@@ -6285,7 +6285,7 @@ msgid "Number"
msgstr "番号"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "宛先"
@@ -6688,7 +6688,7 @@ msgstr "このプログラムについて(_A)"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - POP3 リモートメールボックス"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "番号"
@@ -7616,15 +7616,15 @@ msgstr "スレッドを解除中..."
msgid "Filtering (%d / %d)..."
msgstr "振り分け中 (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "振り分け中..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "振り分け中..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d 通のメッセージが振り分けられました。"
diff --git a/po/ko.po b/po/ko.po
index 329776fe..95d3f4b1 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -18,6 +18,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "폴더"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "폴더"
+
#: libsylph/imap.c:537
#, fuzzy, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -226,34 +236,34 @@ msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "임시 파일에 쓸 수가 없습니다\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "mbox 파일을 읽을 수가 없습니다.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "올바르지않은 mbox 포멧: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "제대로되어있지않은 mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "임시파일을 열 수가 없습니다\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -262,43 +272,43 @@ msgstr ""
"메시지 본문중 From으로 시작하는 줄이 있습니다:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "잠금 파일 %s을 만들수가 없습니다\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "가능하면 'file'대신에 'flock'를 사용하세요.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "%s를 생성할 수가 없습니다\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "메일박스를 다른 프로세스가 읽고있습니다. 잠시 기다리세요...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "%s에 lock를 걸수가 없습니다\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "올바르지않은 잠금 타입\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "%s에 lock를 풀 수가 없습니다\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "메일박스의 크기를 0으로 만들수가 없습니다.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "메시지를 %s에서 %s로 보냅니다...\n"
@@ -317,7 +327,7 @@ msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -508,16 +518,6 @@ msgstr "%s을 발견\n"
msgid "Configuration is saved.\n"
msgstr "설정이 저장되었습니다.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "폴더"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "폴더"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
@@ -1255,15 +1255,15 @@ msgstr "공용 주소록"
msgid "Personal address"
msgstr "개인 주소록"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "알림"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "경고"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "에러"
@@ -1306,7 +1306,7 @@ msgstr "갈색"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "없음"
@@ -1880,7 +1880,7 @@ msgstr "날짜"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "크기"
@@ -2949,214 +2949,214 @@ msgstr "속성"
msgid "Sylpheed: %d new messages"
msgstr "끝났습니다 (%d개의 새로운 메시지)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "인증"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "새 메시지를 가져옴"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "취소"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr ""
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "취소되었습니다"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr ""
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "완료 (%d 메시지 (%s)가 받아짐)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "새 메시지가 없습니다."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "완료."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "인증이 실패했습니다."
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr ""
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr ""
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "끝났습니다 (%d개의 새로운 메시지)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "끝났습니다 (새 메시지 없음)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "편지를 받다가 에러가 발생했습니다."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "인증"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: 새 메시지를 가져옴"
-#: src/inc.c:862
+#: src/inc.c:878
#, fuzzy, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "POP3 서버 %s에 연결합니다..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "인증 중입니다..."
-#: src/inc.c:963
+#: src/inc.c:979
#, fuzzy, c-format
msgid "Retrieving messages from %s..."
msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "메시지의 크기를 얻는 중 (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "%d 메시지를 삭제하는 중"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "끝마치는 중"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
#, fuzzy
msgid "Connection failed."
msgstr "연결이 실패했습니다"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "메일을 처리하는 도중 에러"
-#: src/inc.c:1386
+#: src/inc.c:1404
#, fuzzy, c-format
msgid ""
"Error occurred while processing mail:\n"
"%s"
msgstr "메일을 처리하는 도중 에러"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "디스크에 남은 공간이 없슴."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "파일에 쓸 수가 없습니다."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "소켓 에러."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "메일박스가 잠겨있습니다."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, fuzzy, c-format
msgid ""
"Mailbox is locked:\n"
"%s"
msgstr "메일박스가 잠겨있습니다."
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
#, fuzzy
msgid "Authentication failed."
msgstr "인증 방법"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "인증 방법"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr ""
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "병합이 취소되었습니다.\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -3174,16 +3174,16 @@ msgstr "암호 입력"
msgid "Protocol log"
msgstr "프로토콜 로그"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "사용법: %s [옵션]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [주소] 편집 창을 엽니다"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3193,71 +3193,71 @@ msgstr ""
" 지정된 파일을 첨부해서 편지 작성 창\n"
" attached"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive 새 메시지를 받습니다"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all 모든 계정에서 새 메시지를 받습니다"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send 큐에 있는 모든 메시지를 보냅니다"
-#: src/main.c:593
+#: src/main.c:608
#, fuzzy
msgid " --status [folder]... show the total number of messages"
msgstr " --status 총 메시지 갯수를 알려줍니다"
-#: src/main.c:594
+#: src/main.c:609
#, fuzzy
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr " --status 총 메시지 갯수를 알려줍니다"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug 디버깅 모드"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug 디버깅 모드"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help 이 도움말을 표시하고 끝마침니다"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version 버번 정보 출력하고 종료"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr ""
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "보내는 메일의 문자셋"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3271,19 +3271,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "메시지를 편집하는 창이 있습니다. 정말 끝내시겠습니까?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr ""
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3291,21 +3291,21 @@ msgstr ""
"GnuPG가 적절하게 인스톨되지 않았거나 너무 오래된 버전입니다.\n"
"OpenPGP 지원기능을 끕니다."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "동작 설정을 씁니다...\n"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4006,7 +4006,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "메인 창: 색 할당 %d 실패\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "마침.\n"
@@ -6474,19 +6474,19 @@ msgstr "첨부"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "제목"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "보낸 사람"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "날짜"
@@ -6496,7 +6496,7 @@ msgid "Number"
msgstr "숫자"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "받는 사람:"
@@ -6922,7 +6922,7 @@ msgstr "이 프로그램은"
msgid "%s - POP3 Remote mailbox"
msgstr "메일박스를 제거합니다"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "번호"
@@ -7872,15 +7872,15 @@ msgstr "쓰레드를 없앱니다..."
msgid "Filtering (%d / %d)..."
msgstr "필터링..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "필터링..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "필터링..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, fuzzy, c-format
msgid "%d message(s) have been filtered."
msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
diff --git a/po/lt.po b/po/lt.po
index 08b50308..33167dc6 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -18,6 +18,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Skaitoma kiekvienos sąskaitos konfigūracija...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Nepageidautino pašto filtras (neautomatinis)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Nepageidautino pašto filtras"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -219,34 +227,34 @@ msgstr "iconv negali konvertuoti UTF-7 į %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv negali konvertuoti %s į UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "negaliu rašyti į laikinąjį failą\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Gaunami laiškai iš %s į %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "negaliu perskaityti „mbox“ failo.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "neteisingas „mbox“ formatas: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "pažeistas „mbox“ failas: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "negaliu atverti laikinojo failo\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -255,43 +263,43 @@ msgstr ""
"unescaped From found:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "negaliu sukurti užrakto failo %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "naudokite „flock“ vietoj „file“ jei įmanoma.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "negaliu sukurti %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "dėžutę turi kitas procesas, laukiu...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "negaliu užrakinti %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "blogas užrakto tipas\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "negaliu atrakinti %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "negaliu sumažinti dėžutės iki nulio.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Eksportuojami laiškai iš %s į %s...\n"
@@ -310,7 +318,7 @@ msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopijuojamas laiškas %s/%d į %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -504,14 +512,6 @@ msgstr "Rasta %s\n"
msgid "Configuration is saved.\n"
msgstr "Nustatymai išsaugoti.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Nepageidautino pašto filtras (neautomatinis)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Nepageidautino pašto filtras"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
@@ -1249,15 +1249,15 @@ msgstr "Bendras adresas"
msgid "Personal address"
msgstr "Asmeninis adresas"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Pranešimas"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Įspėjimas"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Klaida"
@@ -1300,7 +1300,7 @@ msgstr "Ruda"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Nieko"
@@ -1833,7 +1833,7 @@ msgstr "Data"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Dydis"
@@ -2880,156 +2880,156 @@ msgstr "Atributai"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d nauji laiškai"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Tikrinamas autentiškumas (POP3)"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Gaunami nauji laiškai"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Nutraukta"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Laukiama"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Nutraukta"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Gaunama"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Atlikta (gauta laiškų: %d (%s))"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Nėra naujų laiškų."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Atlikta."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Nepavyko prisijungti"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Nepavyko patvirtinti autentiškumo"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Užrakinta"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Baigėsi skirtasis laikas"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Baigta (Nauji laiškai: %d)"
-#: src/inc.c:805
+#: src/inc.c:821
#, fuzzy, c-format
msgid "Finished (no new messages)"
msgstr "Baigta (Nėra naujų laiškų: %d)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Klaidos gaunant paštą."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "gaunami „%s“ sąskaitos laiškai...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Tikrinamas autentiškumas (POP3)"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: gaunami nauji laiškai"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Jungiuosi prie POP3 serverio: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Patvirtinamas autentiškumas..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Gaunami laiškai iš %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Gaunamas naujų laiškų dydis (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Trinamas laiškas %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Išeinu"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Nepavyko prisijungti."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Klaida tvarkant paštą."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3038,29 +3038,29 @@ msgstr ""
"Klaida tvarkant paštą:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Nėra vietos diske."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Negaliu įrašyti į failą."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Socket error."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Prisijungimas uždarytas nuotolinio serverio."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Dėžutė užrakinta."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3069,11 +3069,11 @@ msgstr ""
"Dėžutė užrakinta:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Nepavyko patvirtinti autentiškumo."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3082,15 +3082,15 @@ msgstr ""
"Nepavyko patvirtinti autentiškumo:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Baigėsi sesijos laikas."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Prijungimas nutrauktas\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Gaunami nauji laiškai iš %s į %s...\n"
@@ -3108,16 +3108,16 @@ msgstr "Įveskite slaptažodį"
msgid "Protocol log"
msgstr "Protokolo logas"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Naudojimas: %s [PARAMETRAI]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [address] atverti rašymo langą"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3127,23 +3127,23 @@ msgstr ""
" atverti rašymo langą su prisegtais nurodytais\n"
" failais"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive gauti naujus laiškus"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all gauti naujus laiškus iš visų sąskaitų"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send siųsti laiškus eilėje"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [katalogas]... rodyti bendrą laiškų skaičių"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3151,45 +3151,45 @@ msgstr ""
" --status-full [katalogas]...\n"
" rodyti kiekvieno katalogo būseną"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr " --configdir kelias nurodyti konfigūracijos katalogą"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit uždaryti „Sylpheed“"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug derinimo rėžimas"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help rodyti šią pagalbą ir baigti"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version išvesti versiją ir baigti"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Spauskite bet kurį klavišą..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Failų vardų koduotė"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3213,19 +3213,19 @@ msgstr ""
"\n"
"Tęsti?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Rašomas laiškas. Tikrai išeiti?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Laiškai eilėje"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Eilėje yra neišsiųstų laiškų. Išeiti dabar?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3233,20 +3233,20 @@ msgstr ""
"GnuPG nėra įdiegtas, arba jo versija per sena.\n"
"OpenPGP palaikymas išjungtas."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "Sylpheed jau paleistas.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Konfigūracijos atnaujinimas"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3908,7 +3908,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "atlikta.\n"
@@ -6319,19 +6319,19 @@ msgstr "Priedas"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Tema"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Siuntėjas"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Data"
@@ -6341,7 +6341,7 @@ msgid "Number"
msgstr "Numeris"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Kam:"
@@ -6756,7 +6756,7 @@ msgstr "Apie"
msgid "%s - POP3 Remote mailbox"
msgstr "Pašalinti dėžutę"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nr."
@@ -7702,15 +7702,15 @@ msgstr "Griaunamos gijos..."
msgid "Filtering (%d / %d)..."
msgstr "Filtruojama (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtruojama..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtruojama..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "Filtruota laiškų: %d"
diff --git a/po/nl.po b/po/nl.po
index cce60407..9a939acb 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2006-04-30 01:11+0100\n"
"Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
"Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -18,6 +18,15 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Configuratie inlezen van alle accounts...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Troepfilter"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Troepfilter"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -222,34 +231,34 @@ msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "kan niet naar tijdelijk bestand schrijven\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Berichten worden van %s naar %s opgehaald...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "kan mbox bestand niet inlezen.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "mbox formaat is onjuist: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "onjuist formaat in mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "kan tijdelijk bestand niet openen\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -258,43 +267,43 @@ msgstr ""
"Afzender zonder escapecodes gevonden:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "kan lock-bestand niet aanmaken: %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "gebruik 'flock' in plaats van 'file' waar mogelijk\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "kan %s niet aanmaken\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "mailbox wordt vastgehouden door een ander proces. we wachten even...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "kan %s niet locken\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "ongeldig locktype\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "kan de lock niet verwijderen van %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "kan de mailbox niet inkorten tot 0.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
@@ -313,7 +322,7 @@ msgstr "de bronmap is hetzelfde als de doelmap.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -510,15 +519,6 @@ msgstr "%s gevonden\n"
msgid "Configuration is saved.\n"
msgstr "Configuratie is opgeslagen.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Troepfilter"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Troepfilter"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
@@ -1272,15 +1272,15 @@ msgstr "Algemene adressen"
msgid "Personal address"
msgstr "Persoonlijke adressen"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Bericht"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Waarschuwing"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Fout"
@@ -1323,7 +1323,7 @@ msgstr "Bruin"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Geen"
@@ -1860,7 +1860,7 @@ msgstr "Datum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Grootte"
@@ -2924,157 +2924,157 @@ msgstr "Attributen"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d nieuwe berichten"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Bezig met identificatie"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Nieuwe berichten worden opgehaald"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Afgebroken"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Een ogenblik geduld alstublieft"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Afgebroken"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Bezig met ophalen"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Geen nieuwe berichten."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Klaar."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Identificatie mislukt"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Vergrendeld"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Time-out"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Klaar (%d nieuwe bericht(en))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Klaar (geen nieuwe berichten)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Bezig met identificatie"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Nieuwe berichten worden opgehaald"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Verbinden met POP3-server: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Bezig met identificatie..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Berichten ophalen van %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Bezig met verwijderen van bericht %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Bezig met afsluiten"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Verbinding mislukt."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Fout bij het verwerken van de e-mail"
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3083,30 +3083,30 @@ msgstr ""
"Fout bij het verwerken van de e-mail:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "De ruimte op de schijf is op."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Het bestand is niet beschrijfbaar."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Socket-fout."
# consider EOF right after QUIT successful
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Verbinding verbroken door verbindingspartner."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Mailbox is vergrendeld."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3115,11 +3115,11 @@ msgstr ""
"Mailbox is vergrendeld:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Identificatie mislukt."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3128,15 +3128,15 @@ msgstr ""
"Identificatie mislukt:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Sessie is verlopen."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "E-mail verwerken geannuleerd\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3154,16 +3154,16 @@ msgstr "Geef wachtwoord"
msgid "Protocol log"
msgstr "Protocol-logboek"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Gebruik: %s [OPTIES]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adres] open venster \"Bericht opstellen\""
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3173,23 +3173,23 @@ msgstr ""
" venster 'bericht opstellen' openen met de\n"
" gespecificeerde bestanden als bijlagen"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive haal nieuwe berichten op"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all Berichten ophalen van alle accounts"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send verstuur alle berichten uit de wachtrij"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [map]... totaal aantal berichten weergeven"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3197,47 +3197,47 @@ msgstr ""
" --status-full [map]...\n"
" status van iedere map weergeven"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir mapnaam de map waar de configuratiebestanden zich in "
"bevinden"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit Sylpheed afsluiten"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug debug modus"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help geef deze hulp weer"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version\t\tgeef versie informatie en sluit af"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Druk op een toets..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Bestandscodering"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3261,21 +3261,21 @@ msgstr ""
"\n"
"Toch doorgaan?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr ""
"U bent een bericht aan het opstellen.\n"
"Wilt u werkelijk het programma afsluiten?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Berichten zijn in de wachtrij gezet"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3283,20 +3283,20 @@ msgstr ""
"GnuPG is niet goed geïnstalleerd of is te oud.\n"
"OpenPGP ondersteuning wordt uitgeschakeld."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "er draait al een Sylpheed.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Configuratie omzetten"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3964,7 +3964,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "klaar.\n"
@@ -6412,19 +6412,19 @@ msgstr "Bijlage"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Onderwerp"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Afzender"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Datum"
@@ -6434,7 +6434,7 @@ msgid "Number"
msgstr "Nummer"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Aan:"
@@ -6861,7 +6861,7 @@ msgstr "_Info"
msgid "%s - POP3 Remote mailbox"
msgstr "mailbox verwijderen"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nr."
@@ -7811,15 +7811,15 @@ msgstr "Discussies worden uit elkaar gehaald..."
msgid "Filtering (%d / %d)..."
msgstr "Bezig met filteren (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "Bezig met filteren..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Bezig met filteren..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "Er zijn %d berichten gefilterd."
diff --git a/po/pl.po b/po/pl.po
index 9d10e59d..753b10df 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2008-06-17 22:25+0100\n"
"Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
"Language-Team: POLISH <pl@li.org>\n"
@@ -15,6 +15,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Odczyt ustawień wszystkich kont...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Filtr niechcianej poczty (ręczny)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Filtr niechcianej poczty"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -217,34 +225,34 @@ msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "nie można zapisać do pliku tymczasowego\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Pobieranie wiadomości z %s do %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "nie można odczytać pliku mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "niepoprawny format mbox: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "uszkodzona skrzynka: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "nie można otworzyć pliku tymczasowego\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -253,43 +261,43 @@ msgstr ""
"znaleziono \"unescaped\" From:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "nie można utworzyć pliku lock %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "jeśli to możliwe, należy użyć \"flock\" zamiast \"file\".\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "nie można utworzyć %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "skrzynka jest kontrolowana przez inny proces, oczekiwanie...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "nie można zablokować %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "nieprawidłowy typ blokady\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "nie można odblokować %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "nie można skrócić do zera.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Eksportowanie wiadomości z %s do %s...\n"
@@ -308,7 +316,7 @@ msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopiowanie wiadomości %s/%d do %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -496,14 +504,6 @@ msgstr "Znaleziono: %s\n"
msgid "Configuration is saved.\n"
msgstr "Konfiguracja zapisana.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Filtr niechcianej poczty (ręczny)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Filtr niechcianej poczty"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
@@ -1250,15 +1250,15 @@ msgstr "Wspólny adres:"
msgid "Personal address"
msgstr "Osobisty adres:"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Notatka"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Ostrzeżenie"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Błąd"
@@ -1301,7 +1301,7 @@ msgstr "Brązowy"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Brak"
@@ -1833,7 +1833,7 @@ msgstr "Data"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Rozmiar"
@@ -2883,142 +2883,142 @@ msgstr "Atrybuty"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d nowe wiadomości"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Uwierzytelnianie POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Pobieranie nowych wiadomości"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Anulowano"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Oczekiwanie"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Anulowano"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Pobieranie"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Brak nowych wiadomości"
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Gotowe."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Błąd połączenia"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Błąd autoryzacji"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Zablokowano"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Opóźnienie"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Zakończono (%d nowe wiadomości)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Zakończono (brak nowych wiadomości)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Wystąpiły błędy podczas pobierania poczty."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "pobieranie nowych wiadomości z konta %s ...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Uwierzytelnianie POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s : Pobieranie nowych wiadomości"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Uwierzytelnianie..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Pobieranie wiadomości z %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Usuwanie wiadomości %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Wychodzenie"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3027,15 +3027,15 @@ msgstr ""
"niepowodzeniem.\n"
"Sprawdź ustawienia filtrów niechcianej poczty."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Błąd połączenia."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Błąd podczas przetwarzania wiadomości."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3044,29 +3044,29 @@ msgstr ""
"Błąd podczas przetwarzania wiadomości:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Brak miejsca na dysku."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Nie można zapisać pliku."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Błąd gniazda."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Połączenie zamknięte przez zdalny komputer."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Skrzynka jest zablokowana."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3075,11 +3075,11 @@ msgstr ""
"Skrzynka jest zablokowana:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Błąd uwierzytelniania."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3088,15 +3088,15 @@ msgstr ""
"Błąd uwierzytelniania:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Sesja wygasła."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Odbieranie anulowano\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -3114,16 +3114,16 @@ msgstr "Wprowadź hasło"
msgid "Protocol log"
msgstr "Dziennik protokołu"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Użycie: %s [OPCJE]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adres] otwiera okno tworzenia wiadomości"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3133,23 +3133,23 @@ msgstr ""
" otwiera okno tworzenia wiadomości z plikami,\n"
" które mają zostać dołączone"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive odbiera nowe wiadomości"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all odbiera nowe wiadomości dla wszystkich kont"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send wysyła wszystkie skolejkowane wiadomości"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [katalog]... pokazuje łączną liczbę wiadomości"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3157,47 +3157,47 @@ msgstr ""
" --status-full [katalog]...\n"
" pokazuje łączną liczbę wiadomości"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open folderid/msgnum otwórz wiadomość w nowym oknie"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir dirname podaj katalog, który zawiera pliki konfiguracyjne"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit zakończ Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug tryb debugowania"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help wyświetla tę pomoc i wychodzi"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr ""
" --version wyświetla informację o wersji i kończy działanie"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Wciśnij dowolny klawisz..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Kodowanie nazwy pliku"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3211,19 +3211,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Tworzenie nowej wiadomości. Czy zakończyć?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Skolejkowane wiadomości"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3231,20 +3231,20 @@ msgstr ""
"Program GnuPG nie jest poprawnie zainstalowany, lub jego\n"
"wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Migracja ustawień"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3907,7 +3907,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Okno główne: błąd alokacji kolorów %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "gotowe.\n"
@@ -6372,19 +6372,19 @@ msgstr "Załącznik"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Temat"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Od"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Data"
@@ -6394,7 +6394,7 @@ msgid "Number"
msgstr "Numer"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Do:"
@@ -6827,7 +6827,7 @@ msgstr "O programie"
msgid "%s - POP3 Remote mailbox"
msgstr "Usuń skrzynkę"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nr"
@@ -7807,15 +7807,15 @@ msgstr "Odwątkowanie .."
msgid "Filtering (%d / %d)..."
msgstr "Filtowanie..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrowanie..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtowanie..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d wiadomość(i) przefiltrowano."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 50803e86..597ac117 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-08-27 00:20-0300\n"
"Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
"Language-Team: Portuguese/Brazil <(none)>\n"
@@ -28,6 +28,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Lendo as configurações de cada conta...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Filtro de spam (manual)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Filtro de spam"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -228,34 +236,34 @@ msgstr "O iconv não pode converter UTF-7 para %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "O iconv não pode converter %s para UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "Não é possível gravar no arquivo temporário\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Recebendo mensagens de %s até %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "Não foi possível ler o arquivo mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "formato de mbox inválido: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "mbox corrompida: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "não foi possível abrir o arquivo temporário\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -264,43 +272,43 @@ msgstr ""
"Encontrado De sem codificar:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "Não foi possível criar o arquivo de bloqueio %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "usar 'flock' em vez de 'file' se for possível.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "não foi possível criar %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "A caixa de correio está em uso por outro processo, aguardando...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "não foi possível bloquear %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "tipo de bloqueio inválido\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "não foi possível desbloquear %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "não foi possível truncar a caixa-postal.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportando mensagens de %s em %s...\n"
@@ -319,7 +327,7 @@ msgstr "as pastas de origem e destino são idênticas.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Copiando mensagem %s/%d para %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -513,14 +521,6 @@ msgstr "Encontrado %s\n"
msgid "Configuration is saved.\n"
msgstr "Configuração salva.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Filtro de spam (manual)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Filtro de spam"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
@@ -1265,15 +1265,15 @@ msgstr "Endereços comuns"
msgid "Personal address"
msgstr "Endereços pessoais"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Notificação"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Erro"
@@ -1316,7 +1316,7 @@ msgstr "Marrom"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Nenhuma"
@@ -1850,7 +1850,7 @@ msgstr "Data"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Tamanho"
@@ -2878,140 +2878,140 @@ msgstr "Atributos"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d novas mensagens"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Autenticando via POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Recebendo novas mensagens"
-#: src/inc.c:514
+#: src/inc.c:521
msgid "Cancel _all"
msgstr "Cancelar tod_as"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Ocioso"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Cancelado"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Recuperando"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d mensagen(s) (%s) recebida(s)"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "Não há novas mensagens"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Concluído"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Conexão falhou"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autenticação falhou"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Travado"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Tempo limite"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Concluído (%d nova(s) mensagem(ns))"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Concluído (Não há mensagens novas)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Houve alguns erros ao receber as mensagens"
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "Recebendo novas mensagens da conta %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Autenticando via POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Recuperando novas mensagens"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Conectando ao servidor POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autenticando..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Recebendo mensagens de %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Recebendo o número de novas mensagens (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Recebendo o número de novas mensagens (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Recebendo o número de novas mensagens (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Recebendo o número de novas mensagens (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Excluindo mensagem %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Saindo"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Recebendo mensagem (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3019,15 +3019,15 @@ msgstr ""
"A execução do filtro de spam falhou.\n"
"Por favor verifique as definições do filtro de spam."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Falha na conexão"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3036,29 +3036,29 @@ msgstr ""
"Erro ao processar mensagens:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Não há espaço disponível no disco."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Não foi possível gravar o arquivo."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "erro de rede."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Conexão finalizada pelo servidor"
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "A caixa de correio está bloqueada"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3067,11 +3067,11 @@ msgstr ""
"A caixa de correio está bloqueada:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Falha de autenticação."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3080,15 +3080,15 @@ msgstr ""
"Falha de autenticação:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Tempo limite da sessão."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Incorporação cancelada\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Recebendo novas mensagens de %s até %s...\n"
@@ -3106,16 +3106,16 @@ msgstr "Digite a senha"
msgid "Protocol log"
msgstr "Log do protocolo"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPÇÃO]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [endreço] abre janela de composição"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3125,23 +3125,23 @@ msgstr ""
" abrir a janela de composição anexando os\n"
" arquivos especificados"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive recebe novas mensgens"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all recebe novas mensagens de todas as contas"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send envia todas as mensagens da fila"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [pasta]... mostra o número total de mensagens"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3149,47 +3149,47 @@ msgstr ""
" --status-full [pasta]...\n"
" exibe o status de cada pasta"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open pasta/número abre a mensagem 'número' em uma nova janela"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir diretório especifica o diretório que armazena os arquivos "
"de configuração"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport porta número da porta para comandos remotos via IPC"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit sair do Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug modo debug"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help exibe esta ajuda e sai"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version mostra informação de versão e sai"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Pressione qualquer tecla..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Codificação de nome de arquivo"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3213,20 +3213,20 @@ msgstr ""
"\n"
"Continuar?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Ainda há mensagens sendo escritas. Você realmente deseja sair?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Mensagens enviadas para a fila"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr ""
"Há mensagens não enviadas na caixa de saída. Você realmente deseja sair?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3234,20 +3234,20 @@ msgstr ""
"O GnuPG não está instalado corretamente.\n"
"Suporte à OpenPGP desabilitado."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Carregando plug-ins..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "outra cópia do Sylpheed já está sendo executada.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Migração da configuração"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3899,7 +3899,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "MainWindow: falhou ao alocar cores %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "Pronto.\n"
@@ -6307,19 +6307,19 @@ msgstr "Anexo"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Assunto"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "De"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Data"
@@ -6329,7 +6329,7 @@ msgid "Number"
msgstr "Número"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Para"
@@ -6732,7 +6732,7 @@ msgstr "_Sobre"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - Caixa de mensagens remota POP3"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nº"
@@ -7661,15 +7661,15 @@ msgstr "Desfazendo conversas..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrando (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrando..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrando..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d mensagem(ns) foram filtradas."
diff --git a/po/ro.po b/po/ro.po
index 3011f2ee..73e8da00 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 3.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-09-07 15:36+0200\n"
"Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
"Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -20,6 +20,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Citire configurări pentru fiecare cont...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Filtru mesaj spam (manual)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Filtru mesaj spam"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -228,34 +236,34 @@ msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "nu se poate scrie în fișierul temporar\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Obținere mesaje de la %s în %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "nu se poate citi fișierul mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "formatul mbox nu este valid: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "mbox malformat: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "nu se poate deschide fișierul temporar\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -264,43 +272,43 @@ msgstr ""
"a fost găsit câmp From „unescaped”:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "nu se poate crea fișierul „lock” %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "dacă este posibil, folosiți „flock” în loc de „file”.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "nu se poate crea %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "căsuța poștală este folosită de alt proces, așteaptați...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "nu se poate bloca %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "tipul de blocare nu este valid\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "nu se poate debloca %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "nu se poate trunchia la zero căsuța poștală.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportare mesaje din %s în %s...\n"
@@ -319,7 +327,7 @@ msgstr "dosarul sursă este identic cu cel de destinație.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Copiere mesaj %s/%d în %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -513,14 +521,6 @@ msgstr "Găsit %s\n"
msgid "Configuration is saved.\n"
msgstr "Configurația a fost salvată.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Filtru mesaj spam (manual)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Filtru mesaj spam"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): conversia codului a eșuat.\n"
@@ -1279,15 +1279,15 @@ msgstr "Adrese comune"
msgid "Personal address"
msgstr "Adrese personale"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Notificare"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Avertisment"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Eroare"
@@ -1332,7 +1332,7 @@ msgstr "Maro"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Niciunul"
@@ -1871,7 +1871,7 @@ msgstr "Dată"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Dimensiune"
@@ -2916,140 +2916,140 @@ msgstr "Atribute"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d mesaje noi"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Autentificare cu POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Recepționare mesaje noi"
-#: src/inc.c:514
+#: src/inc.c:521
msgid "Cancel _all"
msgstr "_Anulează tot"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Așteptare"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Anulat"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Recepționare"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d mesaj(e) (%s) primit(e)"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "nu sunt mesaje noi"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Gata"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Conexiunea a eșuat"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autentificarea a eșuat"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Blocat"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Timp expirat"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Terminat (%d mesaj(e) noi)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Terminat (nu sunt mesaje noi)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Au apărut unele erori în timpul obținerii mail-ului."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "obținere mesaje noi pentru contul %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Autentificare cu POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: recepționare mesaje noi"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Conectare la serverul POP3: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autentificare..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Recepționare mesaje de la %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Obținerea numărului de mesaje noi (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Obținerea numărului de mesaje noi (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Obținerea numărului de mesaje noi (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Obținerea dimensiunii mesajelor (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Ștergere mesaje %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Părăsire"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Recepționare mesaje (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3057,15 +3057,15 @@ msgstr ""
"Execuția comenzii filtrului de spam a eșuat.\n"
"Verificați configurările controlului de spam."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Conexiunea a eșuat"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "A apărut o eroare în timpul procesării mail-ului."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3074,29 +3074,29 @@ msgstr ""
"A apărut o eroare în timpul procesării mail-ului.\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Nu mai este spațiu pe disc."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Nu se poate scrie fișierul."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Eroare socket."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Conexiune închisă de serverul de la distanță."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Căsuța poștală este blocată"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3105,11 +3105,11 @@ msgstr ""
"Căsuța poștală este blocată:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Autentificarea a eșuat."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3118,15 +3118,15 @@ msgstr ""
"Autentificarea a eșuat:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Timpul sesiunii a expirat."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Încorporarea a fost anulată\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Obținere mesaje noi de la %s în %s...\n"
@@ -3144,16 +3144,16 @@ msgstr "Introduceți parola"
msgid "Protocol log"
msgstr "Log protocol"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Utilizare: %s [OPȚIUNE]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [address] deschide fereastra de compoziție"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3163,23 +3163,23 @@ msgstr ""
" deschide fereastra de compoziție cu fișierele\n"
" specificate atașate"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive primește mesaje noi"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all primește mesaje noi pentru toate conturile"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send trimite toate mesajele din coada de așteptare"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [folder]... arată numărul total de mesaje"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3187,48 +3187,48 @@ msgstr ""
" --status-full [folder]...\n"
" arată starea fiecărui dosar"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open folderid/msgnum deschide mesajul în fereastră nouă"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
" --configdir dirname specifică directorul care conține fișierele de "
"configurare"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
" --ipcport portnum specifică portul pentru comenzi la distanță IPC"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit ieșire Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug mod debug"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help afișează acest ajutor și ieși"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version afișează versiunea și ieși"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Apăsați orice tastă..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Codare de nume fișier"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3253,24 +3253,24 @@ msgstr ""
"Continuați ?"
# hm ? sigur cu \n
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr ""
"Există cel puțin un mesaj în curs de compunere.\n"
"Sigur doriți să ieșiți ?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Mesaje în coada de așteptare"
# hm ? sigur cu \n
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr ""
"În coada de așteptare se află unul sau mai multe mesaje netrimise.\n"
"Ieșiți acum ?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3278,20 +3278,20 @@ msgstr ""
"GnuPG nu este instalat corespunzător, sau versiunea lui este prea veche.\n"
"Suportul pentru OpenPGP a fost dezactivat."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Se încarcă plugin-urile..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "rulează deja o altă sesiune Sylpheed.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Migrarea configurației"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3952,7 +3952,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "gata.\n"
@@ -6388,19 +6388,19 @@ msgstr "Atașament"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Subiect"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Expeditor"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Dată"
@@ -6410,7 +6410,7 @@ msgid "Number"
msgstr "Număr"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Către"
@@ -6829,7 +6829,7 @@ msgstr "_Despre"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - Căsuță poștală POP3 la distanță"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nr."
@@ -7766,15 +7766,15 @@ msgstr "Distrugere fire de discuție..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrare (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrare..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrare..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d messaj(e) au fost filtrate."
diff --git a/po/ru.po b/po/ru.po
index 9b1530ca..e782f882 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-06-15 15:18+0400\n"
"Last-Translator: \n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -26,6 +26,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Чтение настроек учётных записей...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Фильтр спама"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Фильтр спама"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -226,34 +234,34 @@ msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "ошибка преобразования iconv из %s в UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "ошибка записи во временный файл\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Получение сообщений из %s в %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "ошибка чтения почтового ящика.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "неверный формат почтового ящика: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "испорченный почтовый ящик: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "ошибка при открытии временного файла \n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -262,43 +270,43 @@ msgstr ""
"найдена незащищённая строка From:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "ошибка создания файла блокировки %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "используйте \"flock\" вместо \"file\", если возможно.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "не удалось создать %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "почтовый ящик занят другим процессом, ожидание...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "не удалось блокировать %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "Неверный тип блокировки\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "не удалось разблокировать %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "не удалось обрезать почтовый ящик до нуля.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Экспорт сообщений из %s в %s...\n"
@@ -317,7 +325,7 @@ msgstr "исходная папка совпадает с папкой назн
msgid "Copying message %s/%d to %s ...\n"
msgstr "Копирование сообщения %s/%d·to·%s·...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -511,14 +519,6 @@ msgstr "Найдено %s\n"
msgid "Configuration is saved.\n"
msgstr "Настройки сохранены.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Фильтр спама"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Фильтр спама"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
@@ -1262,15 +1262,15 @@ msgstr "Общие адреса"
msgid "Personal address"
msgstr "Личные адреса"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Уведомление"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Предупреждение"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Ошибка"
@@ -1313,7 +1313,7 @@ msgstr "Коричневый"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Нет"
@@ -1844,7 +1844,7 @@ msgstr "Дата"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Размер"
@@ -2872,141 +2872,141 @@ msgstr "Атрибуты"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed (новых сообщений: %d)"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Аутентификация POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Получение новых сообщений"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Отмена"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Ожидание"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Отменена"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Получение"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "принято сообщений: %d (%s)"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "нет новых сообщений"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Выполнено."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Ошибка соединения"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Неверный пароль"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Занято"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Нет ответа"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Завершено (новых сообщений: %d)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Завершено (нет новых сообщений)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "При получении сообщений возникли ошибки."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "получение новых сообщений для учётной записи %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Аутентификация POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Получение новых сообщений"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Соединение с сервером POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Аутентификация..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Получение сообщений с %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Получение количества новых сообщений (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Получение количества новых сообщений (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Получение количества новых сообщений (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Получение размера сообщений (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Удаление сообщения %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Выход"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Получение сообщения (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3014,15 +3014,15 @@ msgstr ""
"Не удалось выполненить команду фильтрации спама.\n"
"Проверьте настройки фильтрации спама."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Ошибка соединения"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Произошла ошибка при обработке сообщений."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3031,29 +3031,29 @@ msgstr ""
"Произошла ошибка при обработке сообщений:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Нет места на диске."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Ошибка записи в файл."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Ошибка сокета."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Сервер закрыл соединение."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Почтовый ящик занят."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3062,11 +3062,11 @@ msgstr ""
"Почтовый ящик занят:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Ошибка аутентификации."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3075,15 +3075,15 @@ msgstr ""
"Ошибка аутентификации:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Время сеанса истекло."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Приём сообщений прерван\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Получение новых сообщений из %s в %s...\n"
@@ -3101,16 +3101,16 @@ msgstr "Ввод пароля"
msgid "Protocol log"
msgstr "Журнал"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Использование: %s [ПАРАМЕТР]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [адрес] открыть окно создания сообщения"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3120,24 +3120,24 @@ msgstr ""
" открыть окно создания сообщения с присоединёнными\n"
" файлами"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive получить новые сообщения"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr ""
" --receive-all получить новые сообщения со всех учётных записей"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send отослать все сообщения из очереди"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [папка]... вывести суммарное количество сообщений"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3145,45 +3145,45 @@ msgstr ""
" --status-full [папка]...\n"
" вывести состояние указанных папок"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr "··--open·folderid/msgnum·открыть сообщение в новом окне"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr " --configdir каталог указать каталог с файлами конфигурации"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr "··--ipcport·portnum······задать портдля удаленной команды IPC"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit завершить работу Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug режим отладки"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help отобразить это описание и выйти"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version вывести информацию о версии и выйти"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Нажмите любую клавишу..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Кодировка имён файлов"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3207,19 +3207,19 @@ msgstr ""
"\n"
"Продолжить?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Есть редактируемое сообщение. Выходить?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Сообщения в очереди"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "В очереди есть неотправленные сообщения. Выходить?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3227,20 +3227,20 @@ msgstr ""
"GnuPG установлен неправильно, или установлена устаревшая версия.\n"
"Поддержка OpenPGP отключена."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Загрузка модулей..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "другая копия Sylpheed уже запущена.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Импорт предыдущей конфигурации"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3895,7 +3895,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Главное окно: проблема с цветом %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "выполнено.\n"
@@ -6304,19 +6304,19 @@ msgstr "Вложение"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Тема"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "От"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Дата"
@@ -6326,7 +6326,7 @@ msgid "Number"
msgstr "Номер"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Кому"
@@ -6731,7 +6731,7 @@ msgstr "О программе"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - POP3 удаленный почтовый ящик"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Номер"
@@ -7664,15 +7664,15 @@ msgstr "Отмена связывания обсуждений..."
msgid "Filtering (%d / %d)..."
msgstr "Фильтрация (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "фильтрация..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Фильтрация..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d сообщений отфильтровано."
diff --git a/po/sk.po b/po/sk.po
index bdd2e2d8..175787cf 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -20,6 +20,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Načítavam nastavenia pre všetky kontá...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Priečinok"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Priečinok"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -223,34 +233,34 @@ msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "nemôžem zapisovať do dočasného súboru\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Prijímam správy z %s do %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "nemôžem prečítať súbor mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "neplatný formát mbox: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "poškodený mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "nemôžem otvoriť dočasný súbor\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -259,43 +269,43 @@ msgstr ""
"neukončené From:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "nemôžem vytvoriť zámkový súbor %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "ak je to možné, miesto 'file' použite 'flock'.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "nemôžem vytvoriť %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "iný proces vlastní mailbox, čakám...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "nemôžem uzamknúť %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "neplatný typ zámku\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "nemôžem odomknúť %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "nemôžem skrátiť mailbox na nulovú dĺžku.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exportujem správy z %s do %s...\n"
@@ -314,7 +324,7 @@ msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopírujem správu %s%c%d do %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -503,16 +513,6 @@ msgstr "Nájdené %s\n"
msgid "Configuration is saved.\n"
msgstr "Nastavenie uložené.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Priečinok"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Priečinok"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
@@ -1269,15 +1269,15 @@ msgstr "Spoločná adresa"
msgid "Personal address"
msgstr "Súkromná adresa"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Upozornenie"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Varovanie"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Chyba"
@@ -1320,7 +1320,7 @@ msgstr "Hnedá"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Žiadna"
@@ -1894,7 +1894,7 @@ msgstr "Dátum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Veľkosť"
@@ -2963,158 +2963,158 @@ msgstr "Atribúty"
msgid "Sylpheed: %d new messages"
msgstr "Dokončené (%d nových správ)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Autentizácia"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Prijímam nové správy"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Storno"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Čakajte"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Zrušené"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Prijímam"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Hotovo (%d správ (%s) prijatých)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Žiadne nové správy."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Hotovo."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autentizácia zlyhala"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Zamknuté"
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Timeout (v sekundách)"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Dokončené (%d nových správ)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Dokončené (žiadne nové správy)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Pri prijímaní pošty sa vyskytli chyby."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "prijímam nové správy pre konto %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Autentizácia"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Prijímam nové správy"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Pripájam sa k serveru POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autentizácia..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Prijímam správy z %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Získavam počet nových správ (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Získavam počet nových správ (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Získavam počet nových správ (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Získavam veľkosť správ (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Odstraňujem správu %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Odpájam sa"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Prijímam správu (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Spojenie zlyhalo."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Pri spracovávaní pošty sa vyskytla chyba."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3123,29 +3123,29 @@ msgstr ""
"Pri spracovávaní pošty sa vyskytla chyba:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Na disku už nie je miesto."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Nedá sa zapisovať do súboru."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Chyba socketu."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Vzdialený hostiteľ ukončil spojenie."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Mailbox je zamknutý."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3154,11 +3154,11 @@ msgstr ""
"Mailbox je zamknutý:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Autentizácia bola neúspešná."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3167,16 +3167,16 @@ msgstr ""
"Autentizácia bola neúspešná:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
#, fuzzy
msgid "Session timed out."
msgstr "čas spojenia vypršal\n"
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Začleňovanie zrušené\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Prijímam nové správy z %s do %s...\n"
@@ -3194,16 +3194,16 @@ msgstr "Zadajte heslo"
msgid "Protocol log"
msgstr "Záznam protokolu"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Použitie: %s [VOĽBY]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adresa] otvorí okno pre písanie novej správy"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3214,23 +3214,23 @@ msgstr ""
"uvedenými\n"
" súbormi"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive prijme nové správy"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all prijme nové správy pre všetky kontá"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send pošle všetky správy vo výstupnej fronte"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [priečinok]... zobrazí celkový počet správ"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3238,50 +3238,50 @@ msgstr ""
" --status-full [priečinok]...\n"
" zobrazí stav jednotlivých priečinkov"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug ladiaci mód"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug ladiaci mód"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help zobrazí túto nápovedu a ukončí program"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr ""
" --version zobrazí informácie o verzii a ukončí program"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"alebo stlačte klávesu 'y'.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Výstupné kódovanie znakov"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3295,19 +3295,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Máte rozpísanú správu. Naozaj ukončiť?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Správy vo fronte"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3315,21 +3315,21 @@ msgstr ""
"GnuPG nie je nainštalované správne, alebo jeho verzia je príliš stará.\n"
"Podpora OpenPGP je vypnutá."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "už beží iná kópia Sylpheedu.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Nastavenie akcií"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4023,7 +4023,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "hotovo.\n"
@@ -6519,19 +6519,19 @@ msgstr "Príloha"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Predmet"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Od"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Dátum"
@@ -6541,7 +6541,7 @@ msgid "Number"
msgstr "Číslo"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Komu:"
@@ -6976,7 +6976,7 @@ msgstr "O programe"
msgid "%s - POP3 Remote mailbox"
msgstr "Odstrániť schránku"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Č."
@@ -7927,15 +7927,15 @@ msgstr "Odstraňujem štruktúru vlákien..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrujem..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrujem..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrujem..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 078a13a1..e78fa541 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -18,6 +18,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Berem vse nastavitve za vsak račun...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Mapa"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Mapa"
+
#: libsylph/imap.c:537
#, fuzzy, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -226,34 +236,34 @@ msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv ne more pretvoriti %s v UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "ne morem pisati v začasno datoteko\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Sprejemam sporočila iz %s v %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "ne morem prebrati datoteke mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "napačen format mbox: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "napačno oblikovan mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "ne morem odpreti začasne datoteke\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -262,43 +272,43 @@ msgstr ""
"najdeno neubežno polje Od:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "ne morem narediti datoteke za zaklepanje %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "če je mogoče, uporabi 'flock' namesto 'file'.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "ne morem narediti %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "poštni predal si lasti drug proces, čakam...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "ne morem zakleniti %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "neveljaven tip zaklepanja\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "ne morem odkleniti %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "ne morem prisekati poštnega predala na ničlo.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Izvažam sporočila iz %s v %s...\n"
@@ -317,7 +327,7 @@ msgstr "Izvorna mapa je identična ciljni.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -508,16 +518,6 @@ msgstr "Najden %s\n"
msgid "Configuration is saved.\n"
msgstr "Konfiguracija je shranjena.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Mapa"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Mapa"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
@@ -1274,15 +1274,15 @@ msgstr "Skupni naslov"
msgid "Personal address"
msgstr "Osebni naslov"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Opomba"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Opozorilo"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Napaka"
@@ -1325,7 +1325,7 @@ msgstr "Rjava"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Nič"
@@ -1899,7 +1899,7 @@ msgstr "Datum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Velikost"
@@ -2968,215 +2968,215 @@ msgstr "Atributi"
msgid "Sylpheed: %d new messages"
msgstr "Končano (%d novih sporočil)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Overovljam"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Prenašam nova sporočila"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Prekliči"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "V pripravljenosti"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Preklicano"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Prenašam"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Opravljeno (%d sporočil (%s) prejetih)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Ni novih sporočil."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Opravljeno."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Overovitev ni uspela"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Zaklenjeno"
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Čas izteka (sek.)"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Končano (%d novih sporočil)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Končano (ni novih sporočil)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "sprejemam nova sporočila z računa %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Overovljam"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Prenašam nova sporočila"
-#: src/inc.c:862
+#: src/inc.c:878
#, fuzzy, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Povezujem se s strežnikom POP: %s"
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Overovljam..."
-#: src/inc.c:963
+#: src/inc.c:979
#, fuzzy, c-format
msgid "Retrieving messages from %s..."
msgstr "Sprejemam sporočila iz %s v %s...\n"
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Ugotavljam število novih sporočil (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Ugotavljam število novih sporočil (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Ugotavljam število novih sporočil (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Ugotavljam velikost sporočil (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Brišem sporočilo %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Zapuščam"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
#, fuzzy
msgid "Connection failed."
msgstr "Povezava ni uspela"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Med obdelavo pošte je prišlo do napake."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, fuzzy, c-format
msgid ""
"Error occurred while processing mail:\n"
"%s"
msgstr "Med obdelavo pošte je prišlo do napake."
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Na disku ni prostora."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Ne morem napisati datoteke."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "napaka v priključku."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Poštni predal je zaklenjen."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, fuzzy, c-format
msgid ""
"Mailbox is locked:\n"
"%s"
msgstr "Poštni predal je zaklenjen."
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
#, fuzzy
msgid "Authentication failed."
msgstr "Overovitvena metoda"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Overovitvena metoda"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr ""
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Pripojitev odpovedana\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -3194,16 +3194,16 @@ msgstr "Vnesite geslo"
msgid "Protocol log"
msgstr "Dnevnik protokola"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uporaba: %s [MOŽNOST]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [naslov] odpri okno za sestavljanje novega sporočila"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3213,73 +3213,73 @@ msgstr ""
" odpri okno za sestavljanje s pripetimi\n"
" podanimi datotekami"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive poberi nova sporočila"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all poberi nova sporočila z vseh računov"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send pošlji vsa čakajoča sporočila"
-#: src/main.c:593
+#: src/main.c:608
#, fuzzy
msgid " --status [folder]... show the total number of messages"
msgstr " --status prikaži skupno število sporočil"
-#: src/main.c:594
+#: src/main.c:609
#, fuzzy
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr " --status prikaži skupno število sporočil"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug razhroščevalni način"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug razhroščevalni način"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help prikaži to pomoč in končaj"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version prikaži informacijo o različici in končaj"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"ali pritisnite tipko `y'.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Izhodni nabor znakov"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3293,19 +3293,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Še vedno sestavljate sporočilo. Ali naj res končam?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Čakajoča sporočila"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3313,21 +3313,21 @@ msgstr ""
"GnuPG ni pravilno nameščen ali pa je različica prestara.\n"
"Podpora za OpenPGP je izključena."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "Sylpheed že teče.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Pišem nastavitve dejanj..\n"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4027,7 +4027,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "opravljeno.\n"
@@ -6521,19 +6521,19 @@ msgstr "Priloga"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Zadeva"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Od"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Datum"
@@ -6543,7 +6543,7 @@ msgid "Number"
msgstr "Število"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Za:"
@@ -6976,7 +6976,7 @@ msgstr "O"
msgid "%s - POP3 Remote mailbox"
msgstr "Odstrani poštni predal"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Ne."
@@ -7928,15 +7928,15 @@ msgstr "Raznitujem..."
msgid "Filtering (%d / %d)..."
msgstr "Filtriram..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtriram..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtriram..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, fuzzy, c-format
msgid "%d message(s) have been filtered."
msgstr "sporočilo %d je že v predpomnilniku.\n"
diff --git a/po/sr.po b/po/sr.po
index 11f6ee11..847e6df4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2002-11-29 21:08+0100\n"
"Last-Translator: garret <garret@garrets.tk>\n"
"Language-Team: Serbian\n"
@@ -19,6 +19,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Čitanje konfiguracije za svaki nalog...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Direktorijum"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "Direktorijum"
+
#: libsylph/imap.c:537
#, fuzzy, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -227,34 +237,34 @@ msgstr "iconv ne može prebaciti UTF-7 to %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv ne može prebaciti %s to UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "ne mogu pisati u privremenu datoteku\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Primam poruke sa %s u %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "ne mogu čitati mbox datoteku.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "pogrešan mbox format: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "pokvaren mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "ne mogu otvoriti privremenu datoteku\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -263,43 +273,43 @@ msgstr ""
"neizbežan Od pronađen:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "ne mogu napraviti zaključanu datoteku %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "koristi 'flock' umesto 'file' ako je moguće.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "ne mogu napraviti %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "neki drugi proces koristi sanduče, čekam...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "ne mogu zaključati %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "neispravan tip zaključavanja\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "ne mogu otključati %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "ne mogu skratiti sanduče na nulu.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Izvozim poruke iz %s u %s...\n"
@@ -318,7 +328,7 @@ msgstr "izvorni direktorijum jednak je destinaciji.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopiram poruke %s%c%d u %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -509,16 +519,6 @@ msgstr "Pronađeno %s\n"
msgid "Configuration is saved.\n"
msgstr "Konfiguracija je spremljena.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Direktorijum"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "Direktorijum"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
@@ -1268,15 +1268,15 @@ msgstr "Uobičajene adrese"
msgid "Personal address"
msgstr "Lične adrese"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Obaveštenje"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Upozorenje"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Greška"
@@ -1319,7 +1319,7 @@ msgstr "Smeđa"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Ništa"
@@ -1894,7 +1894,7 @@ msgstr "Datum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Veličina"
@@ -2963,214 +2963,214 @@ msgstr "Atributi"
msgid "Sylpheed: %d new messages"
msgstr "Završeno (%d novih poruka)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Provera identiteta"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Primam nove poruke"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Odustani"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Standby"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Otkazano"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Primam"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Gotovo (%d poruke/a (%s) primljeno)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Nema novih poruka."
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Gotovo"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Veza nije ostvarena"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Identifikacija nije uspela"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Zaključano"
-#: src/inc.c:755
+#: src/inc.c:771
#, fuzzy
msgid "Timeout"
msgstr "Timeout (sek)"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Završeno (%d novih poruka)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Nema nepročitanih poruka"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Došlo je do grešaka prilikom primanja pošte."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "primam nove poruke za nalog %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Provera identiteta"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Primam nove poruke"
-#: src/inc.c:862
+#: src/inc.c:878
#, fuzzy, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Povezujem se na POP3 server: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Prijavljujem se..."
-#: src/inc.c:963
+#: src/inc.c:979
#, fuzzy, c-format
msgid "Retrieving messages from %s..."
msgstr "Primam poruke sa %s u %s...\n"
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Preuzimam broj novih poruka (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Preuzimam broj novih poruka (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Preuzimam broj novih poruka (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Preuzimam veličinu poruka (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Brišem poruke %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Izlazim"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Primam poruke (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
#, fuzzy
msgid "Connection failed."
msgstr "Veza nije ostvarena"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Došlo je do greške pri radu s poštom."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, 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:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Nema više mesta na disku."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Ne mogu pisati u datoteku."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Protokol greška."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr ""
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Sanduče je zaključano."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, fuzzy, c-format
msgid ""
"Mailbox is locked:\n"
"%s"
msgstr "Sanduče je zaključano."
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
#, fuzzy
msgid "Authentication failed."
msgstr "Način provere identieta"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Način provere identieta"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr ""
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Incorporation otkazano\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Primam nove poruke od %s u %s...\n"
@@ -3188,16 +3188,16 @@ msgstr "Unesite lozinku"
msgid "Protocol log"
msgstr "Zapis protokola"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Upotreba: %s [OPCIJA]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adresa] otvara prozor za pisanje"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3207,73 +3207,73 @@ msgstr ""
" otvara prozor za pisanje sa navedenim datotekama\n"
" dodato"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive prima nove poruke"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all primi sve poruke sa svih naloga"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send šalje sve odložene poruke"
-#: src/main.c:593
+#: src/main.c:608
#, fuzzy
msgid " --status [folder]... show the total number of messages"
msgstr " --status pokazuje ukupan broj poruka"
-#: src/main.c:594
+#: src/main.c:609
#, fuzzy
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr " --status pokazuje ukupan broj poruka"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug debug način"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug debug način"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help prikaž ovu pomoć izađi"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version prikazuje verziju i izlazi"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"ili pritisnite `y´ tipku.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Izlazni charset"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3287,19 +3287,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Napisana poruka postoji. Zaista prekinuti?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Odložene poruke"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3307,21 +3307,21 @@ msgstr ""
"GnuPG nije pravilno instaliran ili je verzija suviše stara.\n"
"OpenPGP podrška je onemogućena."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "drugi Sylpheed već radi.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Pisanje konfiguracije za akcije...\n"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4022,7 +4022,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "gotovo.\n"
@@ -6515,19 +6515,19 @@ msgstr "Dodatak"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Tema"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Od"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Datum"
@@ -6537,7 +6537,7 @@ msgid "Number"
msgstr "Broj"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Za:"
@@ -6971,7 +6971,7 @@ msgstr "O"
msgid "%s - POP3 Remote mailbox"
msgstr "/_Ukloni sanduče"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Ne."
@@ -7923,15 +7923,15 @@ msgstr "Rasipanje..."
msgid "Filtering (%d / %d)..."
msgstr "Filtriranje..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtriranje..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtriranje..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, fuzzy, c-format
msgid "%d message(s) have been filtered."
msgstr "poruka %d već je prihvaćena.\n"
diff --git a/po/sv.po b/po/sv.po
index d6817501..15cd21af 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2004-12-05 14:40+0100\n"
"Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -19,6 +19,15 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Läser all konfiguration för varje konto...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Skräppostfilter"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Skräppostfilter"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -220,34 +229,34 @@ msgstr "iconv kan inte konvertera UTF-7 till %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv kan inte konvertera %s till UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "kan inte skriva till temporär fil\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Hämtar meddelanden från %s till %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "kan inte läsa mboxfil.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "felaktigt mboxformat: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "felformad mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "kan inte öppna temporär fil\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -256,43 +265,43 @@ msgstr ""
"o-esc:at Från-fält funnet:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "kan inte skapa låsfil %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "använd \"flock\" istället för \"file\" om möjligt.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "kan inte skapa %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "brevlådan ägs av en annan process, väntar...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "kan inte låsa %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "felaktig låstyp\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "kan inte låsa upp %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "kan inte korta av brevlåda till noll.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Exporterar meddelanden från %s till %s...\n"
@@ -311,7 +320,7 @@ msgstr "ursprungsmappen är identisk med dest.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Kopierar meddelande %s%c%d till %s...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -506,15 +515,6 @@ msgstr "Fann %s\n"
msgid "Configuration is saved.\n"
msgstr "Konfigurationen är sparad.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Skräppostfilter"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Skräppostfilter"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
@@ -1265,15 +1265,15 @@ msgstr "Vanlig adress"
msgid "Personal address"
msgstr "Privat adress"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Notera"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Varning"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Fel"
@@ -1316,7 +1316,7 @@ msgstr "Brun"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Ingen"
@@ -1859,7 +1859,7 @@ msgstr "Datum"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Storlek"
@@ -2923,157 +2923,157 @@ msgstr "Attribut"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d nya meddelanden"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Autentiserar"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Hämtar nya meddelanden"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Avbryt"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Vänta"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Avbruten"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Hämtar"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Inga nya meddelanden."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Färdig."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Förbindelse misslyckades"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Autentisering misslyckades"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Låst"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Slut på väntetid"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Avslutad (%d nya meddelanden)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Avslutad (inga nya meddelanden)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Fel uppstod vid hämtning av post."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "hämtar nya meddelanden från kontot %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Autentiserar"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Hämtar nya meddelanden"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Ansluter till POP3-server: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, 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:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Autentiserar..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Hämtar meddelanden från %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Tar emot meddelandenas antal (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Tar emot meddelandenas antal (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Tar emot meddelandenas antal (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Tar emot meddelandenas storlek (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Tar bort meddelande %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Avslutar"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Förbindelse misslyckades."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Fel uppstod när e-posten behandlades."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3082,29 +3082,29 @@ msgstr ""
"Fel uppstod när e-posten behandlades:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Inget diskutrymme kvar."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Kan inte skriva fil."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Fel på uttag (socket)."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Anslutningen stängdes av fjärrvärden."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Brevlådan är låst."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3113,11 +3113,11 @@ msgstr ""
"Brevlådan är låst:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Autentisering misslyckades."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3126,15 +3126,15 @@ msgstr ""
"Autentisering misslyckades:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Sessionens väntetid tog slut."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Inkorporering avbruten\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -3152,16 +3152,16 @@ msgstr "Skriv in lösenord"
msgid "Protocol log"
msgstr "Protokollogg"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Användning: %s [FLAGGOR]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adress] öppna skrivfönster"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3171,23 +3171,23 @@ msgstr ""
" öppna skrivfönster med angivna filer\n"
" bifogade"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive ta emot nya meddelanden"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all ta emot nya meddelanden från alla konton"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send skicka alla köade meddelanden"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [mapp]... visar det totala antalet meddelanden"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3195,48 +3195,48 @@ msgstr ""
" --status-full [mapp]...\n"
" visa status för varje mapp"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug felsökningsläge"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug felsökningsläge"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help visa denna hjälp och avsluta"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version skriv ut versionsinformation och avsluta"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"eller tryck på \"y\"-tangenten.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Filnamn kodning"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3260,19 +3260,19 @@ msgstr ""
"\n"
"Fortsätt?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Ett skrivet meddelande finns. Avsluta ändå?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Meddelanden i kö"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3280,20 +3280,20 @@ msgstr ""
"GnuPG är inte installerad riktigt eller så är versionen för gammal.\n"
"OpenPGP-stöd avstängt."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "en annan instans av Sylpheed är redan igång.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Migration av konfiguration"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3965,7 +3965,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "färdigt.\n"
@@ -6395,19 +6395,19 @@ msgstr "Bilaga"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Ärende"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Från"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Datum"
@@ -6417,7 +6417,7 @@ msgid "Number"
msgstr "Nummer"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Till:"
@@ -6851,7 +6851,7 @@ msgstr "Om"
msgid "%s - POP3 Remote mailbox"
msgstr "Ta bort brevlåda"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Nr."
@@ -7801,15 +7801,15 @@ msgstr "Avtrådar..."
msgid "Filtering (%d / %d)..."
msgstr "Filtrerar..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtrerar..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtrerar..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d meddelande(n) har filtrerats."
diff --git a/po/tr.po b/po/tr.po
index fed129e1..c0dc5a1a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-02-20 16:54+0200\n"
"Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -27,6 +27,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Her hesap için yapılandırma dosyaları okunuyor...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "dizin:"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "dizin:"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -230,34 +240,34 @@ msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "geçici dosyaya yazılamadı\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "%s daki mesajlar %s e alınıyor...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "Posta kutusu dosyası okunamıyor.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "geçersiz posta kutusu biçimi: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "bozuk posta kutusu: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "geçici dosya açılamadı\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -266,44 +276,44 @@ msgstr ""
"uygun olmayan Kimden:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "kilit dosyası yaratılamadı: %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "file yerine flock kullanmayı deneyin.\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "%s oluşturulamadı\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr ""
"posta kutusu başka bir süreç tarafından kullanıldığı için bekleniyor...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "%s kilitlenemedi\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "geçersiz kilit türü\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "%s açılamadı\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "posta kutusu sıfırlanamıyor.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "%s daki mesajlar %s a aktarılıyor...\n"
@@ -322,7 +332,7 @@ msgstr "kaynak dizini hedef dizinle aynı.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "%s%c%d mesajı %s içine kopyalanıyor...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -510,16 +520,6 @@ msgstr "%s bulundu\n"
msgid "Configuration is saved.\n"
msgstr "Yapılandırma kaydedildi.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "dizin:"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "dizin:"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
@@ -1273,15 +1273,15 @@ msgstr "Ortak adres"
msgid "Personal address"
msgstr "Kişisel adres"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Not"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Uyarı"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Hata"
@@ -1324,7 +1324,7 @@ msgstr "Kahverengi"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Hiçbiri"
@@ -1899,7 +1899,7 @@ msgstr "Tarih"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Boyut"
@@ -2965,143 +2965,143 @@ msgstr "Özellikler"
msgid "Sylpheed: %d new messages"
msgstr "Tamamlandı (%d yeni mesaj)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr " Kimlik denetimi"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Yeni iletiler alınıyor"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "İptal"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Bekle"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "İptal edildi"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Alınıyor"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Yeni ileti yok."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Tamamlandı."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Bağlantıda hata"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Kimlik denetiminde hata"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Kilitli"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Zaman aşımı"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Tamamlandı (%d yeni mesaj)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Tamamlandı (yeni mesaj yok)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr " İletiler alınırken bazı hatalar oluştu."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr " Kimlik denetimi"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Yeni iletiler alınıyor"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Kimlik denetimi yapılıyor..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "%s konumundan iletiler alınıyor..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Yeni ileti numaraları alınıyor (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Yeni ileti numaraları alınıyor (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "İletilerin boyutları alınıyor (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "%d. ileti siliniyor"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Çıkılıyor"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3109,15 +3109,15 @@ msgstr ""
"Gereksiz mesaj filtresi komutu çalıştırılamadı.<br> Lütfen gereksiz mesaj "
"kontrol ayarlarınızı kontrol ediniz."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Bağlantıda hata oluştu."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "İletiler işlenirken bir hata oluştu."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3126,29 +3126,29 @@ msgstr ""
"E-posta işlenirken hata oluştu:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Yeterli disk alanı kalmadı."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Dosyaya yazılamadı."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "protokol hatası"
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Bağlantı karşı taraftan kesildi."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Posta kutusu kilitli"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3157,11 +3157,11 @@ msgstr ""
"Posta kutusu kilitli:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Yetkilendirmede hata oluştu."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3170,15 +3170,15 @@ msgstr ""
"Yetkilendirme başarısız:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Oturum zaman aşımına uğradı."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "İptal edildi\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -3196,16 +3196,16 @@ msgstr "Parolayı girin"
msgid "Protocol log"
msgstr "Protokol günlüğü"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [adres] düzenleme penceresini açar"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3215,23 +3215,23 @@ msgstr ""
" düzenleme penceresini belirtilen dosyalar\n"
" postaya eklenmiş halde açar"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive yeni mesajları alır"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all tüm hesaplardaki yeni mesajları alır"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send kuyruktaki postaları gönderir"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [dizin]... toplam mesaj sayısını göster"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3239,49 +3239,49 @@ msgstr ""
" --status-full [dizin]...\n"
" her dizinin durumunu göster"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug hata ayıklama modu"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug hata ayıklama modu"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help bu yardımı gösterir ve çıkar"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version sürüm bilgisini gösterir ve çıkar"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"ya da `y' tuşuna basın.\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "Giden ileti kod kümesi"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3295,19 +3295,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Mesajı göndermeden çıkmak istediğinizden emin misiniz?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Kuyruktaki iletiler"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3315,21 +3315,21 @@ msgstr ""
"GnuPG düzgün kurulmamış veya versiyonu çok eski\n"
"OpenPGP desteği kapatıldı."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Eklentiler yükleniyor..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
-#: src/main.c:1680
+#: src/main.c:1695
#, fuzzy
msgid "Migration of configuration"
msgstr "Eylem ayarları"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -4017,7 +4017,7 @@ 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:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "bitti.\n"
@@ -6476,19 +6476,19 @@ msgstr "Ek"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Konu"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Kimden"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Tarih"
@@ -6498,7 +6498,7 @@ msgid "Number"
msgstr "Numara"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Kime"
@@ -6919,7 +6919,7 @@ msgstr "_Hakkında"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - POP3 Uzak posta kutusu"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Hayır."
@@ -7882,15 +7882,15 @@ msgstr "Konumlar ayrılıyor..."
msgid "Filtering (%d / %d)..."
msgstr "Filtreleniyor (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "filtreleniyor..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Filtreleniyor..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d mesaj filtrelenedi."
diff --git a/po/uk.po b/po/uk.po
index 303119ed..6510f5c4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 3.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2010-03-01 22:30+0300\n"
"Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
"Language-Team: Ukrainian\n"
@@ -24,6 +24,14 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Читаємо конфігурацію для кожного запису...\n"
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Фільтр мотлоху (вручну)"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "фільтр мотлоху"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -224,34 +232,34 @@ msgstr "iconv не може конвертувати UTF-7 в %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv не може конвертувати %s в UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "неможливо писати в тимчасовий файл\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Отримуємо листи від %s в %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "не вдалось прочитати файл mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "неправильний формат файла mbox: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "неправильно збудований mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "неможливо відкрити тимчасовий файл\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -260,43 +268,43 @@ msgstr ""
"знайдено незахищений рядок From:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "не вдалось створити lock-файл %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "якщо можливо, вживайте 'flock' замість 'file'\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "не вдалось створити %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "скринька зайнята іншим процесом, чекаємо...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "не вдалось заблокувати %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "неправильний тип блокування\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "не вдалось розблокувати %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "не вдалось обрізати скриньку до нуля.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Експортуємо листи з %s в %s...\n"
@@ -315,7 +323,7 @@ msgstr "папка призначення ідентична до вихідно
msgid "Copying message %s/%d to %s ...\n"
msgstr "Копіюємо лист %s/%d в %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -511,14 +519,6 @@ msgstr "Знайдено %s\n"
msgid "Configuration is saved.\n"
msgstr "Конфігурацію збережено.\n"
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Фільтр мотлоху (вручну)"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "фільтр мотлоху"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
@@ -1253,15 +1253,15 @@ msgstr "Адреса організації"
msgid "Personal address"
msgstr "Особиста адреса"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Примітка"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Попередження"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Помилка"
@@ -1304,7 +1304,7 @@ msgstr "Коричневий"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Ніякий"
@@ -1836,7 +1836,7 @@ msgstr "Дата"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Розмір"
@@ -2863,141 +2863,141 @@ msgstr "Атрибути"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d нових листів"
-#: src/inc.c:485
+#: src/inc.c:492
msgid "Authenticating with POP3"
msgstr "Автентифікація з POP3"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Отримання нових листів"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Скасувати"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Очікування"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Скасовано"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Отримання"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, c-format
msgid "%d message(s) (%s) received"
msgstr "%d лист(ів) (%s) отримано"
-#: src/inc.c:732
+#: src/inc.c:748
#, c-format
msgid "no new messages"
msgstr "немає нових листів"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "Виконано"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Невдача з'єднання"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Невдача автентифікації"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Заблоковано"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Таймаут"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Закінчено (%d нових листів)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Закінчено (немає нових листів)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "При отриманні пошти трапились деякі помилки."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "отримання нової пошти для запису %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, c-format
msgid "%s: Authenticating with POP3"
msgstr "%s: Автентифікація з POP3"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Отримання нових листів"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "З'єднуємось з сервером POP3: %s ..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Автентифікація..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Отримуємо листи від %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Отримуємо кількість нових листів (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Отримуємо кількість нових листів (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Отримуємо кількість нових листів (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Отримуємо розмір листів (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Видаляємо лист %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Виходимо"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Отримуємо лист (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
@@ -3005,15 +3005,15 @@ msgstr ""
"Невдача виконання команди фільтрування мотлоху.\n"
"Будь-ласка, перевірте налаштування."
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Невдача з'єднання."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "При обробці пошти трапилась помилка."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3022,29 +3022,29 @@ msgstr ""
"При обробці пошти трапилась помилка:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Немає вільного місця на диску."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Не вдалось писати в файл."
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Помилка сокета."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "З'єднання закрито віддаленим хостом."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Скриньку заблоковано."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3053,11 +3053,11 @@ msgstr ""
"Скриньку заблоковано:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Невдача автентифікації."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3066,15 +3066,15 @@ msgstr ""
"Невдача автентифікації:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Таймаут сесії."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Включення скасовано\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -3092,16 +3092,16 @@ msgstr "Введіть пароль"
msgid "Protocol log"
msgstr "Журнал протоколу"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Вживання: %s [ОПЦІЇ]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [address] відкрити вікно для нового листа"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3111,23 +3111,23 @@ msgstr ""
" відкрити вікно створення з приєднанням вказаних\n"
" файлів"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive отримати нові листи"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all отримати нові листи для всіх записів"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send відіслати всі відкладені листи"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [folder]... показати загальну кількість листів"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3135,45 +3135,45 @@ msgstr ""
" --status-full [folder]...\n"
" показати стан кожної папки"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr " --open folderid/msgnum відкрити лист у новому вікні"
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr " --configdir ім'я папки вказати папку для файлів налаштувань"
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr " --ipcport portnum вказати порт для віддалених команд IPC"
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit вийти з Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug режим відлагодження"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help показати цю довідку і вийти"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version видати інформацію про версію і вийти"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr "Натисніть яку-небудь кнопку..."
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Кодова таблиця для імен файлів"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3197,19 +3197,19 @@ msgstr ""
"\n"
"Продовжити?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Є незавершені листи. Справді вийти?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Листи в черзі"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Деякі невідіслані листи - в черзі. Вийти зараз?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3217,20 +3217,20 @@ msgstr ""
"GnuPG не встановлено належно, або надто стара версія.\n"
"Відключено підтримку OpenPGP."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr "Завантажуємо плагіни..."
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "вже запущено інший Sylpheed.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Перенесення налаштувань"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3885,7 +3885,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Головне Вікно: невдача розміщення кольору %d\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "виконано.\n"
@@ -6287,19 +6287,19 @@ msgstr "Вкладення"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Тема"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Від"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Дата"
@@ -6309,7 +6309,7 @@ msgid "Number"
msgstr "Номер"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
msgid "To"
msgstr "Кому:"
@@ -6714,7 +6714,7 @@ msgstr "Про програму"
msgid "%s - POP3 Remote mailbox"
msgstr "%s - віддалена POP3-скринька"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Номер"
@@ -7649,15 +7649,15 @@ msgstr "Скасування ниток обговорення..."
msgid "Filtering (%d / %d)..."
msgstr "Фільтрування (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "фільтрування..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Фільтрування..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d листів відфільтровано."
diff --git a/po/vi.po b/po/vi.po
index 0cea2791..619bfbb7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2006-04-16 22:05+0700\n"
"Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -19,6 +19,15 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "Đang đọc mọi cấu hình cho mỗi tài khoản...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "Lọc thư rác"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Lọc thư rác"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -220,77 +229,77 @@ msgstr "iconv không thể chuyển UTF-7 sang %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv không thể chuyển %s sang UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "không ghi được vào tập tin tạm\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "Lấy thư từ %s vào %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "không đọc được tập tin mbox.\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "định dạng mbox không hợp lệ: %s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "mbox có lỗi: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "không mở được tập tin tạm\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
"%s"
msgstr ""
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "không tạo được tập tin khoá %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "dùng lệnh 'flock' thay vì 'file' nếu có thể\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "không tạo được %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "hộp thư bị chiếm dụng bởi một tiến trình khác, đang chờ...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "không thể khoá %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "kiểu khoá không hợp lệ\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "không thể mở khoá %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "không thể giảm số lượng hộp thư xuống 0.\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "Xuất thư từ %s sang %s...\n"
@@ -309,7 +318,7 @@ msgstr "thư mục nguồn cũng chính là thư mục gốc.\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "Đang chép thư %s%c%d tới %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -504,15 +513,6 @@ msgstr "Tìm thấy %s\n"
msgid "Configuration is saved.\n"
msgstr "Cấu hình đã được lưu.\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "Lọc thư rác"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Lọc thư rác"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): Chuyển đổi mã thất bại.\n"
@@ -1247,15 +1247,15 @@ msgstr "Địa chỉ chung"
msgid "Personal address"
msgstr "Địa chỉ cá nhân"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "Chú ý"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "Cảnh báo"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "Lỗi"
@@ -1298,7 +1298,7 @@ msgstr "Nâu"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "Không"
@@ -1835,7 +1835,7 @@ msgstr "Thời gian"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "Kích thước"
@@ -2895,157 +2895,157 @@ msgstr "Thuộc tính"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d thư mới"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "Đang xác thực"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "Đang tải về thư mới"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "Đã bị huỷ bỏ"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "Đợi"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "Đã bị huỷ bỏ"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "Đang tải về"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "Xong (%d thư (%s) nhận được)"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "Không có thư mới."
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "Xong."
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "Kết nối thất bại"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "Xác thực thất bại"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "Đã khoá"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "Hết giờ"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "Hoàn tất (%d thư mới)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "Hoàn tất (không có thư mới)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "Xảy ra một số lỗi khi nhận thư."
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "đang nhận thư mới của tài khoản %s...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "Đang xác thực"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Đang nhận thư mới"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "Đang kết nối tới máy chủ POP3: %s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "Đang xác thực..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "Đang lấy thư trên %s..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "Đang xác định số lượng thư mới (STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "Đang xác định số lượng thư mới (LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "Đang xác định số lượng thư mới (UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "Đang xác định kích thước thư (LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "Đang xoá thư %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "Đang thoát"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Đang lấy thư (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "Kết nối thất bại."
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "Có lỗi khi xử lí thư."
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3054,29 +3054,29 @@ msgstr ""
"Có lỗi khi xử lí thư:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "Ổ cứng bị đầy."
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "Không thể ghi lên tập tin"
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Lỗi socket."
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "Kết nối bị ngắt bởi máy từ xa."
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "Hộp thư bị khoá."
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3085,11 +3085,11 @@ msgstr ""
"Hộp thư bị khoá:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "Xác thực thất bại."
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3098,15 +3098,15 @@ msgstr ""
"Xác thực thất bại:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "Phiên làm việc hết giờ."
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "Sáp nhập bị huỷ bỏ\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Đang lấy thư từ %s vào %s...\n"
@@ -3124,16 +3124,16 @@ msgstr "Nhập mật khẩu"
msgid "Protocol log"
msgstr "Theo dõi giao thức"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Cách dùng: %s [TUỲ CHỌN]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [địa chỉ] mở cửa sổ soạn thảo"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3143,23 +3143,23 @@ msgstr ""
" mở cửa sổ soạn thảo với tập tin đính kèm\n"
" đã chỉ định"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive nhận thư mới"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all nhận thư mới từ mọi tài khoản"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send gửi mọi thư đã xếp hàng"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [thư mục]... hiện tổng số thư"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3167,45 +3167,45 @@ msgstr ""
" --status-full [thư mục]...\n"
" hiện trạng thái của từng thư mục"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
msgid " --exit exit Sylpheed"
msgstr " --exit đóng Sylpheed"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug chế độ gỡ lỗi"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help hiển thị phần giúp đỡ này và thoát"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version đưa ra thông tin phiên bản và thoát"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr ""
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "Mã của tên tập tin"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3229,19 +3229,19 @@ msgstr ""
"\n"
"Tiếp tục?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "Đang viết thư. Bạn thực sự muốn thoát?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "Các thư đang đợi gửi"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "Một số thư chưa gửi đã được xếp hàng. Thoát bây giờ?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3249,20 +3249,20 @@ msgstr ""
"GnuPG không được cài đặt hoàn hảo, hoặc phiên bản quá cũ.\n"
"Việc hỗ trợ OpenGPG bị cấm."
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "một tiến trình Sylpheed khác đang chạy.\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "Di trú cấu hình"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3930,7 +3930,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "xong.\n"
@@ -6360,19 +6360,19 @@ msgstr "Đính kèm"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "Tiêu đề"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "Người gửi"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "Thời gian"
@@ -6382,7 +6382,7 @@ msgid "Number"
msgstr "Số"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "Người nhận:"
@@ -6808,7 +6808,7 @@ msgstr "Giới t_hiệu"
msgid "%s - POP3 Remote mailbox"
msgstr "Xoá hộp thư"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "Số "
@@ -7757,15 +7757,15 @@ msgstr "Đang rời luồng..."
msgid "Filtering (%d / %d)..."
msgstr "Đang lọc (%d / %d)..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "đang lọc..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "Đang lọc..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "%d thư đã được lọc."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dc98809c..ca1f86bf 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: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -20,6 +20,16 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "正在读取所有帐号的配置...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "文件夹:"
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "文件夹:"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -223,34 +233,34 @@ msgstr "iconv 无法转换 UTF-7 到 %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "iconv 无法转换 %s 到 UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "无法写入临时文件\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "正在从 %s 获取邮件到 %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "无法读取 mbox 文件。\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "无效的 mbox 格式:%s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "格式不正确的 mbox:%s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "无法打开临时文件\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -259,43 +269,43 @@ msgstr ""
"找到没有转码的发件人:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "无法创建锁文件 %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "如果可能,用“flock”代替“file”。\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "无法创建 %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "另一个进程拥有该邮箱,等待...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "无法锁住 %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "无效的锁类型\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "无法解锁 %s\n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "无法将邮箱删除为空。\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "正在从 %s 导出信件到 %s...\n"
@@ -314,7 +324,7 @@ msgstr "源文件夹与目的文件夹是同一个。\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -502,16 +512,6 @@ msgstr "发现 %s\n"
msgid "Configuration is saved.\n"
msgstr "配置已经保存。\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "文件夹:"
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "文件夹:"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content():代码转换失败。\n"
@@ -1256,15 +1256,15 @@ msgstr "公用地址"
msgid "Personal address"
msgstr "个人地址"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "注意"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "警告"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "错误"
@@ -1307,7 +1307,7 @@ msgstr "棕色"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "没有"
@@ -1851,7 +1851,7 @@ msgstr "日期"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "大小"
@@ -2915,156 +2915,156 @@ msgstr "属性"
msgid "Sylpheed: %d new messages"
msgstr "完成 (%d 个新邮件)"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "正在验证"
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "正在获取新邮件"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "取消"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "请等待"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "取消"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "正在获取"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "完成 (收到 %d 个邮件 (%s))"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "没有新邮件"
-#: src/inc.c:733
+#: src/inc.c:749
msgid "Done"
msgstr "完成"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "连接失败"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "验证失败"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "锁住"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "超时"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "完成 (%d 个新邮件)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "完成 (没有新邮件)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "获取邮件时发生错误。"
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "正在获取帐号 %s 的新邮件...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "正在验证"
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s:正在获取新邮件"
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "正在连接POP3服务器:%s..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "无法连接POP3服务器:%s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "正在验证..."
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "正在从 %s 获取邮件..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "正在获取新邮件数量(STAT)..."
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "正在获取新邮件数量(LAST)..."
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "正在获取新邮件数量(UIDL)..."
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "正在获取新邮件的大小(LIST)..."
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "正在删除邮件 %d"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "正在退出"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "正在获取邮件 (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "连接失败"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "处理邮件时发生错误。"
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3073,29 +3073,29 @@ msgstr ""
"处理邮件时发生错误:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "没有剩余磁盘空间。"
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "无法写入文件。"
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Socket错误。"
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "远程主机关闭了连接。"
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "信箱被锁住。"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -3104,11 +3104,11 @@ msgstr ""
"信箱被锁住:\n"
"%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "验证失败。"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3117,15 +3117,15 @@ msgstr ""
"验证失败:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "会话超时。"
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "合并新邮件被取消\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3143,16 +3143,16 @@ msgstr "输入密码"
msgid "Protocol log"
msgstr "协议记录"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "用法:%s [OPTION]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [address] 打开撰写窗口"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3161,23 +3161,23 @@ msgstr ""
" --attach 文件1 [文件2]...\n"
" 打开撰写窗口并添加指定的附件"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive 接收新邮件"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all 接收所有帐号的新邮件"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send 发送队列中的邮件"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [文件夹]... 显示邮件总数"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -3185,49 +3185,49 @@ msgstr ""
" --status-full [文件夹]...\n"
" 显示每个文件夹的状态"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug 调试模式"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug 调试模式"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help 显示该帮助并退出"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version 输出版本信息并退出"
-#: src/main.c:608
+#: src/main.c:623
#, fuzzy, c-format
msgid "Press any key..."
msgstr ""
"或按下“y”键。\n"
"\n"
-#: src/main.c:743
+#: src/main.c:758
#, fuzzy
msgid "Filename encoding"
msgstr "发送时使用的字符编码"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3241,19 +3241,19 @@ msgid ""
"Continue?"
msgstr ""
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "正在撰写邮件。真的要退出吗?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "队列中的邮件"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "一些未发送的信件被放入队列。现在退出吗?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3261,20 +3261,20 @@ msgstr ""
"没有正确安装 GnuPG,或者版本太老。\n"
"已禁用 OpenPGP 支持。"
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "另外一个 Sylpheed 正在运行。\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "正在迁移配置"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3953,7 +3953,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "主窗口:分配颜色 %d 失败\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "完成。\n"
@@ -6398,19 +6398,19 @@ msgstr "附件"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "主题"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "发件人"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "日期"
@@ -6420,7 +6420,7 @@ msgid "Number"
msgstr "序号"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "收件人:"
@@ -6853,7 +6853,7 @@ msgstr "关于"
msgid "%s - POP3 Remote mailbox"
msgstr "删除邮箱"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "No."
@@ -7806,15 +7806,15 @@ msgstr "正在取消线索..."
msgid "Filtering (%d / %d)..."
msgstr "正在过滤..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "正在过滤..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "正在过滤..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "已经过滤 %d 个邮件。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 89f2e636..ea3683b2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.1.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
"PO-Revision-Date: 2005-10-25 16:23+0800\n"
"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -21,6 +21,15 @@ msgstr ""
msgid "Reading all config for each account...\n"
msgstr "讀取所有帳號的設定中...\n"
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "垃圾郵件資料夾"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "垃圾郵件資料夾"
+
#: libsylph/imap.c:537
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -222,34 +231,34 @@ msgstr "無法將 UTF-7 轉換為 %s\n"
msgid "iconv cannot convert %s to UTF-7\n"
msgstr "無法轉換 %s 為 UTF-7\n"
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
msgid "can't write to temporary file\n"
msgstr "無法寫入暫存檔。\n"
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
#, c-format
msgid "Getting messages from %s into %s...\n"
msgstr "從 %s 中取得郵件放入 %s...\n"
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
msgid "can't read mbox file.\n"
msgstr "無法讀取 mbox 檔案。\n"
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
#, c-format
msgid "invalid mbox format: %s\n"
msgstr "不合法的 mbox 格式:%s\n"
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
#, c-format
msgid "malformed mbox: %s\n"
msgstr "損壞的 mbox: %s\n"
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
msgid "can't open temporary file\n"
msgstr "無法開啟暫存檔。\n"
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
#, c-format
msgid ""
"unescaped From found:\n"
@@ -258,43 +267,43 @@ msgstr ""
"不完整的 From 格式:\n"
"%s"
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
#, c-format
msgid "can't create lock file %s\n"
msgstr "無法開啟檔案 %s\n"
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
msgid "use 'flock' instead of 'file' if possible.\n"
msgstr "如果可以,請使用「flock」替代「file」。\n"
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
#, c-format
msgid "can't create %s\n"
msgstr "無法產生 %s\n"
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
msgid "mailbox is owned by another process, waiting...\n"
msgstr "信箱正被其他的行程讀取中, 請稍候...\n"
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
#, c-format
msgid "can't lock %s\n"
msgstr "無法鎖住 %s\n"
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
msgid "invalid lock type\n"
msgstr "不合法的 lock 型態。\n"
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
#, c-format
msgid "can't unlock %s\n"
msgstr "%s 無法打開 \n"
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
msgid "can't truncate mailbox to zero.\n"
msgstr "無法清除信箱。\n"
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
#, c-format
msgid "Exporting messages from %s into %s...\n"
msgstr "將郵件由 %s 匯出到 %s 中...\n"
@@ -313,7 +322,7 @@ msgstr "來源與目的資料夾相同。\n"
msgid "Copying message %s/%d to %s ...\n"
msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
#, c-format
msgid ""
"File `%s' already exists.\n"
@@ -507,15 +516,6 @@ msgstr "找到 %s\n"
msgid "Configuration is saved.\n"
msgstr "組態設定已儲存。\n"
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "垃圾郵件資料夾"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "垃圾郵件資料夾"
-
#: libsylph/procmime.c:1293
msgid "procmime_get_text_content(): Code conversion failed.\n"
msgstr "procmime_get_text_content(): 轉碼失敗。\n"
@@ -1261,15 +1261,15 @@ msgstr "共用通訊紀錄"
msgid "Personal address"
msgstr "私人通訊紀錄"
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
msgid "Notice"
msgstr "注意"
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
msgid "Warning"
msgstr "警告"
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
msgid "Error"
msgstr "錯誤"
@@ -1312,7 +1312,7 @@ msgstr "棕色"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
msgid "None"
msgstr "無"
@@ -1853,7 +1853,7 @@ msgstr "日期"
#. S_COL_DATE
#: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
#: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
msgid "Size"
msgstr "大小"
@@ -2916,157 +2916,157 @@ msgstr "屬性"
msgid "Sylpheed: %d new messages"
msgstr "Sylpheed: %d 封新郵件"
-#: src/inc.c:485
+#: src/inc.c:492
#, fuzzy
msgid "Authenticating with POP3"
msgstr "認證中..."
-#: src/inc.c:512
+#: src/inc.c:519
msgid "Retrieving new messages"
msgstr "取得新郵件中"
-#: src/inc.c:514
+#: src/inc.c:521
#, fuzzy
msgid "Cancel _all"
msgstr "取消"
-#: src/inc.c:560
+#: src/inc.c:567
msgid "Standby"
msgstr "等待處理中"
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
msgid "Cancelled"
msgstr "取消"
-#: src/inc.c:719
+#: src/inc.c:735
msgid "Retrieving"
msgstr "讀取中"
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
#, fuzzy, c-format
msgid "%d message(s) (%s) received"
msgstr "完成 (已接收 %d 封郵件 (%s))"
-#: src/inc.c:732
+#: src/inc.c:748
#, fuzzy, c-format
msgid "no new messages"
msgstr "沒有新郵件。"
-#: src/inc.c:733
+#: src/inc.c:749
#, fuzzy
msgid "Done"
msgstr "完成"
-#: src/inc.c:738
+#: src/inc.c:754
msgid "Connection failed"
msgstr "連線失敗。"
-#: src/inc.c:741
+#: src/inc.c:757
msgid "Auth failed"
msgstr "認證失敗"
-#: src/inc.c:745
+#: src/inc.c:761
msgid "Locked"
msgstr "已鎖定"
-#: src/inc.c:755
+#: src/inc.c:771
msgid "Timeout"
msgstr "逾時"
-#: src/inc.c:802
+#: src/inc.c:818
#, c-format
msgid "Finished (%d new message(s))"
msgstr "完成(%d 封新郵件)"
-#: src/inc.c:805
+#: src/inc.c:821
#, c-format
msgid "Finished (no new messages)"
msgstr "完成(無新郵件)"
-#: src/inc.c:814
+#: src/inc.c:830
msgid "Some errors occurred while getting mail."
msgstr "取得郵件時發生錯誤。"
-#: src/inc.c:850
+#: src/inc.c:866
#, c-format
msgid "getting new messages of account %s...\n"
msgstr "取得 %s 的新郵件中, 請稍候...\n"
-#: src/inc.c:854
+#: src/inc.c:870
#, fuzzy, c-format
msgid "%s: Authenticating with POP3"
msgstr "認證中..."
-#: src/inc.c:857
+#: src/inc.c:873
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: 取得新郵件中, 請稍候..."
-#: src/inc.c:862
+#: src/inc.c:878
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "連線到 POP3 伺服器 %s 中..."
-#: src/inc.c:880
+#: src/inc.c:896
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "無法連線到 POP3 伺服器:%s:%d\n"
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
#, c-format
msgid "Authenticating..."
msgstr "認證"
-#: src/inc.c:963
+#: src/inc.c:979
#, c-format
msgid "Retrieving messages from %s..."
msgstr "從 %s 中取得郵件中..."
-#: src/inc.c:968
+#: src/inc.c:984
msgid "Getting the number of new messages (STAT)..."
msgstr "取得新郵件的數量中"
-#: src/inc.c:972
+#: src/inc.c:988
msgid "Getting the number of new messages (LAST)..."
msgstr "取得新郵件的數量中"
-#: src/inc.c:976
+#: src/inc.c:992
msgid "Getting the number of new messages (UIDL)..."
msgstr "取得新郵件的數量中"
-#: src/inc.c:980
+#: src/inc.c:996
msgid "Getting the size of messages (LIST)..."
msgstr "取得新郵件的數量中"
-#: src/inc.c:990
+#: src/inc.c:1006
#, c-format
msgid "Deleting message %d"
msgstr "刪除第 %d 號郵件"
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
msgid "Quitting"
msgstr "離開"
-#: src/inc.c:1032
+#: src/inc.c:1048
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "取得新郵件 (%d / %d) (%s / %s)"
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
msgid ""
"Execution of the junk filter command failed.\n"
"Please check the junk mail control setting."
msgstr ""
-#: src/inc.c:1375
+#: src/inc.c:1393
msgid "Connection failed."
msgstr "連線失敗。"
-#: src/inc.c:1381
+#: src/inc.c:1399
msgid "Error occurred while processing mail."
msgstr "處理郵件時發生錯誤。"
-#: src/inc.c:1386
+#: src/inc.c:1404
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -3075,40 +3075,40 @@ msgstr ""
"處理郵件時發生錯誤:\n"
"%s"
-#: src/inc.c:1392
+#: src/inc.c:1410
msgid "No disk space left."
msgstr "磁碟空間已滿。"
-#: src/inc.c:1397
+#: src/inc.c:1415
msgid "Can't write file."
msgstr "無法寫入檔案。"
-#: src/inc.c:1402
+#: src/inc.c:1420
msgid "Socket error."
msgstr "Socket 有錯誤"
#. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
#: src/send_message.c:994
msgid "Connection closed by the remote host."
msgstr "遠端主機關閉連線。"
-#: src/inc.c:1414
+#: src/inc.c:1432
msgid "Mailbox is locked."
msgstr "信箱已被鎖定,可能前一次擷取未完成。"
-#: src/inc.c:1418
+#: src/inc.c:1436
#, c-format
msgid ""
"Mailbox is locked:\n"
"%s"
msgstr "信箱已被鎖定:%s"
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
msgid "Authentication failed."
msgstr "認證失敗"
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
#, c-format
msgid ""
"Authentication failed:\n"
@@ -3117,15 +3117,15 @@ msgstr ""
"認證失敗:\n"
"%s"
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
msgid "Session timed out."
msgstr "作業逾時"
-#: src/inc.c:1475
+#: src/inc.c:1493
msgid "Incorporation cancelled\n"
msgstr "動作已取消\n"
-#: src/inc.c:1584
+#: src/inc.c:1602
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -3143,16 +3143,16 @@ msgstr "輸入密碼"
msgid "Protocol log"
msgstr "通訊協定紀錄"
-#: src/main.c:583
+#: src/main.c:598
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "用法:%s [選項]...\n"
-#: src/main.c:586
+#: src/main.c:601
msgid " --compose [address] open composition window"
msgstr " --compose [郵件地址] 直接開啟撰寫郵件視窗"
-#: src/main.c:587
+#: src/main.c:602
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -3161,68 +3161,68 @@ msgstr ""
" --attach 檔案1 [檔案2]...\n"
" 開啟撰寫郵件視窗,並將指定的檔案附加上去"
-#: src/main.c:590
+#: src/main.c:605
msgid " --receive receive new messages"
msgstr " --receive 直接接收新郵件"
-#: src/main.c:591
+#: src/main.c:606
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all 直接接收所有帳號的新郵件"
-#: src/main.c:592
+#: src/main.c:607
msgid " --send send all queued messages"
msgstr " --send 送出所有暫存資料夾中的郵件"
-#: src/main.c:593
+#: src/main.c:608
msgid " --status [folder]... show the total number of messages"
msgstr " --status [資料夾]... 顯示資料夾內總共有多少郵件"
-#: src/main.c:594
+#: src/main.c:609
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr " --status-full [資料夾]... 顯示每個資料夾中有多少郵件"
-#: src/main.c:596
+#: src/main.c:611
msgid " --open folderid/msgnum open message in new window"
msgstr ""
-#: src/main.c:597
+#: src/main.c:612
msgid ""
" --configdir dirname specify directory which stores configuration files"
msgstr ""
-#: src/main.c:599
+#: src/main.c:614
msgid " --ipcport portnum specify port for IPC remote commands"
msgstr ""
-#: src/main.c:601
+#: src/main.c:616
#, fuzzy
msgid " --exit exit Sylpheed"
msgstr " --debug 除錯模式"
-#: src/main.c:602
+#: src/main.c:617
msgid " --debug debug mode"
msgstr " --debug 除錯模式"
-#: src/main.c:603
+#: src/main.c:618
msgid " --help display this help and exit"
msgstr " --help 顯示本說明並離開"
-#: src/main.c:604
+#: src/main.c:619
msgid " --version output version information and exit"
msgstr " --version 顯示版本資訊"
-#: src/main.c:608
+#: src/main.c:623
#, c-format
msgid "Press any key..."
msgstr ""
-#: src/main.c:743
+#: src/main.c:758
msgid "Filename encoding"
msgstr "檔案名稱編碼"
-#: src/main.c:744
+#: src/main.c:759
msgid ""
"The locale encoding is not UTF-8, but the environmental variable "
"G_FILENAME_ENCODING is not set.\n"
@@ -3243,19 +3243,19 @@ msgstr ""
"\n"
"要繼續嗎?"
-#: src/main.c:827
+#: src/main.c:842
msgid "Composing message exists. Really quit?"
msgstr "有郵件正在編輯。確定要離開嗎?"
-#: src/main.c:838
+#: src/main.c:853
msgid "Queued messages"
msgstr "有未送出郵件"
-#: src/main.c:839
+#: src/main.c:854
msgid "Some unsent messages are queued. Exit now?"
msgstr "有些郵件正在暫存資料夾中尚未送出。確定要離開嗎?"
-#: src/main.c:964
+#: src/main.c:979
msgid ""
"GnuPG is not installed properly, or its version is too old.\n"
"OpenPGP support disabled."
@@ -3263,20 +3263,20 @@ msgstr ""
"GnuPG 並未安裝好,或版本過舊。\n"
"關閉 OpenPGP 支援項目。"
-#: src/main.c:1197
+#: src/main.c:1212
msgid "Loading plug-ins..."
msgstr ""
#. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
msgid "another Sylpheed is already running.\n"
msgstr "已經有 Sylpheed 程式正在執行中。\n"
-#: src/main.c:1680
+#: src/main.c:1695
msgid "Migration of configuration"
msgstr "設定資料轉移"
-#: src/main.c:1681
+#: src/main.c:1696
msgid ""
"The previous version of configuration found.\n"
"Do you want to migrate it?"
@@ -3948,7 +3948,7 @@ msgid "MainWindow: color allocation %d failed\n"
msgstr "主視窗:顏色 %d 配置失敗。\n"
#: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
msgid "done.\n"
msgstr "完成。\n"
@@ -6365,19 +6365,19 @@ msgstr "附加檔案"
#. S_COL_MIME
#: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
msgid "Subject"
msgstr "主旨"
#. S_COL_SUBJECT
#: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
msgid "From"
msgstr "來源"
#. S_COL_FROM
#: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
msgid "Date"
msgstr "日期"
@@ -6387,7 +6387,7 @@ msgid "Number"
msgstr "編號"
#. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
#, fuzzy
msgid "To"
msgstr "收件人"
@@ -6820,7 +6820,7 @@ msgstr "關於"
msgid "%s - POP3 Remote mailbox"
msgstr "移除信箱"
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
msgid "No."
msgstr "No."
@@ -7771,15 +7771,15 @@ msgstr "解除郵件串列中..."
msgid "Filtering (%d / %d)..."
msgstr "過濾中..."
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
msgid "filtering..."
msgstr "過濾中..."
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
msgid "Filtering..."
msgstr "過濾中..."
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
#, c-format
msgid "%d message(s) have been filtered."
msgstr "已過濾 %d 封郵件"