made 3.1.0beta6 release.

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

1 files changed, 113 insertions, 113 deletions

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"