aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-07-08 07:27:24 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-07-08 07:27:24 +0000
commita07b24d01ccce1cfa58e74782f8b5b05c5a7055d (patch)
tree154f9c6d11b22a587ea365677836f192b493e279
parent8f85197cc2c306abc3bceee155afddf34e59f643 (diff)
modified alert dialogs.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@408 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.ja7
-rw-r--r--po/bg.po268
-rw-r--r--po/cs.po268
-rw-r--r--po/da.po268
-rw-r--r--po/de.po268
-rw-r--r--po/el.po268
-rw-r--r--po/es.po268
-rw-r--r--po/et.po268
-rw-r--r--po/fr.po268
-rw-r--r--po/gl.po268
-rw-r--r--po/hr.po268
-rw-r--r--po/hu.po270
-rw-r--r--po/it.po270
-rw-r--r--po/ja.po252
-rw-r--r--po/ko.po268
-rw-r--r--po/lt.po270
-rw-r--r--po/nl.po268
-rw-r--r--po/pl.po270
-rw-r--r--po/pt_BR.po270
-rw-r--r--po/ro.po268
-rw-r--r--po/ru.po268
-rw-r--r--po/sk.po268
-rw-r--r--po/sl.po268
-rw-r--r--po/sr.po268
-rw-r--r--po/sv.po268
-rw-r--r--po/tr.po268
-rw-r--r--po/uk.po268
-rw-r--r--po/zh_CN.po270
-rw-r--r--po/zh_TW.Big5.po268
-rw-r--r--src/account.c6
-rw-r--r--src/alertpanel.c52
-rw-r--r--src/alertpanel.h19
-rw-r--r--src/compose.c29
-rw-r--r--src/folderview.c25
35 files changed, 4066 insertions, 3579 deletions
diff --git a/ChangeLog b/ChangeLog
index 50ff7728..2bf3f095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-07-08
+ * src/alertpanel.[ch]: alertpanel_full(): added more generic function.
+ * src/compose.c
+ src/account.c
+ src/folderview.c: modified some alert dialogs.
+
+2005-07-08
+
* src/addressbook.c
src/alertpanel.[ch]
src/summaryview.c: added G_ALERTCANCEL to AlertValue, and return it
diff --git a/ChangeLog.ja b/ChangeLog.ja
index b6c6d5f0..cf85d2b5 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,12 @@
2005-07-08
+ * src/alertpanel.[ch]: alertpanel_full(): より汎用的な関数を追加。
+ * src/compose.c
+ src/account.c
+ src/folderview.c: いくつかの警告ダイアログを修正。
+
+2005-07-08
+
* src/addressbook.c
src/alertpanel.[ch]
src/summaryview.c: G_ALERTCANCEL を AlertValue に追加し、キャンセル
diff --git a/po/bg.po b/po/bg.po
index 4aee58c3..b8d5fc82 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 0.9.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -97,10 +97,10 @@ msgstr ""
"于 从仂仍仂仆从舒 `G' 亰舒 舒亰亠舒于舒仆亠 仆舒 亳亰亠亞仍礌亠 仆舒 仂弍亠仆亳舒 仂 `Get All'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "仄亠"
@@ -135,18 +135,6 @@ msgstr "亠仂亰舒亞仍舒于亠仆"
msgid "Delete account"
msgstr "亰亳于舒仆亠 仆舒 舒从舒仆"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "舒"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+亠"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -246,7 +234,7 @@ msgstr "仂亠弍亳亠仍从亳 舒亞仄亠仆 仆舒 亟亠亶于亳亠仂"
msgid "Add Address to Book"
msgstr "仂弍舒于礌亠 仆舒 亟亠舒 从仄 仆亳亞舒舒"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "亟亠"
@@ -386,7 +374,7 @@ msgstr "/_亰亳于舒仆亠"
msgid "E-Mail address"
msgstr "E-Mail 舒亟亠"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "亟亠仆舒 从仆亳亞舒"
@@ -413,16 +401,16 @@ msgstr "仂弍舒于礌亠"
msgid "Lookup"
msgstr "弌仗舒于从舒"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "仂:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -597,23 +585,23 @@ msgstr "弍仍亳亠仆 舒亟亠"
msgid "Personal address"
msgstr "亳亠仆 舒亟亠"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "舒弍亠仍亠亢从舒"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "亠亟仗亠亢亟亠仆亳亠"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "亠从舒"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "弌亰亟舒于舒仆亠 仆舒 舒仍舒仄亠仆 亟亳舒仍仂亞...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "仂从舒亰于舒仆亠 仆舒 仂于舒 仂弍亠仆亳亠 仍亠亟于舒亳 仗"
@@ -648,7 +636,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "亳从仂亶"
@@ -1013,10 +1001,10 @@ msgstr "弌舒于礌亠 仆舒 仂弍亠仆亳亠%s"
msgid "Recipient is not specified."
msgstr "亠 亠 从舒亰舒仆 仗仂仍舒亠仍"
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "亰仗舒舒仆亠"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "丐亠仄舒"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1048,7 +1036,7 @@ msgstr "亠 仄仂亢亠 亟舒 亠 亰舒仗舒亰亳 仂弍亠仆亳亠仂 于 亳亰仂
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "亠 仄仂亢舒 亟舒 亠 仆舒仄亠亳 弍仂仆 舒仂亳亳舒仆 亳亰弍舒仆亳 `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "仆亠 仄仂亢亠 亟舒 亠 仄亠仆亳 于亳亟舒 仆舒 舒亶仍舒\n"
@@ -1057,13 +1045,19 @@ msgstr "仆亠 仄仂亢亠 亟舒 亠 仄亠仆亳 于亳亟舒 仆舒 舒亶仍舒\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"亠 仄仂亢亠 亟舒 亠 仗亠仂弍舒亰于舒 亳仄于仂仍仆仂仂 从仂亟亳舒仆亠 仆舒 仂弍亠仆亳亠仂 仂\n"
"%s 从仄 %s.\n"
"亰仗舒舒仆亠 舒从舒?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "亠从舒 仗亳 从仂仆于亠亳舒仆亠 仆舒 舒亟亠仆舒舒 从仆亳亞舒"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1072,146 +1066,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "仆亠 仄仂亢亠 亟舒 亠 亳亰亳亠 舒仂仂 仂弍亠仆亳亠\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "仆舒亠亢亟舒仆亠 仆舒 仂弍亠仆亳亠仂 仆舒 仂仗舒从舒舒...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "仆亠 仄仂亢亠 亟舒 亠 仆舒仄亠亳 仗舒仗从舒舒 亰舒 仂仗舒从舒\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "仆亠 仄仂亢亠 亟舒 亠 仆舒亠亟亳 仂弍亠仆亳亠仂 仆舒 仂仗舒从舒舒\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "亞亠仆亠亳舒仆仂 Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "弌亰亟舒于舒仆亠 仆舒 仗仂亰仂亠 亰舒 舒于礌亠...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr ":"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_仆仄亠仆亳/_亠亶于亳"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_弌仂弍亠仆亳亠/_亳仗亳舒仆亠"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME 亳仗"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "舒亰仄亠"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "亰仗舒舒仆亠"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "亰仗舒舒仆亠 仆舒 仂弍亠仆亳亠"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "亰仗舒舒仆亠 仗仂-从仆仂"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "仂舒于礌亠 于 仗舒仗从舒舒 亰舒 仂仗舒从舒 亳 亳亰仗舒舒仆亠 仗仂-从仆仂"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "丼亠仆仂于亳"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "舒仗舒亰于舒仆亠 于 仗舒仗从舒舒 亠仆仂于亳"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "仄从于舒仆亠"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "仄从于舒仆亠 仆舒 舒亶仍"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "亳从亠仗于舒仆亠"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "亳从亠仗于舒仆亠 仆舒 舒亶仍"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "弌亳亞仆舒舒"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "仄从于舒仆亠 仆舒 亳亞仆舒舒"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "亠亟舒从仂"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "亠亟舒从亳 于仆亠仆 亠亟舒从仂"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "弌于亳于舒仆亠仆 仆舒 亠亟仂于亠亠"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "弌于亳于舒仆亠 仆舒 于亳从亳 亟仍亞亳 亠亟仂于亠"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "亠于舒仍亳亟亠仆 MIME 亳仗"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "个舒亶仍 仆亠 亠于于舒 亳仍亳 亠 仗舒亰亠仆"
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "从亠仂舒亳"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "仂亟亳舒仆亠"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr ""
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "仄亠 仆舒 舒亶仍"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "仂仄舒仆亟仆亳 亠亟 亰舒 于仆亠仆 亠亟舒从仂 亠 仆亠于舒仍亳亟亠仆: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1222,72 +1225,70 @@ msgstr ""
"亠仍舒亠亠 仍亳 仗亳仆亟亳亠仍仆仂 仗亠从舒磦舒仆亠 仆舒 仗仂亠舒?\n"
"process group id: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "亠从舒亠仆 process group id: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "亠仄亠仆亠仆 舒亶仍: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "弌舒于礌亠: 于仂亟 仂 仆舒弍仍ミ莞夷火委 仗仂亠\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "亠 仄仂亢亠 亟舒 亠 舒亳舒 于仆亠仆 亠亟舒从仂\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "亠 仄仂亢亠 亟舒 亠 亰舒仗亳亠 于于 舒亶仍\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "丼亠亠仆亠 仆舒 pipe 仗仂于舒仍亠仆仂\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "亠 仄仂亢亠 亟舒 亠 仆舒亠亟亳 仂弍亠仆亳亠仂 仆舒 仂仗舒从舒舒."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "亰弍仂 仆舒 舒亶仍"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "亰弍仂 仆舒 舒亶仍"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "亰仂舒于礌亠 仆舒 仂弍亠仆亳亠"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "亰仗舒舒仆亠 仆舒 仂弍亠仆亳亠"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "弌仂弍亠仆亳亠仂 弍亠亠 仗仂仄亠仆亠仆仂. 亰仂舒于礌亠?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "亰仂舒于礌亠"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "仗亳 丼亠仆仂于亳"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "亠仍舒亠亠 仍亳 亟舒 仗亳仍仂亢亳亠 舒弍仍仂仆 `%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "亳仍舒亞舒仆亠 仆舒 舒弍仍仂仆"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "舒仄亠仆礌亠"
@@ -1622,23 +1623,23 @@ msgstr "仆亠仗亠仆仂 亰舒仗亳于舒仆亠 仆舒 仆舒仂亶从亳亠 于于
msgid "Select folder"
msgstr "亰弍仂 仆舒 仗舒仗从舒"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "仂亟亳"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "亰仗舒亠仆亳"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "仗舒从舒"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "仂亠"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "丼亠仆仂于亳"
@@ -1817,20 +1818,20 @@ msgstr ""
msgid "Delete folder"
msgstr "亰亳于舒仆亠 仆舒 仗舒仗从舒"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "舒仗从舒 `%s' 仆亠 仄仂亢亠 亟舒 亠 仗亠仄舒仆亠."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "亰亳于舒仆亠 仆舒 从仂亠仂"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "亠仍舒亠亠 仍亳 亳亰亳于舒仆亠 仆舒 从仂亠仂?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1839,34 +1840,34 @@ msgstr ""
"亠仍舒亠亠 仍亳 仗亠仄舒于舒仆亠 仆舒 仗仂亠仆从舒舒 从亳 `%s'?\n"
"(弌仂弍亠仆亳舒 亠 亳亰亳于舒 仂 亟亳从舒)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "亠仄舒于舒仆亠 仆舒 仗仂亠仆从舒 从亳"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "亠仍舒亠亠 仍亳 亳亰亳于舒仆亠 仆舒 IMAP4 舒从舒仆 `%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "亰亳于舒仆亠 仆舒 IMAP4 舒从舒仆"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "亠仍舒亠亠 仍亳 亳亰亳于舒仆亠 仆舒 仆仂于亳仆舒从舒 亞仗舒 `%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "亰亳于舒仆亠 仆舒 仆仂于亳仆舒从舒 亞仗舒"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "亠仍舒亠亠 仍亳 亳亰亳于舒仆亠 仆舒 仆仂于亳仆舒从亳 舒从舒仆 `%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "亰亳于舒仆亠 仆舒 仆仂于亳仆舒从亳 舒从舒仆"
@@ -1894,7 +1895,7 @@ msgstr "仄亠 仆舒 仆仂于亳仆舒从舒 亞仗舒"
msgid "Messages"
msgstr "弌仂弍亠仆亳"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "丐亳仗"
@@ -3275,7 +3276,7 @@ msgid "Send queued message(s)"
msgstr "亰仗舒舒仆亠 仆舒 仂弍亠仆亳舒 于 仂仗舒从舒舒"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "弌舒于礌亠"
@@ -3340,8 +3341,8 @@ msgstr "亠亟仗仂亳舒仆亳"
msgid "Common preferences"
msgstr "弍亳 仗亠亟仗仂亳舒仆亳"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "从舒仆"
@@ -3457,23 +3458,23 @@ msgstr "舒仄亳舒仆亠 仆舒 亠从:"
msgid "Case sensitive"
msgstr "丼于于亳亠仍仆仂 从仄 舒亰仄亠舒 仆舒 亳仄于仂仍亳亠"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "丐亠仆亠仂 亠 仗仂于舒仍亳"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "丐亠仆亳 仆亳亰 仆亠 弍亠亠 仆舒仄亠亠仆."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "仂亳亞仆舒仂 亠 仆舒舒仍仂仂 仆舒 仂弍亠仆亳亠仂; 仗仂亟仍亢亠仆亳亠 仂 从舒?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "仂亳亞仆舒 亠 从舒 仆舒 仂弍亠仆亳亠仂; 仗仂亟仍亢亠仆亳亠 仂 仆舒舒仍仂仂?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "丐亠仆亠仂 仗亳从仍ム亳"
@@ -4057,7 +4058,7 @@ msgstr "丕亟仂仂于亠磦舒仆亠 POP3 仗亠亟亳 亳亰仗舒舒仆亠"
msgid "Command output"
msgstr "亰仂亟 仆舒 从仂仄舒仆亟舒"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "于仂仄舒亳仆仂 舒仆仂于磦舒仆亠 仆舒 仍亠亟仆亳亠 舒亟亠亳"
@@ -5439,35 +5440,35 @@ msgstr "亠 亠 于于亠亟亠仆 从仂仄舒仆亟亠仆 亠亟."
msgid "Action not exist."
msgstr "%s: 舒亶仍 仆亠 亠于于舒\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "从亠仂舒亳 仆舒 仗舒仗从舒"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "仍舒于仆亳"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "仂仄舒仍仆舒"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "亠亰 仗仂从舒亰于舒仆亠 仆舒 [...] 亳仍亳 (...) 于 仆舒舒仍仂仂 仆舒 亠仄舒 于 亳亰于舒亟从舒舒"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "亰亳于舒仆亠 仆舒 [...] 亳仍亳 (...) 于 仆舒舒仍仂仂 仆舒 亠仄舒 仗亳 仂亞仂于仂"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "亳仍舒亞舒仆亠 从仄 仗仂亟仗舒仗从亳"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "亳亰仗仂仍亰于舒仆亠 亳 仗亳 仂亞仂于仂"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Reply-To:"
@@ -5949,7 +5950,7 @@ msgstr "于仂仄舒亳仆仂 舒仆仂于磦舒仆亠 仆舒 仍亠亟仆亳亠 舒
msgid "Body:"
msgstr "丐磿仂:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6055,7 +6056,7 @@ msgstr "仄舒 仂舒仆舒仍亳 仄舒从亠亳. 亠仍舒亠亠 仍亳 亟舒 亠 仂
msgid "Scanning folder (%s)..."
msgstr "弌从舒仆亳舒仆亠 仆舒 仗舒仗从舒 (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "丐亠仆亠 仂仆仂于仂"
@@ -6341,6 +6342,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "亰舒仗亳 于 %s 亠 仗仂于舒仍亳.\n"
+#~ msgid "Yes"
+#~ msgstr "舒"
+
+#~ msgid "+No"
+#~ msgstr "+亠"
+
+#~ msgid "Discard message"
+#~ msgstr "亰仂舒于礌亠 仆舒 仂弍亠仆亳亠"
+
+#~ msgid "Discard"
+#~ msgstr "亰仂舒于礌亠"
+
+#~ msgid "to Draft"
+#~ msgstr "仗亳 丼亠仆仂于亳"
+
#~ msgid "can't write headers\n"
#~ msgstr "亠 仄仂亢亠 亟舒 亠 亰舒仗亳舒 亠亟亳亠\n"
diff --git a/po/cs.po b/po/cs.po
index b0d07e88..83d82fdc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
"Last-Translator: Radek Vyb鱈ral <Radek.Vybiral@vsb.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -96,10 +96,10 @@ msgstr ""
"kontrolov叩n pi volb 'St叩hnout v邸e, za邸krtnte pol鱈ko ve sloupci 'G'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Jm辿no"
@@ -134,18 +134,6 @@ msgstr "Neoznaen箪"
msgid "Delete account"
msgstr "Smazat 炭et"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Ano"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Ne"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -245,7 +233,7 @@ msgstr "Argument u転ivatele pro akci"
msgid "Add Address to Book"
msgstr "Pidat adresu do datab叩ze"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adresa"
@@ -385,7 +373,7 @@ msgstr "/_Smazat"
msgid "E-Mail address"
msgstr "E-mail adresa"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Datab叩ze adres"
@@ -412,16 +400,16 @@ msgstr "Pidat"
msgid "Lookup"
msgstr "Hledat"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Komu:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Kopie:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Slep叩 kopie:"
@@ -594,23 +582,23 @@ msgstr "Spolen叩 adresa"
msgid "Personal address"
msgstr "Osobn鱈 adresa"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Pozn叩mka"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Varov叩n鱈"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Chyba"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Vytv叩鱈m dialog pro varov叩n鱈...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Zobrazovat p鱈邸t tuto zpr叩vu"
@@ -645,7 +633,7 @@ msgstr "Hnd叩"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "貼叩dn叩"
@@ -1010,10 +998,10 @@ msgstr "Psan鱈 zpr叩vy%s"
msgid "Recipient is not specified."
msgstr "Nen鱈 uveden p鱈jemce."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Odeslat"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Pedmt"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1045,7 +1033,7 @@ msgstr "Zpr叩vu nelze ulo転it do odeslan辿 po邸ty."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Nemohu naj鱈t 転叩dn箪 kl鱈 asociovan箪 s aktu叩ln vybran箪m id kl鱈e '%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "nelze zmnit m坦d souboru\n"
@@ -1054,13 +1042,19 @@ msgstr "nelze zmnit m坦d souboru\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Nelze pev辿st znakovou sadu zpr叩vy z\n"
"%s na %s.\n"
"Pesto poslat?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Chyba pi konverzi datab叩ze adres"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1069,146 +1063,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "nelze smazat star辿 zpr叩vy\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "zaazuji zpr叩vu...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "nelze naj鱈t slo転ku s frontou zpr叩v\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "Zpr叩vu nelze zaadit\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "vytv叩鱈m 鱈slo zpr叩vy: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Vytv叩鱈m okno pro psan鱈...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Od:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_N叩stroje/_Akce"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Zpr叩va/Za邸i_frovat"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME typ"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "D辿lka"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Odeslat"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Ode邸le zpr叩vu"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Poslat pozdji"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Zaad鱈 do v箪stupn鱈 fronty a ode邸le pozdji"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Koncept"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Ulo転鱈 koncept do slo転ky"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Vlo転it"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Vlo転鱈 soubor"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "P鱈loha"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Pipoj鱈 soubor"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Podpis"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Vlo転鱈 podpis"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "prava extern鱈m editorem"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Zarovn叩n鱈"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Zarovn叩n鱈 dlouh箪ch 叩dk哲"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Neplatn箪 MIME typ."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Soubor neexistuje nebo je pr叩zdn箪."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Vlastnosti"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "K坦dov叩n鱈"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Cesta k souboru"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "N叩zev souboru"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "patn箪 p鱈kaz v extern鱈m editoru: '%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1219,72 +1222,70 @@ msgstr ""
"M叩m peru邸it proces?\n"
"鱈slo procesu: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Peru邸en proces 鱈slo: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Doasn箪 soubor: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Psan鱈: vstup z extern鱈ho procesu\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Nelze spustit extern鱈 editor\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Nelze zapisovat do souboru\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Nelze 鱈st\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Zpr叩vu nelze zaadit."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Vybrat soubor"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Vybrat soubor"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Zru邸it zpr叩vu"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Ode邸le zpr叩vu"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Obsah zpr叩vy se zmnil. Chcete ji stornovat?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Stornovat"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "Ulo転it jako koncept"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Opravdu chcete pou転鱈t 邸ablonu '%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Pidat 邸ablonu"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Nahradit"
@@ -1620,23 +1621,23 @@ msgstr "Selh叩n鱈 pi z叩pisu konfigurace do souboru\n"
msgid "Select folder"
msgstr "Vybrat slo転ku"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Doruen叩 po邸ta"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Odeslan叩 po邸ta"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Fronta"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Ko邸"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Koncepty"
@@ -1816,20 +1817,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Smazat slo転ku "
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Nemohu odstranit slo転ku '%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Vypr叩zdnit ko邸"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Vypr叩zdnit v邸echny zpr叩vy v ko邸i?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1838,34 +1839,34 @@ msgstr ""
"Opravdu odebrat po邸tovn鱈 schr叩nku '%s'?\n"
"(Zpr叩vy NEBUDOU smaz叩ny z disku)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Odstranit po邸tovn鱈 schr叩nku"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Opravdu smazat IMAP4 炭et '%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Smazat IMAP4 炭et"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Opravdu chcete smazat diskusn鱈 skupinu '%s' ?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Smazat diskusn鱈 skupinu"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Opravdu smazat 炭et pro diskusn鱈 skupinu '%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Smazat 炭et pro diskuzn鱈 skupinu"
@@ -1893,7 +1894,7 @@ msgstr "N叩zev diskusn鱈 skupiny"
msgid "Messages"
msgstr "Zpr叩vy"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Typ"
@@ -3279,7 +3280,7 @@ msgid "Send queued message(s)"
msgstr "Ode邸le pozdr転enou zpr叩vu(y)"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Napsat"
@@ -3344,8 +3345,8 @@ msgstr "Nastaven鱈"
msgid "Common preferences"
msgstr "Spolen叩 nastaven鱈"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "et"
@@ -3461,23 +3462,23 @@ msgstr "Naj鱈t text:"
msgid "Case sensitive"
msgstr "Rozli邸ovat mal叩 a velk叩 p鱈smena"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Ne炭sp邸n辿 hled叩n鱈"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Hledan箪 etzec nebyl nalezen."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Dosa転en za叩tek zpr叩vy, pokraovat od konce?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Dosa転en konec zpr叩vy, pokraovat od za叩tku?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Hled叩n鱈 ukoneno"
@@ -4061,7 +4062,7 @@ msgstr "Autentizace s POP3 ped posl叩n鱈m"
msgid "Command output"
msgstr "V箪stup p鱈kazu"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automaticky nastavit n叩sleduj鱈c鱈 adresy"
@@ -5443,35 +5444,35 @@ msgstr "Nen鱈 nastavena p鱈kazov叩 叩dka."
msgid "Action not exist."
msgstr "%s: soubor neexistuje\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Vlastnosti slo転ky"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Obecn辿"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Norm叩ln鱈"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Nezobrazovat v pehledu na za叩tku pedmtu [...] nebo (...)"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Pi odpovdi smazat ze za叩tku pedmtu [...] nebo (...)"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Zahrnout podslo転ky"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "pou転鱈t tak辿 pi odpovdi"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Odpovdt komu:"
@@ -5954,7 +5955,7 @@ msgstr "Automaticky nastavit n叩sleduj鱈c鱈 adresy"
msgid "Body:"
msgstr "Tlo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6060,7 +6061,7 @@ msgstr "Zbyly njak辿 oznaen辿. Zpracovat je?"
msgid "Scanning folder (%s)..."
msgstr "Prohled叩v叩m slo転ku (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Hledat znova"
@@ -6348,6 +6349,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "Ne炭sp邸n箪 z叩pis do %s.\n"
+#~ msgid "Yes"
+#~ msgstr "Ano"
+
+#~ msgid "+No"
+#~ msgstr "+Ne"
+
+#~ msgid "Discard message"
+#~ msgstr "Zru邸it zpr叩vu"
+
+#~ msgid "Discard"
+#~ msgstr "Stornovat"
+
+#~ msgid "to Draft"
+#~ msgstr "Ulo転it jako koncept"
+
#~ msgid "can't write headers\n"
#~ msgstr "nelze zapsat z叩hlav鱈\n"
diff --git a/po/da.po b/po/da.po
index b1a55992..55538b63 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2003-07-29 09:05+0200\n"
"Last-Translator: Andreas Hinz <news3@acci.dk>\n"
"Language-Team: \n"
@@ -95,10 +95,10 @@ msgstr ""
"`G'-kolonnen, for at aktivere hentning via `hent alle'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Navn"
@@ -133,18 +133,6 @@ msgstr "Uden titel"
msgid "Delete account"
msgstr "Slet konto"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Ja"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nej"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -244,7 +232,7 @@ msgstr "Handlingens bruger parameter"
msgid "Add Address to Book"
msgstr "Tilf淡j adresse i adressebog"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adresse"
@@ -384,7 +372,7 @@ msgstr "/_Slet"
msgid "E-Mail address"
msgstr "E-post adresse"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adressebog"
@@ -411,16 +399,16 @@ msgstr "Tilf淡j"
msgid "Lookup"
msgstr "Overblik"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Til:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -589,23 +577,23 @@ msgstr "Normale adresser"
msgid "Personal address"
msgstr "Personlige adresser"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Note"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Advarsel"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Fejl"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Opretter alarm panel dialog...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Vis denne meddelelse igen"
@@ -640,7 +628,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Ingen"
@@ -1005,10 +993,10 @@ msgstr "Ny meddelelse%s"
msgid "Recipient is not specified."
msgstr "Mangler modtager"
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Send"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Emne"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1040,7 +1028,7 @@ msgstr "Kan ikke gemme meddelelse i Sendt"
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Kunne ikke funde n淡gle til den valgte n淡gle id `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "kan ikke 脱ndre fil mode\n"
@@ -1049,13 +1037,19 @@ msgstr "kan ikke 脱ndre fil mode\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Kan ikke konvertere tegns脱t i meddelelse fra\n"
"%s til %s.\n"
"Send den alligevel?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Adressebog konverterings fejl"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1064,146 +1058,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "kan ikke slette gammel meddelelse\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "meddelelse i k淡...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "kan ikke v脱lge mappe %s\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "meddelelse kan ikke l脱gges i k淡\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "genereret meddelelses ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Opretter instastnings vindue...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Fra:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Funktioner/_Handlinger"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Meddelelse/_Kryptere"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME type"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "St淡rrelse"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Send"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Sende meddelelse"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Send senere"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "L脱g i k淡 og send senere"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Kladde"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Gem i Kladde"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Ind脱st"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Ins脱t fil"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Vedh脱ft"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Vedh脱ft fil"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Underskrift"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Inds脱t underskrift"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Redig辿r med ekstern Editor"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Linie deling"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "/_Redig辿r/Formater _alle lange linier"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Ugyldig MIME type"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Fil eksisterer ikke eller er tom."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Egenskaber"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Tegns脱t kodning"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Sti"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Fil navn"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1214,72 +1217,70 @@ msgstr ""
"Afbryde?\n"
"ID: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Afbrudt proces gruppe ID: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Midlertidig fil: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Instast: fra monitor process\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Kunne ikke starte ekstern editor\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Kunne ikke gemme fil\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Fejl i l脱sning fra Pipe\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Meddelelse kan ikke l脱gges i k淡."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "V脱lg fil"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "V脱lg fil"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Slet meddelelse"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Sende meddelelse"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Denne meddelelse er 脱ndret. Slet?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Slet"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "til Kladde"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Vil du benytte skabelon `%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Benyt skabelon"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Erstat"
@@ -1614,23 +1615,23 @@ msgstr "kunne ikke gemme konfiguration til fil\n"
msgid "Select folder"
msgstr "V脱lg mappe"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Indbakke"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Sendt"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "K淡"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Slettet"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Kladde"
@@ -1810,20 +1811,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Slet mappe"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Kan ikke slette mappe `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "T淡m Slettet"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Slet alle meddelelser i Slettet?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1832,34 +1833,34 @@ msgstr ""
"Virklig slette `%s'?\n"
"(Meddelelser bliver ikke flernet fra disken)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Slet mappe"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Virklig slette IMAP4 konto `%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Slet IMAP4 konto"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Virklig slette nyhedsgruppe `%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Slet nyhedsgruppe"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Virklig slette nyheds konto `%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Slet nyheds konto"
@@ -1887,7 +1888,7 @@ msgstr "Nyhedsgruppe navn"
msgid "Messages"
msgstr "Meddelelser"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Type"
@@ -3274,7 +3275,7 @@ msgid "Send queued message(s)"
msgstr "Sender meddelelse(r) i k淡"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Opret"
@@ -3339,8 +3340,8 @@ msgstr "Ops脱t"
msgid "Common preferences"
msgstr "Generelt ops脱t"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Konto"
@@ -3458,23 +3459,23 @@ msgstr "S淡g tekst:"
msgid "Case sensitive"
msgstr "Stor / sm奪 forskel"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "S淡gning fejlede"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Den s淡gte tekst blev ikke fundet."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Begyndelse af meddelelse n奪et; forts脱t fra slutning?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Slutnigen af meddelelse n奪et; forts脱t fra starten?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "S淡gning afsluttet"
@@ -4058,7 +4059,7 @@ msgstr "Godkend med POP3 f淡r afsendelse"
msgid "Command output"
msgstr "Kommando tekst"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Udfyld automatisk f淡lgende adresser"
@@ -5438,35 +5439,35 @@ msgstr "Kommando linie ikke opsat."
msgid "Action not exist."
msgstr "%s: fil findes ikke\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Mappe egenskaber"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Generel"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Vis ikke [...] eller (...) i starten af Emne linien i oversigten"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Slet [...] og (...) i starten af Emne i besvarelser"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Benyt til undermapper"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "benyt ogs奪 ved svar"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Svar til:"
@@ -5951,7 +5952,7 @@ msgstr "Udfyld automatisk f淡lgende adresser"
msgid "Body:"
msgstr "Meddelelse:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6057,7 +6058,7 @@ msgstr "Nogle mark辿ringer er tilbage. Bearbejde dem?"
msgid "Scanning folder (%s)..."
msgstr "S淡ger mappe (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "S淡g igen"
@@ -6347,6 +6348,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "fejl ved skrivning til %s.\n"
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "+No"
+#~ msgstr "+Nej"
+
+#~ msgid "Discard message"
+#~ msgstr "Slet meddelelse"
+
+#~ msgid "Discard"
+#~ msgstr "Slet"
+
+#~ msgid "to Draft"
+#~ msgstr "til Kladde"
+
#~ msgid "can't write headers\n"
#~ msgstr "kan ikke skrive hoved\n"
diff --git a/po/de.po b/po/de.po
index beb1c5cb..f5741605 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2005-02-08 22:49+0100\n"
"Last-Translator: Manfred Usselmann <usselmann.m@icg-online.de>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
@@ -100,10 +100,10 @@ msgstr ""
"in der `G'-Spalte, um den Nachrichten-Empfang bei `Hole alle' einzuschalten."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Name"
@@ -138,18 +138,6 @@ msgstr "Unbenannt"
msgid "Delete account"
msgstr "Account l旦schen"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Ja"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nein"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -249,7 +237,7 @@ msgstr "Aktionen Benutzer-Parameter"
msgid "Add Address to Book"
msgstr "Adresse in Adressbuch einf端gen"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adresse"
@@ -389,7 +377,7 @@ msgstr "/_L旦schen"
msgid "E-Mail address"
msgstr "E-Mail Adresse"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adressbuch"
@@ -416,16 +404,16 @@ msgstr "Hinzuf端gen"
msgid "Lookup"
msgstr "Vorschau"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "An:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -601,23 +589,23 @@ msgstr "Allgemeine Adressen"
msgid "Personal address"
msgstr "Pers旦nliche Adressen"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Notiz"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Warnung"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Fehler"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Erstelle Alarmpanel-Dialog...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Zeige diese Nachricht das n辰chste mal an"
@@ -652,7 +640,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Keine"
@@ -1009,10 +997,10 @@ msgstr "Verfasse Nachricht%s"
msgid "Recipient is not specified."
msgstr "Empf辰nger nicht angegeben"
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Senden"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Betreff"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1044,7 +1032,7 @@ msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Kein Schl端ssel f端r die aktuelle gew辰hlte Schl端ssel-ID vorhanden `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "kann Dateimodus nicht 辰ndern\n"
@@ -1053,13 +1041,19 @@ msgstr "kann Dateimodus nicht 辰ndern\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Kann den Zeichensatz der Nachricht nicht konvertieren\n"
"(von %s zu %s).\n"
"Trotzdem senden?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Adressbuch-Konvertierungs-Fehler"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1068,146 +1062,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "Kann die alte Nachricht nicht entfernen\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "Nachricht einreihen...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "kann Queue-Ablage nicht finden\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "Nachricht kann nicht eingereiht werden\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "erzeugte Nachrichten-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Erstelle Verfassenfenster...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Von:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Werkzeug/PGP _Unterschreiben"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Werkzeug/PGP _Verschl端sseln"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME-Typ"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Gr旦e"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Senden"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Sende Nachricht"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Sp辰ter senden"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "In Queue-Ablage und sp辰ter senden"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Entwurf"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Speichern in Entwurfablage"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Einf端gen"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Datei einf端gen"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Anh辰ngen"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Datei anh辰ngen"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Unterschrift"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Unterschrift einf端gen"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Bearbeiten mit externem Editor"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Zeilenumbruch"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Alle langen Zeilen umbrechen"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Ung端ltiger MIME Typ"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Datei existiert nicht oder ist leer."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Eigenschaften"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Zeichensatzkodierung"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Pfad"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Dateiname"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Kommandozeile f端r den externen Editor ist ung端ltig: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1218,72 +1221,70 @@ msgstr ""
"Prozess terminieren?\n"
"Prozessgruppen ID: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Gruppen ID: %d des terminierten Prozesses"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Tempor辰re Datei: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Verfassen: Eingabe vom berwachungsprozess\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Kann externen Editor nicht ausf端hren\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Kann nicht in Datei schreiben\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Lesen von Pipe fehlgeschlagen\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Nachricht kann nicht eingereiht werden."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "W辰hle Datei"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "W辰hle Datei"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Nachricht verwerfen"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Sende Nachricht"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Diese Nachricht wurde ge辰ndert. Verwerfen?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Verwerfen"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "zum Entwurf"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Wollen Sie die Schablone `%s' 端bernehmen ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Schablone 端bernehmen"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Ersetzen"
@@ -1618,23 +1619,23 @@ msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
msgid "Select folder"
msgstr "W辰hle Ablage"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Posteingang"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Gesendet"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Warteschlange"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Papierkorb"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Entw端rfe"
@@ -1811,20 +1812,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Ablage l旦schen"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Kann Ablage `%s' nicht entfernen."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Leere Papierkorb"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "L旦sche alle Nachrichten im Papierkorb?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1833,34 +1834,34 @@ msgstr ""
"Mailbox `%s' entfernen?\n"
"(Die Nachrichten werden NICHT von der Platte gel旦scht)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Entferne Mailbox"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "IMAP4-Account `%s' wirklich l旦schen?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "IMAP4-Account l旦schen"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Newsgroup `%s' wirklich l旦schen?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Newsgroup l旦schen"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "News-Account `%s' wirklich l旦schen?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "News-Account l旦schen"
@@ -1888,7 +1889,7 @@ msgstr "Newsgroup-Namen"
msgid "Messages"
msgstr "Nachrichten"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Typ"
@@ -3246,7 +3247,7 @@ msgid "Send queued message(s)"
msgstr "Senden wartender Nachrichten"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Verfassen"
@@ -3311,8 +3312,8 @@ msgstr "Einstellungen"
msgid "Common preferences"
msgstr "Allgemeine Einstellungen"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Account"
@@ -3430,23 +3431,23 @@ msgstr "Text suchen:"
msgid "Case sensitive"
msgstr "Gro-/Kleinschreibung"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Suche fehlgeschlagen"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Gesuchte Zeichenkette nicht gefunden."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Anfang der Liste erreicht; weiter vom Ende?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Ende der Liste erreicht; weiter vom Anfang?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Suche beendet"
@@ -4028,7 +4029,7 @@ msgstr "Beglaubige mit POP3 vor dem Senden"
msgid "Command output"
msgstr "Befehlsausgabe"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Setze folgende Adressen automatisch"
@@ -5383,37 +5384,37 @@ msgstr "Die Bedingung existiert nicht."
msgid "Action not exist."
msgstr "Die Aktion existiert nicht."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Ablage-Eigenschaften"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Allgemein"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
"[...] oder (...) am Anfang des Betreffes der Ablageninhaltsansicht nicht "
"zeigen"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "[...] oder (...) am Anfang des Betreffes der Antwort l旦schen"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Auf Unterablagen anwenden"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "auch bei Antwort benutzen"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Antwort an:"
@@ -5911,7 +5912,7 @@ msgstr "Wenn alle der folgenden Bedingungen zutreffen"
msgid "Body:"
msgstr "Nachricht:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6017,7 +6018,7 @@ msgstr "Einige Markierungen sind 端brig. Verarbeiten?"
msgid "Scanning folder (%s)..."
msgstr "Durchsuche Ablage (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Weitersuchen"
@@ -6305,6 +6306,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "Schreiben in %s fehlgeschlagen.\n"
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "+No"
+#~ msgstr "+Nein"
+
+#~ msgid "Discard message"
+#~ msgstr "Nachricht verwerfen"
+
+#~ msgid "Discard"
+#~ msgstr "Verwerfen"
+
+#~ msgid "to Draft"
+#~ msgstr "zum Entwurf"
+
#~ msgid "can't write headers\n"
#~ msgstr "kann Kopfzeilen nicht schreiben\n"
diff --git a/po/el.po b/po/el.po
index dc0f2113..306cfa1a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2001-10-08\n"
"Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -98,10 +98,10 @@ msgid ""
msgstr ""
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "僚凌亮留"
@@ -136,18 +136,6 @@ msgstr "律溜 溜了凌"
msgid "Delete account"
msgstr "旅留粒留流 了凌粒留旅留亮凌"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "留旅"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+旅"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -242,7 +230,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "凌慮流虜侶 隆旅竜慮僚侶 凌 硫旅硫了溜凌"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "旅竜慮僚侶"
@@ -386,7 +374,7 @@ msgstr "/旅留粒留流"
msgid "E-Mail address"
msgstr "旅竜慮僚侶 e-mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "留略了凌粒凌 隆旅竜慮僚竜僚"
@@ -413,16 +401,16 @@ msgstr "凌慮流虜侶"
msgid "Lookup"
msgstr "僚留龍流侶侶"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "凌:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "凌旅僚凌凌溜侶侶:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr ""
@@ -592,23 +580,23 @@ msgstr "凌旅僚劉 隆旅竜慮僚竜旅"
msgid "Personal address"
msgstr "凌旅虜劉 隆旅竜慮僚竜旅"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "裡侶亮竜溜侶"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "凌竜旅隆凌凌溜侶侶"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "裡略了亮留"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "侶亮旅凌粒 凌 隆旅略了凌粒凌 alert panel...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "留 竜亮留僚旅竜溜 留 凌 亮流僚亮留 侶僚 竜亮竜僚侶 凌略"
@@ -643,7 +631,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "里劉了凌"
@@ -1021,10 +1009,10 @@ msgstr "裡僚慮竜侶 亮侶僚亮留凌%s"
msgid "Recipient is not specified."
msgstr " 留留了流侶 隆竜僚 劉竜旅 凌旅竜溜."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "凌凌了流"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "劉亮留"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1056,7 +1044,7 @@ msgstr "竜僚 亮凌 僚留 留凌慮侶虜竜 凌 亮流僚亮留 留 竜
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "隆竜僚 亮凌 僚留 留了了略両 凌 mode 凌 留竜溜凌\n"
@@ -1065,10 +1053,16 @@ msgstr "隆竜僚 亮凌 僚留 留了了略両 凌 mode 凌 留竜溜凌\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr "竜僚 亮凌 僚留 留了了略両 凌 虜隆旅虜凌僚凌了凌 凌 亮侶僚亮留凌."
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "裡略了亮留 亮竜留凌流 硫旅硫了溜凌 隆旅竜慮僚竜僚"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1077,153 +1071,162 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "隆竜僚 亮凌 僚留 留留旅劉 凌 留了旅 亮流僚亮留\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "硫略龍 凌 亮流僚亮留 侶僚 凌略...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
#, fuzzy
msgid "can't find queue folder\n"
msgstr "隆竜僚 亮凌 僚留 竜旅了劉両 凌僚 虜留略了凌粒凌: %s\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "隆竜僚 亮凌 僚留 硫略了 凌 亮流僚亮留 侶僚 凌略\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "generated Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "侶亮旅凌粒 凌 留略慮凌 僚慮竜侶...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr ":"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/虜劉了竜侶"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/流僚亮留/凌粒略侶侶"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "凌 MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "劉粒竜慮凌"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "凌凌了流"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "凌凌了流 亮侶僚亮留凌"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr ""
"凌凌了流\n"
"留粒竜留"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "里凌凌慮劉侶侶 凌僚 虜留略了凌粒凌 凌略 虜留旅 留凌凌了流 留粒竜留"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "竜旅留"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "凌慮流虜竜侶 凌僚 虜留略了凌粒凌 凌竜溜僚"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "旅留粒粒流"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "旅留粒粒流 留竜溜凌"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "凌略侶侶"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "凌略侶侶 留竜溜凌"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Y凌粒留流"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "旅留粒粒流 凌粒留流"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "裡僚慮劉侶"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "竜両竜粒留溜留 亮竜 竜両竜旅虜 粒留亮亮留"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr ""
"里了旅両侶\n"
"粒留亮亮流"
-#: src/compose.c:4429
+#: src/compose.c:4435
#, fuzzy
msgid "Wrap all long lines"
msgstr "僚留隆溜了侶 粒留亮亮ホ"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "侶 劉粒虜凌 凌 MIME"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "里凌 留竜溜凌 隆竜僚 略竜旅, 流 竜溜僚留旅 略隆竜旅凌."
-#: src/compose.c:4894
+#: src/compose.c:4900
#, fuzzy
msgid "Properties"
msgstr "隆旅侶竜"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "隆旅虜凌凌溜侶侶"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "旅略隆凌亮凌"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "僚凌亮留 留竜溜凌"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr " 竜僚凌了流 粒旅留 凌 竜両竜旅虜 粒留亮亮留 隆竜僚 竜溜僚留旅 劉粒虜侶: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1234,73 +1237,71 @@ msgstr ""
"留 竜旅硫略了了 竜亮留旅亮 侶 隆旅竜粒留溜留;\n"
"process group id: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "里竜亮留溜侶虜竜 process group id: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "凌旅僚 留竜溜凌: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "裡僚慮竜侶: 竜旅留粒粒流 留 留留虜凌了凌慮凌亮竜僚侶 隆旅竜粒留溜留\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "竜僚 亮竜留 僚留 虜留了劉 凌 竜両竜旅虜 粒留亮亮留 竜竜両竜粒留溜留\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "竜僚 亮竜留 僚留 粒略 凌 留竜溜凌\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "凌溜留 留僚略粒僚侶 留 凌 pipe\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "竜僚 亮凌 僚留 硫略了 侶僚 凌略 凌 亮流僚亮留."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "旅了凌粒流 留竜溜凌"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "旅了凌粒流 留竜溜凌"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "旅侶 亮侶僚亮留凌"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "凌凌了流 亮侶僚亮留凌"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr " 凌 亮流僚亮留 劉竜旅 凌凌凌旅侶慮竜溜, 僚留 留凌旅慮竜溜;"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "旅侶"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "留 竜旅留"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, fuzzy, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "劉了竜竜 略粒亮留旅 僚留 隆旅留粒留竜溜 留流 侶 虜竜留了溜隆留;"
-#: src/compose.c:5716
+#: src/compose.c:5725
#, fuzzy
msgid "Apply template"
msgstr "旅留粒留流 亮侶僚亮留凌"
-#: src/compose.c:5717
+#: src/compose.c:5726
#, fuzzy
msgid "Replace"
msgstr "略僚侶侶"
@@ -1644,24 +1645,24 @@ msgstr "留劉留 僚留 粒略 旅 慮亮溜竜旅 凌 留竜
msgid "Select folder"
msgstr "旅了凌粒流 虜留留了粒凌"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "旅竜亮竜僚留"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
#, fuzzy
msgid "Sent"
msgstr "凌凌了流"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "略"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "旅留粒留亮亮劉僚留"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
#, fuzzy
msgid "Drafts"
msgstr "竜旅留"
@@ -1849,20 +1850,20 @@ msgstr ""
msgid "Delete folder"
msgstr "旅留粒留流 虜留留了粒凌"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "竜僚 亮凌 僚留 隆旅留粒略 凌僚 虜留略了凌粒凌 `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "隆竜旅留亮留 隆旅留粒留亮亮劉僚僚"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "留 留隆竜旅略 了留 留 隆旅留粒留亮亮劉僚留 亮侶僚亮留留"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, fuzzy, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1871,35 +1872,35 @@ msgstr ""
"裡溜粒凌留 僚留 隆旅留粒留竜溜 凌 mailbox `%s' ;\n"
"(里留 亮侶僚亮留留 硫流僚凌僚留旅 留 凌僚 隆溜虜凌)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
#, fuzzy
msgid "Remove mailbox"
msgstr "/旅留粒留流 mailbox"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "裡溜粒凌留 僚留 隆旅留粒留竜溜 凌 IMAP4 了凌粒留旅留亮 `%s';"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "旅留粒留流 了凌粒留旅留亮凌 IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "裡溜粒凌留 僚留 隆旅留粒留竜溜 凌 newsgroup `%s';"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "旅留粒留流 newsgroup"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "裡溜粒凌留 僚留 隆旅留粒留竜溜 凌 了凌粒留旅留亮 news `%s';"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "旅留粒留流 了凌粒留旅留亮凌 news"
@@ -1931,7 +1932,7 @@ msgstr "Newsgroups:"
msgid "Messages"
msgstr "流僚亮留"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
#, fuzzy
msgid "Type"
msgstr "里凌 MIME"
@@ -3405,7 +3406,7 @@ msgid "Send queued message(s)"
msgstr "凌凌了流 了僚 僚 亮侶僚亮略僚 留 侶僚 凌略"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "裡僚慮竜侶"
@@ -3473,8 +3474,8 @@ msgstr "旅了凌粒劉"
msgid "Common preferences"
msgstr "凌旅僚劉 旅了凌粒劉"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "凌粒/亮"
@@ -3591,25 +3592,25 @@ msgstr ""
msgid "Case sensitive"
msgstr "旅留旅亮 竜龍ホ/虜竜留了留溜僚"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr " 留僚留龍流侶侶 留劉竜"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "里凌 虜竜溜亮竜僚凌 留僚留龍流侶侶 隆竜僚 硫劉慮侶虜竜."
-#: src/message_search.c:210
+#: src/message_search.c:211
#, fuzzy
msgid "Beginning of message reached; continue from end?"
msgstr "留留 侶僚 留流 侶 了溜留. 留 僚竜溜 留 凌 劉了凌;"
-#: src/message_search.c:213
+#: src/message_search.c:214
#, fuzzy
msgid "End of message reached; continue from beginning?"
msgstr "留留 凌 劉了凌 侶 了溜留. 留 僚竜溜 留 侶僚 留流;"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr " 留僚留龍流侶侶 竜了竜溜竜"
@@ -4205,7 +4206,7 @@ msgstr "旅凌凌溜侶侶 亮竜 POP3 旅僚 侶僚 留凌凌了流"
msgid "Command output"
msgstr "僚凌了流"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
#, fuzzy
msgid "Automatically set the following addresses"
msgstr "亮留凌 凌旅亮 留ホ 僚 隆旅竜慮僚竜僚"
@@ -5579,36 +5580,36 @@ msgstr "里凌 僚凌亮留 侶 虜竜留了溜隆留 隆竜僚 劉竜旅 凌旅竜溜
msgid "Action not exist."
msgstr "%s: 凌 留竜溜凌 隆竜僚 略竜旅\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
#, fuzzy
msgid "Folder properties"
msgstr "隆旅侶竜"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr ""
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr ""
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr ""
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr ""
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
#, fuzzy
msgid "Reply-To:"
msgstr "略僚侶侶 竜"
@@ -6108,7 +6109,7 @@ msgstr "亮留凌 凌旅亮 留ホ 僚 隆旅竜慮僚竜
msgid "Body:"
msgstr ""
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6220,7 +6221,7 @@ msgstr "竜旅虜劉 侶亮略僚竜旅 劉凌僚 留凌亮竜溜僚竜旅. 留 竜
msgid "Scanning folder (%s)..."
msgstr "裡略侶 虜留留了粒凌 (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
#, fuzzy
msgid "Search again"
msgstr " 留僚留龍流侶侶 留劉竜"
@@ -6514,6 +6515,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "留劉竜 凌 粒略旅亮凌 凌 %s.\n"
+#~ msgid "Yes"
+#~ msgstr "留旅"
+
+#~ msgid "+No"
+#~ msgstr "+旅"
+
+#~ msgid "Discard message"
+#~ msgstr "旅侶 亮侶僚亮留凌"
+
+#~ msgid "Discard"
+#~ msgstr "旅侶"
+
+#~ msgid "to Draft"
+#~ msgstr "留 竜旅留"
+
#~ msgid "can't write headers\n"
#~ msgstr "隆竜僚 亮凌 僚留 粒略 侶僚 虜竜留了溜隆留\n"
diff --git a/po/es.po b/po/es.po
index bc5c04cf..4c3364ff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2004-12-21 11:18+0100\n"
"Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
"Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
@@ -97,10 +97,10 @@ msgstr ""
"en la columna `G' para habilitar la descarga mediante `Traer todo'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nombre"
@@ -135,18 +135,6 @@ msgstr "Sin t鱈tulo"
msgid "Delete account"
msgstr "Borrar cuenta"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Si"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+No"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -246,7 +234,7 @@ msgstr "Par叩metro de usuario de la acci坦n"
msgid "Add Address to Book"
msgstr "A単adir direcci坦n a la agenda"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Direcci坦n"
@@ -386,7 +374,7 @@ msgstr "/_Borrar"
msgid "E-Mail address"
msgstr "Direcci坦n e-mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Agenda de direcciones"
@@ -413,16 +401,16 @@ msgstr "A単adir"
msgid "Lookup"
msgstr "Buscar"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Para:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -597,23 +585,23 @@ msgstr "Direcci坦n com炭n"
msgid "Personal address"
msgstr "Direcci坦n personal"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Notificaci坦n"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Error"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Creando el di叩logo de alerta...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Mostrar este mensaje de nuevo"
@@ -648,7 +636,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Ninguno"
@@ -1005,10 +993,10 @@ msgstr "Componer mensaje%s"
msgid "Recipient is not specified."
msgstr "No se especific坦 el destinatario."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Enviar"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Asunto"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1042,7 +1030,7 @@ msgstr ""
"No se encontr坦 ninguna clave asociada al ID-clave seleccionado actualmente `%"
"s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "no se pueden cambiar los permisos de archivo\n"
@@ -1051,13 +1039,19 @@ msgstr "no se pueden cambiar los permisos de archivo\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"No puedo convertir la codificaci坦n de caracteres del mensaje\n"
"de %s a %s.\n"
"多Enviarlo de todas formas?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Error en la conversi坦n de la agenda"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1066,146 +1060,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "no se puede eliminar el mensaje antiguo\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "poniendo en la cola...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "no puedo encontrar la carpeta de cola\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "El mensaje no se puede poner en la cola\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "Message-ID generado: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Creando ventana de composici坦n...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Desde:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Herramientas/Fir_mar con PGP"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Mensaje/_Encriptar con PGP"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "Tipo MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Tama単o"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Enviar"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Enviar mensaje"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Enviar despu辿s"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Poner en la cola y enviar despu辿s"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Borrador"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Guardar como borrador"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Insertar"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Insertar fichero"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Adjuntar"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Adjuntar fichero"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Firma"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Insertar firma"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Editar con un editor externo"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Recortar"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Cortar todas las l鱈neas largas"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Tipo MIME inv叩lido."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "El fichero no existe o est叩 vac鱈o."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Propiedades"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Codificaci坦n"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Ruta"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Nombre de fichero"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "La orden del editor externo es inv叩lida: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1216,72 +1219,70 @@ msgstr ""
"多Desea terminar el proceso?\n"
"Id. de grupo de proceso: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Terminado grupo de proceso id.: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Fichero temporal: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Componer: entrada desde proceso monitor\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "No se pudo ejecutar el editor externo\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "No se pudo escribir en el fichero\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Fallo leyendo tuber鱈a\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "El mensaje no se puede poner en la cola."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Seleccionar fichero"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Seleccionar fichero"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Descartar mensaje"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Enviar mensaje"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Este mensaje se ha modificado. 多Desea descartarlo?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Descartar"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "a Borradores"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "多Quiere aplicar la plantilla `%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Aplicar plantilla"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Reemplazar"
@@ -1617,23 +1618,23 @@ msgstr "fallo escribiendo la configuraci坦n a fichero\n"
msgid "Select folder"
msgstr "Seleccionar carpeta"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Entrada"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Enviado"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Cola"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Papelera"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Borradores"
@@ -1810,20 +1811,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Borrar carpeta"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "No se puede eliminar la carpeta `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Vaciar papelera"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "多Vaciar todos los mensajes de la papelera?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1832,34 +1833,34 @@ msgstr ""
"多Realmente desea eliminar el buz坦n `%s' ?\n"
"(Los mensajes NO se borrar叩n del disco)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Eliminar mailbox"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "多Eliminar realmente la cuenta IMAP4 `%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Borrar cuenta IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "多Borrar el grupo de noticias `%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Borrar grupo de noticias"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "多Borrar la cuenta de noticias `%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Borrar cuenta de noticias"
@@ -1887,7 +1888,7 @@ msgstr "Nombre de grupo"
msgid "Messages"
msgstr "Mensajes"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tipo"
@@ -3244,7 +3245,7 @@ msgid "Send queued message(s)"
msgstr "Enviar mensaje(s) en la cola"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Componer"
@@ -3309,8 +3310,8 @@ msgstr "Preferencias"
msgid "Common preferences"
msgstr "Preferencias comunes"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Cuenta"
@@ -3428,23 +3429,23 @@ msgstr "Buscar texto:"
msgid "Case sensitive"
msgstr "May炭s./min炭s."
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "B炭squeda fallida"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Cadena no encontrada."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Se lleg坦 al principio del mensaje. 多Seguir desde el final?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Se lleg坦 al final del mensaje. 多Seguir desde el principio?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "B炭squeda concluida"
@@ -4026,7 +4027,7 @@ msgstr "Autentificaci坦n con POP3 antes de enviar"
msgid "Command output"
msgstr "Salida de la orden"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Establecer las siguientes direcciones autom叩ticamente"
@@ -5383,35 +5384,35 @@ msgstr "No existe la condici坦n."
msgid "Action not exist."
msgstr "No existe la acci坦n."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Propiedades de la carpeta"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Generales"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "No mostrar [...] o (...) al inicio del asunto en el resumen"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Borrar [...] o (...) al inicio del asunto al responder"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Aplicar en subcarpetas"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "utilizar tambi辿n al responder"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Responder-A:"
@@ -5892,7 +5893,7 @@ msgstr "Coincidir con todas las siguientes"
msgid "Body:"
msgstr "Cuerpo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -5998,7 +5999,7 @@ msgstr "Queda alguna marca. 多Procesarla?"
msgid "Scanning folder (%s)..."
msgstr "Revisando carpeta (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "B炭scar de nuevo"
@@ -6286,6 +6287,21 @@ msgstr "%.2fGb"
msgid "writing to %s failed.\n"
msgstr "fallo escribiendo en %s.\n"
+#~ msgid "Yes"
+#~ msgstr "Si"
+
+#~ msgid "+No"
+#~ msgstr "+No"
+
+#~ msgid "Discard message"
+#~ msgstr "Descartar mensaje"
+
+#~ msgid "Discard"
+#~ msgstr "Descartar"
+
+#~ msgid "to Draft"
+#~ msgstr "a Borradores"
+
#~ msgid "can't write headers\n"
#~ msgstr "no se pueden escribir las cabeceras\n"
diff --git a/po/et.po b/po/et.po
index 941d987a..83f9f912 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -95,10 +95,10 @@ msgstr ""
"'G' tulbas lubamaks kirjade v探tmist kasutades 'V探ta k探ik'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nimi"
@@ -133,18 +133,6 @@ msgstr "Tiitlita"
msgid "Delete account"
msgstr "Kustuta konto"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Jah"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Ei"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -242,7 +230,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "Lisa aadress raamatusse"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Aadress"
@@ -382,7 +370,7 @@ msgstr "/Kustuta"
msgid "E-Mail address"
msgstr "E-Posti aadress"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Aadressiraamat"
@@ -409,16 +397,16 @@ msgstr "Lisa"
msgid "Lookup"
msgstr "Otsi"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Kellele:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Koopia:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Pimekoopia:"
@@ -592,23 +580,23 @@ msgstr "ldine aadress"
msgid "Personal address"
msgstr "Isiklik aadress"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "M辰rkus"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Hoiatus"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Viga"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "*Loon alert paneeli dialoogi...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "N辰ita seda teadet j辰rgmisel korral"
@@ -643,7 +631,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Mittemiski"
@@ -1009,10 +997,10 @@ msgstr "Kirjuta kiri%s"
msgid "Recipient is not specified."
msgstr "Saaja pole m辰辰ratud."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Saada"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Pealkiri"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1045,7 +1033,7 @@ msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
"Ei suutnud leida 端htki v探tit, mis oleks seotud valitud v探tmega (id'%s')."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "Ei suuda muuta faili omadusi\n"
@@ -1054,12 +1042,18 @@ msgstr "Ei suuda muuta faili omadusi\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Ei suuda transleerida kirja tekstikoodi.\n"
"Kas igatahes saata ?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Aadressiraamatu uuendamise viga"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1068,147 +1062,156 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "Ei suuda eemaldada vana kirja\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "Asetan kirja j辰rjekorda...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "j辰rjekorra kausta ei leidunud\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "Ei suutnud kirja j辰rjekorda asetada\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "Loodud Kirja-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Loon kirjutamise akent...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Kellelt:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_T旦旦riist/Tegevused"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Kiri/Kr端pteeri"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME t端端p"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Suurus"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Saada"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Saada kiri"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Hiljem"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Pane j辰rjekorda ja saada hiljem"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Mustand"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Salvesta mustandite kausta"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Lisa"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Lisa fail"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Manusta"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Manusta fail"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Allkiri"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Lisa allkiri"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Redaktor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Redigeeri v辰lise redaktoriga"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Rea辰辰r"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Murra k探ik pikad read"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Vale MIME t端端p."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Faili ei eksisteeri v探i on see t端hi."
-#: src/compose.c:4894
+#: src/compose.c:4900
#, fuzzy
msgid "Properties"
msgstr "Omadus"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Kodeerimine"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Tee"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Failinimi"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "V辰lise redaktori k辰surida on vale: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1219,72 +1222,70 @@ msgstr ""
"Kas h辰vitame protsessi?\n"
"protsessi grupi id: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "H辰vitatud protsessi grupi id: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Ajutine fail: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Kirjutaja: sisend monitoorprotsessilt\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Ei suutnud v辰list redaktorit k辰ivitada\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Ei suutnud faili salvestada\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Torust lugemine eba探nnestus\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Kirja ei 探nnestunud j辰rjekorda asetada."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "M辰辰ra fail"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "M辰辰ra fail"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Kaota kiri"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Saada kiri"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Seda kirja on muudetud. kas kaotame selle?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Kaota"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "Mustanditesse"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Kas te tahate seda malli lisada '%s'-e ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Lisa mall"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Asenda"
@@ -1619,23 +1620,23 @@ msgstr "H辰辰lestuse salvestamine eba探nnestus\n"
msgid "Select folder"
msgstr "Vali kaust"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Saabunud"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Saadetud"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "J辰rjekord"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Pr端gikast"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Mustandid"
@@ -1818,20 +1819,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Kustuta kaust"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Ei suuda kausta %s eemaldada."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "T端hjenda pr端gikast"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Kas eemaldada k探ik kirjad pr端gikastist?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1840,34 +1841,34 @@ msgstr ""
"Kas t探epoolest eemaldada kirjakast %s?\n"
"(Kirju ei kustutata kettalt)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Eemalda kirjakst"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Kas t探esti kustutada IMAP4 konto %s?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Kustuta IMAP4 konto"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Kas t探esti soovite kustutada uudistegruppi %s?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Kustuta uudistegrupp"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Kas t探esti kustutda uudistegrupp %s ?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Kustuta uudistegrupp"
@@ -1895,7 +1896,7 @@ msgstr "Uudistegrupi nimi"
msgid "Messages"
msgstr "Kirjad"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "T端端p"
@@ -3277,7 +3278,7 @@ msgid "Send queued message(s)"
msgstr "Saada kirjad j辰rjekorrast"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Kirjuta"
@@ -3342,8 +3343,8 @@ msgstr "Seaded"
msgid "Common preferences"
msgstr "ldised omaduse"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Konto"
@@ -3461,23 +3462,23 @@ msgstr "Otsi teksti:"
msgid "Case sensitive"
msgstr "T探stutundlik"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Otsimine eba探nnestus"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Otsitavat s探na ei ole."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "J探udsin kirja algusesse; kas j辰tkan l探pust alates?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "J探udsin kirja l探ppu; kas alustan algusest?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Otsimine l探petatud"
@@ -4064,7 +4065,7 @@ msgstr "Autoriseeri POP3 enne saatmist"
msgid "Command output"
msgstr "K辰sklus"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "S辰ti j辰rgmised aadressid automaatselt"
@@ -5441,36 +5442,36 @@ msgstr "K辰surida ei ole sisestatud."
msgid "Action not exist."
msgstr "faili %s ei leidu\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
#, fuzzy
msgid "Folder properties"
msgstr "Kausta omadus"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "ldine"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normaalne"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr ""
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr ""
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
#, fuzzy
msgid "Reply-To:"
msgstr "Vastus saata"
@@ -5956,7 +5957,7 @@ msgstr "S辰ti j辰rgmised aadressid automaatselt"
msgid "Body:"
msgstr "Sisu:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6062,7 +6063,7 @@ msgstr "M探ned m辰rgid on j辰辰nud. Protsessime selle?"
msgid "Scanning folder (%s)..."
msgstr "Tuhnin kaustas (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Otsi uuesti"
@@ -6350,6 +6351,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "%s-i kirjutamine eba探nnestus.\n"
+#~ msgid "Yes"
+#~ msgstr "Jah"
+
+#~ msgid "+No"
+#~ msgstr "+Ei"
+
+#~ msgid "Discard message"
+#~ msgstr "Kaota kiri"
+
+#~ msgid "Discard"
+#~ msgstr "Kaota"
+
+#~ msgid "to Draft"
+#~ msgstr "Mustanditesse"
+
#~ msgid "can't write headers\n"
#~ msgstr "Ei suuda kirjutada p辰ist\n"
diff --git a/po/fr.po b/po/fr.po
index aae30889..0e7455a6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2004-12-09 20:16+0100\n"
"Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -105,10 +105,10 @@ msgstr ""
"correspondant lorsque 束 Tout relever 損 est activ辿"
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nom"
@@ -143,18 +143,6 @@ msgstr "Sans titre"
msgid "Delete account"
msgstr "Supprimer le compte"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Oui"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Non"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -254,7 +242,7 @@ msgstr "Argument de l'action"
msgid "Add Address to Book"
msgstr "Ajouter l'adresse au carnet"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adresse"
@@ -394,7 +382,7 @@ msgstr "/_Supprimer"
msgid "E-Mail address"
msgstr "Adresse 辿lectronique"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Carnet d'adresses"
@@ -421,16 +409,16 @@ msgstr "Ajouter"
msgid "Lookup"
msgstr "Rechercher"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr " :"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Copie :"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Copie discr竪te :"
@@ -608,23 +596,23 @@ msgstr "Adresse courante :"
msgid "Personal address"
msgstr "Adresse personnelle :"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Information"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Avertissement"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Erreur"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Cr辿ation du dialogue d'alerte...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Afficher ce message la prochaine fois"
@@ -659,7 +647,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Aucun"
@@ -1018,10 +1006,10 @@ msgstr "Composition d'un message%s"
msgid "Recipient is not specified."
msgstr "Destinataire non sp辿cifi辿."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Envoyer"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Sujet"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1053,7 +1041,7 @@ msgstr "Impossible d'enregistrer de message dans la bo樽te de messages envoy辿s"
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Impossible de trouver une touche associ辿e au code (de touche) 束 %s 損."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "impossible de modifier les droits d'acc竪s du fichier\n"
@@ -1062,12 +1050,18 @@ msgstr "impossible de modifier les droits d'acc竪s du fichier\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Impossible de convertir le jeu de caract竪res du message\n"
"de %s vers %s. Voulez-vous n辿anmoins l'envoyer ?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Erreur de conversion du carnet d'adresses"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1076,146 +1070,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "Impossible d'enlever l'ancien message\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "Mise en file d'attente des messages...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "Impossible de trouver le dossier de file d'attente\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "Impossible de mettre ce message dans la file d'attente\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "Message-ID cr辿辿 : %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Cr辿ation de la fen棚tre de composition...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "De :"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Outils/_Signer"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Outils/_Chiffrer"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "Type MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Taille"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Envoyer"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Envoyer le message"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Envoi diff辿r辿"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Mettre en file d'attente et envoyer plus tard"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Brouillon"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Enregistrer dans le dossier brouillon"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Insertion"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Ins辿rer un fichier"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Joindre"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Joindre un fichier"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Signature"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Ins辿rer la signature"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "diteur de texte"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "diter avec un 辿diteur externe"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Justifier"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Justifier tout le message"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Type MIME invalide."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Le fichier n'existe pas ou est vide."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Propri辿t辿s"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Encodage"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Chemin d'acc竪s"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Nom du fichier"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "La ligne de commande pour l'辿diteur externe est invalide : 束 %s 損\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1226,74 +1229,72 @@ msgstr ""
"Forcer sa fermeture ?\n"
"id de traitement de groupe: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Id de traitement de groupe termin辿 : %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Fichier temporaire : %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Compose : entr辿e partir d'une surveillance de traitement\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Impossible de lancer l'辿diteur externe\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Impossible d'辿crire dans le fichier\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "chec de lecture de pipe\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Impossible de mettre ce message dans la file d'attente."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Choisissez un fichier"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Choisissez un fichier"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Interruption de la composition du message"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Envoyer le message"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr ""
"Ce message a 辿t辿 modifi辿 mais pas envoy辿. Voulez-vous interrompre la "
"composition ?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Interrompre"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "vers brouillon"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Voulez-vous appliquer le mod竪le 束 %s 損 ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Appliquer un mod竪le"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Remplacer"
@@ -1630,23 +1631,23 @@ msgstr "chec d'辿criture de la configuration dans le fichier\n"
msgid "Select folder"
msgstr "Choix d'un dossier"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "R辿ception"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Envoy辿"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "File d'attente"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Corbeille"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Brouillons"
@@ -1824,20 +1825,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Suppression de dossier"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Impossible de supprimer le dossier 束 %s 損."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Vider la corbeille"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Supprimer tous les messages dans la corbeille ?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1846,34 +1847,34 @@ msgstr ""
"Ne plus utiliser la bo樽te aux lettres 束 %s 損 (les\n"
"messages existants ne seront PAS effac辿s du disque) ?"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Suppression d'une bo樽te aux lettres"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Confirmez-vous la suppression du compte IMAP4 束 %s 損 ?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Suppression du compte IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Confirmer la suppression du groupe de discussion 束 %s 損 ?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Suppression du groupe de discussion"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Confirmer la suppression du compte 束 %s 損 des groupes de discussion ?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Suppression du compte des groupes de discussion"
@@ -1901,7 +1902,7 @@ msgstr "Groupe de discussion"
msgid "Messages"
msgstr "Messages"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Type"
@@ -3268,7 +3269,7 @@ msgid "Send queued message(s)"
msgstr "Envoyer les messages en attente"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Composer"
@@ -3333,8 +3334,8 @@ msgstr "Pr辿f辿rences"
msgid "Common preferences"
msgstr "Pr辿f辿rences g辿n辿rales"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Compte"
@@ -3452,23 +3453,23 @@ msgstr "Texte recherch辿 :"
msgid "Case sensitive"
msgstr "Respecter la casse"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "La recherche a 辿chou辿"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Texte recherch辿 introuvable."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "D辿but de message atteint, reprendre depuis la fin ?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Fin de message atteint, reprendre depuis le d辿but ?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Recherche termin辿e"
@@ -4052,7 +4053,7 @@ msgstr "S'authentifier sur le POP3 avant l'envoi"
msgid "Command output"
msgstr "Sortie"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "D辿finition automatique des adresses suivantes"
@@ -5413,35 +5414,35 @@ msgstr "La condition n'existe pas."
msgid "Action not exist."
msgstr "L'action n'existe pas."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Propri辿t辿s du dossier"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "G辿n辿ral"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Ne pas afficher [...] ou (...) au d辿but du sujet dans le r辿sum辿"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Supprimer [...] ou (...) au d辿but du sujet lors d'une r辿ponse"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Appliquer aux sous-dossiers"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "utiliser 辿galement pour les r辿ponses"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "R辿pondre :"
@@ -5923,7 +5924,7 @@ msgstr "Si toutes les conditions suivantes sont remplies"
msgid "Body:"
msgstr "Message :"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6029,7 +6030,7 @@ msgstr "Il reste des messages marqu辿s, voulez-vous les traiter ?"
msgid "Scanning folder (%s)..."
msgstr "Analyse du dossier (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Chercher encore"
@@ -6319,6 +6320,21 @@ msgstr "%.2f Go"
msgid "writing to %s failed.\n"
msgstr "L'辿criture dans %s a 辿chou辿.\n"
+#~ msgid "Yes"
+#~ msgstr "Oui"
+
+#~ msgid "+No"
+#~ msgstr "+Non"
+
+#~ msgid "Discard message"
+#~ msgstr "Interruption de la composition du message"
+
+#~ msgid "Discard"
+#~ msgstr "Interrompre"
+
+#~ msgid "to Draft"
+#~ msgstr "vers brouillon"
+
#~ msgid "can't write headers\n"
#~ msgstr "impossible d'辿crire les en-t棚tes\n"
diff --git a/po/gl.po b/po/gl.po
index d1453dac..d7fa9f25 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2003-01-17 10:05+0100\n"
"Last-Translator: Jorge Rivas\n"
"Language-Team: Jorge Rivas\n"
@@ -97,10 +97,10 @@ msgstr ""
"na columna `G' para activar a descarga mediante `Traer todo'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nome"
@@ -135,18 +135,6 @@ msgstr "Sen t鱈tulo"
msgid "Delete account"
msgstr "Borrar conta"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Si"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Non"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -244,7 +232,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "Engadir enderezo 叩 axenda"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Enderezo"
@@ -384,7 +372,7 @@ msgstr "/_Borrar"
msgid "E-Mail address"
msgstr "Enderezo e-mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Axenda de enderezos"
@@ -411,16 +399,16 @@ msgstr "Engadir"
msgid "Lookup"
msgstr "Buscar"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Para:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -595,23 +583,23 @@ msgstr "Enderezo com炭n"
msgid "Personal address"
msgstr "Enderezo persoal"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Notificaci坦n"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Erro"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Creando o di叩logo de alerta...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Mostrar este mensaxe de novo"
@@ -646,7 +634,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Ning炭n"
@@ -1012,10 +1000,10 @@ msgstr "Compo単er mensaxe%s"
msgid "Recipient is not specified."
msgstr "Non se especificou o destinatario."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Enviar"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Asunto"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1047,7 +1035,7 @@ msgstr "Non se pode gardar a mensaxe en Saida."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Non puiden atopar ningunha clave asociada con a Id-clave actual `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "non se pode cambiar os permisos de ficheiro\n"
@@ -1056,13 +1044,19 @@ msgstr "non se pode cambiar os permisos de ficheiro\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Non podo convertir a codificaci坦n de caracteres da mensaxe de\n"
"%s a %s.\n"
"多Envia-lo de todo xeito?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Error na conversi坦n da axenda"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1071,146 +1065,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "non se pode eliminar a mensaxe antiga\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "po単endo na cola...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "non podo atopar a carpeta de cola\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "a mensaxe non se pode po単er na cola\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "Message-ID generado: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Creando fiestra de composicion...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Dende:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Ferramentas/Acci坦_ns"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Mensaxe/_Encriptar"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "Tipo MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Tama単o"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Enviar"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Enviar Mensaxe"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Enviar mais tarde"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Po単er na cola e enviar mais tarde"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Borrador"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Gardar como borrador"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Inserir"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Inserir ficheiro"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Adxuntar"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Adxuntar ficheiro"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Sinatura"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Inserir sinatura"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Editar con un editor externo"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Recortar"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Cortar todas as l鱈neas longas"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Tipo MIME inv叩lido."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "O ficheiro non existe ou est叩 valeiro."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Propiedades"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Codificaci坦n"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Ruta"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Nome de ficheiro"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "o comando do editor externo non e v叩lido: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1221,72 +1224,70 @@ msgstr ""
"多Desea terminar o proceso?\n"
"Id. de proceso: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Terminado proceso id.: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Ficheiro temporal: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Compo単er: entrada dende proceso monitor\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Non se puido executar o editor externo\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Non se puido escribir no ficheiro\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Fallo lendo tuber鱈a\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "O mensaxe non se pode po単er na cola."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Seleccionar ficheiro"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Seleccionar ficheiro"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Descartar Mensaxe"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Enviar Mensaxe"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Esta mensaxe foi modificado. 多Desea descartala?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Descartar"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "a Borrador"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "多Quere aplicar a plantilla `%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Aplicar plantilla"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Substitu鱈r"
@@ -1622,23 +1623,23 @@ msgstr "fallo escribiendo a configuraci坦n a ficheiro\n"
msgid "Select folder"
msgstr "Seleccionar carpeta"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Entrada"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Enviado"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Cola"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Papeleira"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Borradores"
@@ -1818,20 +1819,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Borrar carpeta"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Non se pode eliminar a carpeta `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Baleirar papeleira"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "多Baleirar todas as mensaxes da papeleira?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1840,34 +1841,34 @@ msgstr ""
"多Realmente desexa eliminar a caixa de correo `%s' ?\n"
"(As mensaxes NON se borrar叩n do disco)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Eliminar mailbox"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "多Eliminar realmente a conta IMAP4 `%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Borrar conta IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "多Borrar o grupo de novas `%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Borrar grupo de novas"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "多Borrar a conta de novas `%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Borrar conta de novas"
@@ -1895,7 +1896,7 @@ msgstr "Nome de grupo"
msgid "Messages"
msgstr "Mensaxes"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tipo"
@@ -3281,7 +3282,7 @@ msgid "Send queued message(s)"
msgstr "Enviar mensaxe(s) na cola"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Compo単er"
@@ -3346,8 +3347,8 @@ msgstr "Preferencias"
msgid "Common preferences"
msgstr "Preferencias comuns"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "conta"
@@ -3465,23 +3466,23 @@ msgstr "Buscar texto:"
msgid "Case sensitive"
msgstr "Mai炭s./min炭s."
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "B炭squeda fallida"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Cadea non atopada."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Cheg坦use 坦 principio da mensaxe. 多Seguir dende o final?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Cheg坦use 坦 final da mensaxe. 多Seguir dende o principio?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "B炭squeda concluida"
@@ -4066,7 +4067,7 @@ msgstr "Autenticaci坦n con POP3 antes de enviar"
msgid "Command output"
msgstr "Saida do comando"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Establecer os seguintes enderezos autom叩ticamente"
@@ -5442,35 +5443,35 @@ msgstr "Non se estableceu o comando."
msgid "Action not exist."
msgstr "%s: o ficheiro non existe\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Propiedades da carpeta"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Xerais"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Aplicar en subcarpetas"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "utilizar tam辿n 坦 respostar"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Respostar-A:"
@@ -5953,7 +5954,7 @@ msgstr "Establecer os seguintes enderezos autom叩ticamente"
msgid "Body:"
msgstr "Corpo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6059,7 +6060,7 @@ msgstr "Queda algunha marca. 多Procesa-la?"
msgid "Scanning folder (%s)..."
msgstr "Revisando carpeta (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "B炭scar de novo"
@@ -6347,6 +6348,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "fallo escribindo en %s.\n"
+#~ msgid "Yes"
+#~ msgstr "Si"
+
+#~ msgid "+No"
+#~ msgstr "+Non"
+
+#~ msgid "Discard message"
+#~ msgstr "Descartar Mensaxe"
+
+#~ msgid "Discard"
+#~ msgstr "Descartar"
+
+#~ msgid "to Draft"
+#~ msgstr "a Borrador"
+
#~ msgid "can't write headers\n"
#~ msgstr "non se poden escribir as cabeceiras\n"
diff --git a/po/hr.po b/po/hr.po
index 5038621d..e661a455 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -96,10 +96,10 @@ msgstr ""
"S one raune s kojih 転elite skinuti po邸tu sa `Primi sve'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Ime"
@@ -134,18 +134,6 @@ msgstr "Neimenovano"
msgid "Delete account"
msgstr "Obri邸i raun"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Da"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Ne"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -240,7 +228,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "Dodaj adresu u adresar"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adresa"
@@ -381,7 +369,7 @@ msgstr "/_Obri邸i"
msgid "E-Mail address"
msgstr "E-mail adresa"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adresar"
@@ -408,16 +396,16 @@ msgstr "Dodaj"
msgid "Lookup"
msgstr "Potra転i"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Za:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -585,23 +573,23 @@ msgstr "Uobiajene adrese"
msgid "Personal address"
msgstr "Osobne adrese"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Obavijest"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Upozorenje"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Gre邸ka"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Stvaram suelje za upozoravajui prozor...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Prika転i ovu poruku slijedei put"
@@ -636,7 +624,7 @@ msgstr "Smea"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Ni邸ta"
@@ -1014,10 +1002,10 @@ msgstr "Pisanje poruke%s"
msgid "Recipient is not specified."
msgstr "Nije upisan primatelj."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Po邸alji"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Tema"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1049,7 +1037,7 @@ msgstr "Ne mogu snimiti poruku u spis poslano."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "ne mogu promjeniti atribut datoteke\n"
@@ -1058,10 +1046,16 @@ msgstr "ne mogu promjeniti atribut datoteke\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr "Ne mogu promjeniti charset poruke."
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Gre邸ka pri unosu adresara"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1070,149 +1064,158 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "ne mogu ukloniti staru poruku\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "odla転em poruku...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
#, fuzzy
msgid "can't find queue folder\n"
msgstr "ne mogu odabrati spis: %s\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "ne mogu odlo転iti poruku\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "generiran ID-poruke: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Stvaram prozor za pisanje...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Od:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Izvr邸i"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Poruka/_Kriptiraj"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME tip"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Veliina"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Po邸alji"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Po邸alji poruku"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Po邸alji kasnije"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Odlo転i u spis odlo転eno i po邸alji kasnije"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Nedovr邸eno"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Spremi u spis nedovr邸eno"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Unesi"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Unesi datoteku"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Prilo転i"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Prilo転i datoteku"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Potpis"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Unesi potpis"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Ureiva"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Uredi s vanjskim ureivaem"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Sa転imanje"
-#: src/compose.c:4429
+#: src/compose.c:4435
#, fuzzy
msgid "Wrap all long lines"
msgstr "/_Uredi/Sa転mi sve duge _linije"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Pogre邸an MIME tip"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Datoteka ne postoji ili je prazna."
-#: src/compose.c:4894
+#: src/compose.c:4900
#, fuzzy
msgid "Properties"
msgstr "Postavke"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Kodiranje"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Staza"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Ime datoteke"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Naredba za vanjski ureiva je pogre邸na: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1223,73 +1226,71 @@ msgstr ""
"Ugasiti proces?\n"
"grupa procesa: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Uga邸ena grupa procesa: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Privremena datoteka: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Napi邸i: unos iz procesa motrenja\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Ne mogu pokrenuti vanjski ureiva\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Ne mogu pisati u datoteku\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "itanje pipe-a nije uspjelo\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Ne mogu odlo転iti poruku."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Odaberite datoteku"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Odaberite datoteku"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Odbaci poruku"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Po邸alji poruku"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Ova poruka je promijenjena, odbaciti?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Odbaci"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "u Nedovr邸eno"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, fuzzy, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Uistinu obrisati ovaj obrazac?"
-#: src/compose.c:5716
+#: src/compose.c:5725
#, fuzzy
msgid "Apply template"
msgstr "Bri邸i obrazac"
-#: src/compose.c:5717
+#: src/compose.c:5726
#, fuzzy
msgid "Replace"
msgstr "Obrazac"
@@ -1625,24 +1626,24 @@ msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
msgid "Select folder"
msgstr "Odaberite spis"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Sandui"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
#, fuzzy
msgid "Sent"
msgstr "Po邸alji"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Odlo転eno"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Smee"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
#, fuzzy
msgid "Drafts"
msgstr "Nedovr邸eno"
@@ -1828,20 +1829,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Obri邸i spis"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Ne mogu premjestiti spis `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Isprazni smee"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Isprazniti sve poruke u smeu?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, fuzzy, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1850,35 +1851,35 @@ msgstr ""
"Uistinu premjestiti spis `%s' ?\n"
"(Poruke NEE biti obrisane s diska)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
#, fuzzy
msgid "Remove mailbox"
msgstr "/_Ukloni sandui"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Uistinu obrisati `%s' IMAP4 raun?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Obri邸i IMAP4 raun"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Uistinu obrisati `%s' news grupu?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Obri邸i news grupu"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Uistinu obrisati `%s' news raun?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Obri邸i news raun"
@@ -1906,7 +1907,7 @@ msgstr "News grupa:"
msgid "Messages"
msgstr "Poruke"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tip"
@@ -3375,7 +3376,7 @@ msgid "Send queued message(s)"
msgstr "alje odlo転ene poruke"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Kreiraj"
@@ -3441,8 +3442,8 @@ msgstr "Postav"
msgid "Common preferences"
msgstr "Uobiajene postavke"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Raun"
@@ -3560,23 +3561,23 @@ msgstr "Pronai tekst:"
msgid "Case sensitive"
msgstr "Osjetljiv na velika/mala slova"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Polje potrage"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Zadani uzorak nije pronaen."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Poetak liste dosegnut; nastaviti od kraja?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Kraj liste dosegnut; nastaviti od poetka?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Potraga zavr邸ena"
@@ -4168,7 +4169,7 @@ msgstr "Autoriziraj s POP3 prije slanja"
msgid "Command output"
msgstr "Naredba"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automatski postavi slijedee adrese"
@@ -5533,36 +5534,36 @@ msgstr "Ime zaglavlja nije postavljeno."
msgid "Action not exist."
msgstr "%s: datoteka ne postoji\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
#, fuzzy
msgid "Folder properties"
msgstr "Postavke"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr ""
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr ""
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr ""
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr ""
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
#, fuzzy
msgid "Reply-To:"
msgstr "Odvovori-Na"
@@ -6052,7 +6053,7 @@ msgstr "Automatski postavi slijedee adrese"
msgid "Body:"
msgstr "Tijelo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6162,7 +6163,7 @@ msgstr "Neke oznake su izostavljene. Izvr邸iti ih?"
msgid "Scanning folder (%s)..."
msgstr "Pregledavam spis (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
#, fuzzy
msgid "Search again"
msgstr "Polje potrage"
@@ -6454,6 +6455,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "pisanje u %s nije uspjelo.\n"
+#~ msgid "Yes"
+#~ msgstr "Da"
+
+#~ msgid "+No"
+#~ msgstr "+Ne"
+
+#~ msgid "Discard message"
+#~ msgstr "Odbaci poruku"
+
+#~ msgid "Discard"
+#~ msgstr "Odbaci"
+
+#~ msgid "to Draft"
+#~ msgstr "u Nedovr邸eno"
+
#~ msgid "can't write headers\n"
#~ msgstr "ne mogu pisati zaglavlje\n"
diff --git a/po/hu.po b/po/hu.po
index 3463a52c..dc747226 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed-1.9.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2005-06-23 18:30+0200\n"
"Last-Translator: N辿meth Tam叩s <ntomasz@vipmail.hu>\n"
"Language-Team: <NONE>\n"
@@ -100,10 +100,10 @@ msgstr ""
"funkci坦 bekapcsol叩s叩hoz v叩lassza ki a 'G' oszlopban a jel旦ldobozt!"
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "N辿v"
@@ -137,18 +137,6 @@ msgstr "(N辿vtelen)"
msgid "Delete account"
msgstr "Hozz叩f辿r辿s t旦rl辿se"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Igen"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nem"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -249,7 +237,7 @@ msgstr "A m撤velet felhaszn叩l坦i param辿tere"
msgid "Add Address to Book"
msgstr "C鱈m hozz叩ad叩sa a c鱈mlist叩hoz"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "C鱈m"
@@ -389,7 +377,7 @@ msgstr "/_T旦rl辿s"
msgid "E-Mail address"
msgstr "E-Mail c鱈m"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "C鱈mjegyz辿k"
@@ -416,16 +404,16 @@ msgstr "Hozz叩ad叩s"
msgid "Lookup"
msgstr "Eln辿zet"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "C鱈mzett:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "M叩solat:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Titkos m叩solat:"
@@ -596,23 +584,23 @@ msgstr "ltal叩nos c鱈m"
msgid "Personal address"
msgstr "Szem辿lyes c鱈m"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Megjegyz辿s"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Figyelmeztet辿s"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Hiba"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Figyelmeztetpanel dial坦gus l辿trehoz叩sa...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Mutatja ezt az 端zenetet legk旦zelebb"
@@ -647,7 +635,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Semmi"
@@ -979,10 +967,10 @@ msgstr "zenet 鱈r叩sa%s"
msgid "Recipient is not specified."
msgstr "Nincs c鱈mzett megadva."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "K端ld辿s"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "T叩rgy"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1015,21 +1003,27 @@ msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
"Nem tal叩ltam hozz叩rendelt kulcsot a kiv叩lasztott kulcs azonos鱈t坦hoz `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "f叩jl m坦dja nem v叩ltoztathat坦\n"
#: src/compose.c:2670
-#, c-format
+#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Nem lehet konvert叩lni az 端zenet karakterk坦dol叩s叩t %s-r坦l/rl %s-ra.\n"
"Ennek ellen辿re elk端ldi mint %s?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "C鱈mjegyz辿k konvert叩l叩si hiba"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1038,144 +1032,153 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "a r辿gi 端zenetet nem lehet elt叩vol鱈tani\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "端zenet a V叩rakoz坦 sorba...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "nem tal叩lhat坦 a V叩rakoz坦 sor mapp叩ja\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "Az 端zenetet nem siker端lt a V叩rakoz坦 sorba rakni\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "gener叩lt zenet-azonos鱈t坦: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Szerkesztablak l辿trehoz叩sa...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Felad坦:"
-#: src/compose.c:3947
+#: src/compose.c:3953
msgid "PGP Sign"
msgstr "PGP Al叩鱈r叩s"
-#: src/compose.c:3950
+#: src/compose.c:3956
msgid "PGP Encrypt"
msgstr "PGP Titkos鱈t叩s"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME t鱈pus"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "M辿ret"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "K端ld辿s"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "zenet k端ld辿se"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "K端ld辿s k辿sbb"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "zenet a V叩rakoz坦 sorba, k端ld辿s k辿sbb"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "V叩zlat"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Ment辿s a v叩zlat mapp叩ba"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Besz炭r叩s"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "F叩jl besz炭r叩sa"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Csatol叩s"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "F叩jl csatol叩sa"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Al叩鱈r叩s"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Al叩鱈r叩s beilleszt辿se"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Szerkeszt"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Szerkeszt辿s k端ls programmal"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Sort旦r辿s"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Az 旦sszes hossz炭 sor t旦r辿se"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "rv辿nytelen MIME t鱈pus."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "A f叩jl nem l辿tezik vagy 端res."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Tulajdons叩gok"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "K坦dol叩s"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "El辿r辿si 炭t"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "F叩jln辿v"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "K端ls szerkeszt parancssora 辿rv辿nytelen: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1186,71 +1189,69 @@ msgstr ""
"Processz kil旦v辿se?\n"
"processz csoport azonos鱈t坦: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "A le叩ll鱈tott processz csoport azonos鱈t坦ja: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Ideiglenes f叩jl: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Szerkeszt辿s: bemenet a monitoroz坦 processzbl\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "K端ls szerkeszt nem ind鱈that坦\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Nem lehet a f叩jlba 鱈rni\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Hiba t旦rt辿nt a csvezet辿k olvas叩sa k旦zben\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Az 端zenetet nem siker端lt a V叩rakoz坦 sorba rakni"
-#: src/compose.c:5613
+#: src/compose.c:5621
msgid "Select files"
msgstr "F叩jlok v叩laszt叩sa"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "F叩jl v叩laszt叩s"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "zenet elvet辿se"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "zenet k端ld辿se"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Az 端zenet megv叩ltozott. Eldobja?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Elvet"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "V叩zlatok k旦z辿"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "T辿nyleg alkalmazni szeretn辿 a(z) `%s' sablont?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Sablon alkalmaz叩sa"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Helyettes鱈t"
@@ -1585,23 +1586,23 @@ msgstr "a be叩ll鱈t叩sokat nem lehetett elmenteni\n"
msgid "Select folder"
msgstr "Mappa v叩laszt叩sa"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Bej旦v"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Kimen"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "V叩rakoz坦"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Kuka"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "V叩zlatok"
@@ -1780,20 +1781,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Mappa t旦rl辿se"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "`%s' nem t叩vol鱈that坦 el."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Kuka 端r鱈t辿se"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Minden 端zenet t旦rl辿se a kuk叩b坦l?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1802,34 +1803,34 @@ msgstr ""
"T辿nyleg elt叩vol鱈tja `%s' postal叩d叩t?\n"
"(Az 端zenetek NEM t旦rldnek a meghajt坦r坦l)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Postal叩da elt叩vol鱈t叩sa"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "T辿nyleg t旦rli a(z) `%s' IMAP4 hozz叩f辿r辿st?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "IMAP4 hozz叩f辿r辿s t旦rl辿se"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "T辿nyleg t旦rli a(z) `%s' h鱈rcsoportot?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "H鱈rcsoport t旦rl辿se"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "T辿nyleg t旦rli a(z) `%s' h鱈rhozz叩f辿r辿st?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "H鱈rhozz叩f辿r辿s t旦rl辿se"
@@ -1857,7 +1858,7 @@ msgstr "H鱈rcsoport n辿v"
msgid "Messages"
msgstr "zenetek"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "T鱈pus"
@@ -3202,7 +3203,7 @@ msgid "Send queued message(s)"
msgstr "V叩rakoz坦 sorb坦l 端zenet(ek) k端ld辿se"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Szerkeszt辿s"
@@ -3266,8 +3267,8 @@ msgstr "Be叩ll鱈t叩sok"
msgid "Common preferences"
msgstr "K旦z旦s be叩ll鱈t叩sok"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Hozz叩f辿r辿s"
@@ -3386,23 +3387,23 @@ msgstr "Sz旦veg keres辿se:"
msgid "Case sensitive"
msgstr "Nagy- 辿s kisbet撤 辿rz辿kenys辿g"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Keres辿s sikertelen"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "A keresett sz旦veg nem tal叩lhat坦."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Az 端zenet elej辿re 辿rtem; folytassam a v辿g辿rl?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Az 端zenet v辿g辿re 辿rtem; folytassam az elej辿rl?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Keres辿s befejezd旦tt"
@@ -3976,7 +3977,7 @@ msgstr "Azonos鱈t叩s k端ld辿s eltt POP3-mal"
msgid "Command output"
msgstr "Parancskimenet"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Az al叩bbi c鱈mek automatikus be叩ll鱈t叩sa"
@@ -5317,35 +5318,35 @@ msgstr "Nem l辿tez felt辿tel."
msgid "Action not exist."
msgstr "Nem l辿tez m撤velet."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Mappa tulajdons叩gai"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "ltal叩nos"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Norm叩lis"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Ne mutassa a [...] vagy (...) sz旦veget a t叩rgy mezben 旦sszegz辿skor"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "V叩lasz eset辿n t旦r旦lje a [...] vagy (...) sz旦veget a t叩rgy mezbl"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Alkalmaz叩s almapp叩kra"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "v叩laszn叩l is haszn叩lja"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "V叩laszc鱈m:"
@@ -5827,7 +5828,7 @@ msgstr "Minden egyezik a k旦vetkezkbl"
msgid "Body:"
msgstr "T旦rzs:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr "Mindet keres"
@@ -5932,7 +5933,7 @@ msgstr "Maradt m辿g n辿h叩ny kijel旦lt. Feldolgo叩s?"
msgid "Scanning folder (%s)..."
msgstr "(%s) mappa 叩tvizsg叩l叩sa..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Keres辿s 炭jra"
@@ -6215,6 +6216,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "%s f叩jlba nem siker端lt 鱈rni.\n"
+#~ msgid "Yes"
+#~ msgstr "Igen"
+
+#~ msgid "+No"
+#~ msgstr "+Nem"
+
+#~ msgid "Discard message"
+#~ msgstr "zenet elvet辿se"
+
+#~ msgid "Discard"
+#~ msgstr "Elvet"
+
+#~ msgid "to Draft"
+#~ msgstr "V叩zlatok k旦z辿"
+
#~ msgid "can't write headers\n"
#~ msgstr "fejl辿c nem 鱈rhat坦\n"
diff --git a/po/it.po b/po/it.po
index fb485f16..791b3b77 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 2.0.0beta3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2005-06-25 16:55+0200\n"
"Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -100,10 +100,10 @@ msgstr ""
"tutti損."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nome"
@@ -137,18 +137,6 @@ msgstr "(Senza titolo)"
msgid "Delete account"
msgstr "Elimina account"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "S狸"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+No"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -248,7 +236,7 @@ msgstr "Argomento dell'azione utente"
msgid "Add Address to Book"
msgstr "Aggiunta dell'indirizzo alla rubrica"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Indirizzo"
@@ -388,7 +376,7 @@ msgstr "/Eli_mina"
msgid "E-Mail address"
msgstr "Indirizzo e-mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Rubrica"
@@ -415,16 +403,16 @@ msgstr " Aggiungi "
msgid "Lookup"
msgstr "Cerca"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "A:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -600,23 +588,23 @@ msgstr "Indirizzo comune"
msgid "Personal address"
msgstr "Indirizzo personale"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Avviso"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Avvertimento"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Errore"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Creazione della finestra di dialogo dell'allarme...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Mostra questo messaggio la prossima volta"
@@ -651,7 +639,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Niente"
@@ -983,10 +971,10 @@ msgstr "Composizione messaggio %s"
msgid "Recipient is not specified."
msgstr "Il destinatario non 竪 specificato."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Invia"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Oggetto"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1020,21 +1008,27 @@ msgstr ""
"Impossibile trovare qualsiasi chiave associata con l'id chiave 束%s損 "
"attualmente selezionato."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "impossibile cambiare i permessi del file\n"
#: src/compose.c:2670
-#, c-format
+#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Impossibile convertire la codifica del carattere del messaggio da %s a %s.\n"
"Spedirlo come %s comunque?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Errore di conversione della rubrica"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1043,144 +1037,153 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "impossibile rimuovere il vecchio messaggio\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "accodamento messaggio...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "impossibile trovare la cartella 束Coda損\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "impossibile accodare il messaggio\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "generato l'ID-messaggio: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Creazione della finestra di composizione...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Da:"
-#: src/compose.c:3947
+#: src/compose.c:3953
msgid "PGP Sign"
msgstr "Firma PGP"
-#: src/compose.c:3950
+#: src/compose.c:3956
msgid "PGP Encrypt"
msgstr "Cifratura PGP"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "Tipo MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Dimensione"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Invia"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Invia il messaggio"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Invia pi湛 tardi"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Mette nella cartella 束Coda損 e invia pi湛 tardi"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Bozze"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Salva nella cartella 束Bozze損"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Inserisci"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Inserisce il file"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Allega"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Allega il file"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Firma"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Inserisce la firma"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Modifica con l'editor esterno"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "A capo riga"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Manda a capo tutte le righe lunghe"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Tipo MIME non valido."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Il file non esiste o 竪 vuoto."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Propriet"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Codifica"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Percorso"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Nome del file"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "La riga di comando per l'editor esterno non 竪 valida: 束%s損\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1191,71 +1194,69 @@ msgstr ""
"Forzare la conclusione del processo?\n"
"group id del processo: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Group id del processo terminato: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "File temporaneo: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Composizione: input da un processo di controllo\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Impossibile eseguire l'editor esterno\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Impossibile scrivere sul file\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Lettura dalla pipe fallita\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Impossibile accodare il messaggio."
-#: src/compose.c:5613
+#: src/compose.c:5621
msgid "Select files"
msgstr "Seleziona i file"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Selezione del file"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Scarta il messaggio"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Invia il messaggio"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Questo messaggio 竪 stato modificato. Scartarlo?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Scarta"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "nella cartella 束Bozze損"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Applicare il modello 束%s損 ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Applica il modello"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Sostituisci"
@@ -1592,23 +1593,23 @@ msgstr "la scrittura della configurazione sul file 竪 fallita\n"
msgid "Select folder"
msgstr "Selezione della cartella"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "In entrata"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Inviata"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Coda"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Cestino"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Bozze"
@@ -1788,20 +1789,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Elimina la cartella"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Impossibile rimuovere la cartella 束%s損."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Svuota cestino"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Svuotare tutti i messaggi nel cestino?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1810,34 +1811,34 @@ msgstr ""
"Rimuovere la casella postale 束%s損 ?\n"
"(I messaggi NON saranno eliminati dal disco)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Rimuovi la casella postale"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Eliminare l'account IMAP4 束%s損?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Elimino l'account IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Eliminare il newsgroup 束%s損 ?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Elimino il newsgroup"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Eliminare l'account delle news 束%s損 ?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Elimino l'account delle news"
@@ -1865,7 +1866,7 @@ msgstr "Nome del newsgroup"
msgid "Messages"
msgstr "Messaggi"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tipo"
@@ -3211,7 +3212,7 @@ msgid "Send queued message(s)"
msgstr "Invia i messaggi accodati"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Componi"
@@ -3275,8 +3276,8 @@ msgstr "Preferenze"
msgid "Common preferences"
msgstr "Preferenze comuni"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Account"
@@ -3394,23 +3395,23 @@ msgstr "Testo da trovare:"
msgid "Case sensitive"
msgstr "Maiuscole/minuscole"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Ricerca fallita"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "La stringa ricercata non 竪 stata trovata."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Ho raggiunto l'inizio del messaggio; continuo dalla fine?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Ho raggiunto la fine del messaggio; continuo dall'inizio?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Ricerca terminata"
@@ -3984,7 +3985,7 @@ msgstr "Autentica con POP3 prima dell'invio"
msgid "Command output"
msgstr "Output del comando"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Imposta automaticamente i seguenti indirizzi"
@@ -5327,35 +5328,35 @@ msgstr "La condizione non esiste."
msgid "Action not exist."
msgstr "L'azione non esiste."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Propriet della cartella"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Generale"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normale"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Non mostrare [...] o (...) all'inizio dell'oggetto nel sommario"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Elimina [...] o (...) all'inizio dell'oggetto nella risposta"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Applica alle sottocartelle"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "usa anche nella risposta"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Rispondi a:"
@@ -5839,7 +5840,7 @@ msgstr "Corrisponde a tutti i seguenti"
msgid "Body:"
msgstr "Corpo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr "Trova tutti"
@@ -5944,7 +5945,7 @@ msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
msgid "Scanning folder (%s)..."
msgstr "Esame della cartella (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Ricerca ancora"
@@ -6229,5 +6230,20 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "la scrittura su %s 竪 fallita.\n"
+#~ msgid "Yes"
+#~ msgstr "S狸"
+
+#~ msgid "+No"
+#~ msgstr "+No"
+
+#~ msgid "Discard message"
+#~ msgstr "Scarta il messaggio"
+
+#~ msgid "Discard"
+#~ msgstr "Scarta"
+
+#~ msgid "to Draft"
+#~ msgstr "nella cartella 束Bozze損"
+
#~ msgid "can't write headers\n"
#~ msgstr "impossibile scrivere le intestazioni\n"
diff --git a/po/ja.po b/po/ja.po
index 2a51ac9e..2c3e46b7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -97,10 +97,10 @@ msgstr ""
"緇鴻G鴻с"
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr ""
@@ -134,18 +134,6 @@ msgstr "(腱井荐絎)"
msgid "Delete account"
msgstr "≪潟"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr ""
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -245,7 +233,7 @@ msgstr "≪激с潟若九"
msgid "Add Address to Book"
msgstr "≪鴻≪劫験菴遵"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "≪"
@@ -385,7 +373,7 @@ msgstr "/(_D)"
msgid "E-Mail address"
msgstr "糸<若 ≪"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "≪劫験"
@@ -412,16 +400,16 @@ msgstr "菴遵"
msgid "Lookup"
msgstr "罎膣"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "絎:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -594,23 +582,23 @@ msgstr "掩≪"
msgid "Personal address"
msgstr "篋榊≪"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "羈"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "茘"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr ""
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "茘ゃ≪違篏筝...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "罨≦<祉若吾茵腓冴"
@@ -645,7 +633,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr ""
@@ -977,10 +965,9 @@ msgstr "<祉若吾篏%s"
msgid "Recipient is not specified."
msgstr "絎絎障"
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "篆"
+#: src/compose.c:2415
+msgid "Empty subject"
+msgstr "腥冴篁九"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1012,7 +999,7 @@ msgstr "<祉若吾篆≧ァ篆絖с障"
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "憜御ID `%s' 絲上泣荀ゃ障с"
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "<ゃ≪若紊眼с障\n"
@@ -1021,12 +1008,18 @@ msgstr "<ゃ≪若紊眼с障\n"
#, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"<祉若御絖潟潟若c潟違 %s %s 紊с障\n"
+"\n"
"%s 障障篆<障?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+msgid "Code conversion error"
+msgstr "絖潟若紊"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1039,144 +1032,153 @@ msgstr ""
"\n"
"篆<障?"
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr "茵激狗"
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "ゃ<祉若吾ゃс障\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "<祉若吾篆≦<ャ障...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "篆≦<荀ゃ障\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "<祉若吾篆≦罘с障\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "<祉若ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "<祉若娯c潟篏筝...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "綏坂査:"
-#: src/compose.c:3947
+#: src/compose.c:3953
msgid "PGP Sign"
msgstr "PGP臀峨"
-#: src/compose.c:3950
+#: src/compose.c:3956
msgid "PGP Encrypt"
msgstr "PGP垸"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME 帥ゃ"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "泣ゃ"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "篆"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "<祉若吾篆"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "緇ч篆"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "篆≦<ャ緇ч篆"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "腮"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "腮帥篆絖"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "水"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "<ゃ水"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "羞私"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "<ゃ羞私"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "臀峨"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "臀峨水"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "c"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "紊c帥х隈"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "翫就"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "鴻激茵菴"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "≦鴻 MIME 帥ゃс"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "<ゃ絖障腥冴с"
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr ""
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "潟潟若c潟"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr ""
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "<ゃ"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "紊c帥潟潟ゃ潟≦鴻с: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1187,71 +1189,67 @@ msgstr ""
"祉鴻綣桁句篋障?\n"
"祉鴻違若ID: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "腟篋祉鴻違若ID: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "筝<ゃ: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Compose: h祉鴻ュ\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "紊c帥絎茵с障\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "<ゃ吾莨若障\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "ゃ茯粋昭帥紊掩\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "<祉若吾篆≦罘с障"
-#: src/compose.c:5613
+#: src/compose.c:5621
msgid "Select files"
msgstr "<ゃ御"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "<ゃ御"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "<祉若吾贋"
+#: src/compose.c:5678
+msgid "Save message"
+msgstr "<祉若吾篆絖"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
-msgstr "<祉若吾紊眼障贋障?"
+#: src/compose.c:5679
+msgid "This message has been modified. Save it to draft folder?"
+msgstr "<祉若吾紊眼障腮帥篆絖障?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "贋"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr "篆絖(_W)"
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "腮帥"
-
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "潟若 `%s' 障?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "潟若"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "臀"
@@ -1586,23 +1584,23 @@ msgstr "荐絎<ゃ吾吾莨若帥紊掩障\n"
msgid "Select folder"
msgstr "御"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "篆∞"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "篆≧ァ"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "篆≦"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "睡"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "腮"
@@ -1780,20 +1778,20 @@ msgstr ""
msgid "Delete folder"
msgstr ""
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr " `%s' ゃс障"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "睡宴腥冴"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "睡宴筝<祉若吾鴻ゃ障?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1802,34 +1800,34 @@ msgstr ""
"綵<若 `%s' ゃ障?\n"
"(<祉若吾c鴻ゃ障)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "<若鴻"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "綵IMAP4≪潟 `%s' ゃ障?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "IMAP4≪潟"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "綵ャ若鴻違若 `%s' ゃ障?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "ャ若鴻違若"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "綵ャ若鴻≪潟 `%s' ゃ障?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "ャ若鴻≪潟"
@@ -1857,7 +1855,7 @@ msgstr "ャ若鴻違若"
msgid "Messages"
msgstr "<祉若"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "帥ゃ"
@@ -3210,7 +3208,7 @@ msgid "Send queued message(s)"
msgstr "篆≦罘筝<祉若吾篆<"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "篏"
@@ -3274,8 +3272,8 @@ msgstr "荐絎"
msgid "Common preferences"
msgstr "荐絎"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "≪潟"
@@ -3393,23 +3391,23 @@ msgstr "罎膣∽絖:"
msgid "Case sensitive"
msgstr "紊ф絖/絨絖阪"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "罎膣√け"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "罎膣∽絖荀ゃ障"
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "<祉若吾障ф膣≪障緇罎膣≪障?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "<祉若吾腟障ф膣≪障紮罎膣≪障?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "罎膣√篋"
@@ -3988,7 +3986,7 @@ msgstr "篆≦POP3茯荐若茵"
msgid "Command output"
msgstr "潟潟阪"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "篁ヤ≪鴻絎"
@@ -5323,35 +5321,35 @@ msgstr ">散絖障"
msgid "Action not exist."
msgstr "≪激с潟絖障"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr ""
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "筝"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "絽"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "泣т散[...]障(...)茵腓冴"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "菴篆≧篁九[...]障(...)ゃ"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "泣"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "菴篆≧篏睡"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Reply-To:"
@@ -5834,7 +5832,7 @@ msgstr "罨<>散鴻荅峨"
msgid "Body:"
msgstr ":"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr "鴻罎膣"
@@ -5939,7 +5937,7 @@ msgstr "若罧c障障?"
msgid "Scanning folder (%s)..."
msgstr "鴻c割賢 (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "罎膣"
diff --git a/po/ko.po b/po/ko.po
index 47b0f08e..68ea7954 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 0.8.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -84,10 +84,10 @@ msgstr ""
"覦朱る `G' 貉 襯 語."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "企"
@@ -122,18 +122,6 @@ msgstr "覈 "
msgid "Delete account"
msgstr "螻 "
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr ""
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr ""
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -231,7 +219,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "譯殊襦 豢螳"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "譯殊"
@@ -371,7 +359,7 @@ msgstr "/(_D)"
msgid "E-Mail address"
msgstr "企 譯殊"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "譯殊襦"
@@ -398,16 +386,16 @@ msgstr "豢螳"
msgid "Lookup"
msgstr "谿剰鍵"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "覦 :"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "谿語^:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr " 谿語^:"
@@ -575,23 +563,23 @@ msgstr "螻旧 譯殊襦"
msgid "Personal address"
msgstr "螳 譯殊襦"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "襴"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "蟆所"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr ""
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "蟆所 れ伎朱蠏碁ゼ 燕...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "れ覯 覃讌 覲願鍵"
@@ -626,7 +614,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr ""
@@ -992,10 +980,10 @@ msgstr "覃讌%s ク讌"
msgid "Recipient is not specified."
msgstr "覦 讌讌給"
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "覃 覦"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "覈"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1027,7 +1015,7 @@ msgstr "覃讌襯 覲企 ク讌 ロ 螳 給"
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr " ID `%s' 郁屋 企 る 谿場 給."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr " 覈襯 覦蠖螳 給\n"
@@ -1036,12 +1024,18 @@ msgstr " 覈襯 覦蠖螳 給\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"覃讌 覓語 覲蟆渚 螳 給.\n"
"蠏碁 覲企手?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "譯殊襦 覲 "
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1050,147 +1044,156 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "る 覃讌襯 蟇壱 螳 給\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "覃讌襯 覲願...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr " 启襯 谿場 螳 給\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "覃讌襯 覲願 螳 給\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "焔 Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "ク讌谿曙 燕...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "覲企 :"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/蟲(_T)/(_n)"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/覃讌(_M)/誤(_E)"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "襷 "
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "蠍"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "覃 覦"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "覃讌 覲企願鍵"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "譴 覲企願鍵"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "覲企 ク讌 l伎 譴 覲企願鍵"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr " 覲願"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr " 覲願 j鍵"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "曙"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "殊 曙"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "豌覿"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr " 豌覿"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "覈"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "覈 殊 殊l給"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "ク讌蠍"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "碁 ク讌蠍磯 ク讌"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "譴覦蠖"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "蠍 譴 譴覦蠖 "
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "覦襯伎 襷 ."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "殊 蟇磯 觜給."
-#: src/compose.c:4894
+#: src/compose.c:4900
#, fuzzy
msgid "Properties"
msgstr "轟"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "語"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "蟆暑"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr " 企"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "碁 ク讌蠍 覈轟願 覦襯伎給: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1201,72 +1204,70 @@ msgstr ""
" 襦語るゼ 螳襦 譬襭蟾?\n"
"襦語 蠏碁9 企: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "襦語 蠏碁9 id: %d襯 譬襭"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr " : %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "ク讌: 覈磯 襦語る覿 レ 給\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "碁 ク讌蠍磯ゼ ろ 螳 給\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "朱 螳 給\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "危 所鍵 ろ\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "覃讌襯 覲願 l螳 給."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr " "
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr " "
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "覃讌 覯襴蠍"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "覃讌 覲企願鍵"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr " 覃讌 給. 覲蟆曙 覯襴願?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "覯襴蠍"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr " 覲願朱"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "`%s' 襴酔 蟾?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "襴酔 ."
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "豌"
@@ -1601,23 +1602,23 @@ msgstr "殊 れ 郁鍵螳 ろ給\n"
msgid "Select folder"
msgstr "启 "
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "覦 ク讌"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "覦 ク讌"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "覲企 ク讌"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "讌 ク讌"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr " 覲願"
@@ -1797,20 +1798,20 @@ msgstr ""
msgid "Delete folder"
msgstr "启 "
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "`%s' 启襯 蟇壱 螳 給."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "讌 ク讌 觜郁鍵"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "讌 ク讌 覈 覃讌襯 觜瑚?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1819,34 +1820,34 @@ msgstr ""
"`%s' 覃朱るゼ 襷襦 蟆給蟾?\n"
"(覃讌螳 ろ襦覿 蟆 )"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "覃朱るゼ 蟇壱"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "襷襦 `%s' IMAP4 螻 蟆給蟾?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "IMAP4 螻 "
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "襷襦 `%s' 伎り係襭轟 蟆給蟾?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "伎り係襭 "
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "襷襦 `%s' 伎り係襭 螻 蟆給蟾?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "伎り係襭 螻 "
@@ -1874,7 +1875,7 @@ msgstr "伎り係襭 企"
msgid "Messages"
msgstr "覃讌"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr ""
@@ -3254,7 +3255,7 @@ msgid "Send queued message(s)"
msgstr " 覲願 覃讌襯 覲企"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr ""
@@ -3319,8 +3320,8 @@ msgstr "れ"
msgid "Common preferences"
msgstr "蠍磯蓋 蟆 れ"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "螻"
@@ -3438,23 +3439,23 @@ msgstr "谿場 覓語:"
msgid "Case sensitive"
msgstr " 覓語 蟲覲"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "谿剰鍵 ろ"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "谿城 覓語伎 覦蟆給."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "覃讌 襷 給; 螻蟾?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "覃讌 給; 覿覿 螻蟾?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "谿剰鍵螳 襭"
@@ -4037,7 +4038,7 @@ msgstr "覲企願鍵 POP3 語"
msgid "Command output"
msgstr "覈轟"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "れ 譯殊襯 朱 "
@@ -5382,36 +5383,36 @@ msgstr "覈轟 讌讌"
msgid "Action not exist."
msgstr "%s: 殊 給\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
#, fuzzy
msgid "Folder properties"
msgstr "启 轟"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "朱"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "覲危"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr " 启 "
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr " "
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "譯殊:"
@@ -5890,7 +5891,7 @@ msgstr "れ 譯殊襯 朱 "
msgid "Body:"
msgstr "覲碁:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -5996,7 +5997,7 @@ msgstr "螳 給. 蠏瑚れ 豌襴蟾?"
msgid "Scanning folder (%s)..."
msgstr "启(%s)襯 れ..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "れ 谿剰鍵"
@@ -6284,6 +6285,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "%s襦 郁鍵螳 ろ給.\n"
+#~ msgid "Yes"
+#~ msgstr ""
+
+#~ msgid "+No"
+#~ msgstr ""
+
+#~ msgid "Discard message"
+#~ msgstr "覃讌 覯襴蠍"
+
+#~ msgid "Discard"
+#~ msgstr "覯襴蠍"
+
+#~ msgid "to Draft"
+#~ msgstr " 覲願朱"
+
#~ msgid "can't write headers\n"
#~ msgstr "る襯 螳 給\n"
diff --git a/po/lt.po b/po/lt.po
index 242d5b60..5d8e570c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -96,10 +96,10 @@ msgstr ""
"skulpelyje G jei norite gauti 転inutes pasirink Gauti visus."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Vardas"
@@ -133,18 +133,6 @@ msgstr "(Bevardis)"
msgid "Delete account"
msgstr "Pa邸alinti sskait"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Taip"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Ne"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -244,7 +232,7 @@ msgstr "Vartotojo veiksmo argumentas"
msgid "Add Address to Book"
msgstr "町dti adres 眺 knyg"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adresas"
@@ -384,7 +372,7 @@ msgstr "/_I邸trinti"
msgid "E-Mail address"
msgstr "El. pa邸to adresas"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adres迭 knyga"
@@ -411,16 +399,16 @@ msgstr "Pridti"
msgid "Lookup"
msgstr "Ie邸koti"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Kam:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Kopija:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Slapta kopija:"
@@ -590,23 +578,23 @@ msgstr "Bendras adresas"
msgid "Personal address"
msgstr "Asmeninis adresas"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Prane邸imas"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "町spjimas"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Klaida"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Sukuriamas prane邸imo langas...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Rodyti 邸眺 prane邸im kit kart"
@@ -641,7 +629,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Nieko"
@@ -973,10 +961,10 @@ msgstr "Ra邸yti lai邸k%s"
msgid "Recipient is not specified."
msgstr "Nenurodytas gavjas."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Si迭sti"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Tema"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1008,21 +996,27 @@ msgstr "Negaliu i邸saugoti 転inuts outbox."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Nerandu rakto susieto su pasirinktu rakto ID %s."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "negaliu pakeisti bylos r転imo\n"
#: src/compose.c:2670
-#, c-format
+#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Negaliu konvertuoti simboli迭 koduots i邸 %s 眺 %s.\n"
"Ar si迭sti kaip %s?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Adres迭 knygos konvertavimo klaida"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1035,144 +1029,153 @@ msgstr ""
"\n"
"Ar tikrai norite j i邸si迭sti?"
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "Negaliu pa邸alinti senos 転inuts\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "貼inut dedama 眺 eil\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "Negaliu rasti eils (queue) katalogo\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "Negaliu 眺dti 転inuts 眺 eil\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "sugeneruotas Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Sukuriamas lai邸ko k笛rimo langas...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Nuo:"
-#: src/compose.c:3947
+#: src/compose.c:3953
msgid "PGP Sign"
msgstr "PGP para邸as"
-#: src/compose.c:3950
+#: src/compose.c:3956
msgid "PGP Encrypt"
msgstr "PGP 邸ifravimas"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME tipas"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Dydis"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Si迭sti"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Si迭sti 転inut"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Si迭sti vliau"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "町dti 眺 eil ir si迭sti vliau"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Juodra邸tis"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "I邸saugoti 眺 juodra邸i迭 katalog"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "町terpti"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "町terpti byl"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Prisegti"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Prisegti byl"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Para邸as"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "町terpti para邸"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Redaktorius"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Naudoti i邸orin眺 redaktori迭"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Eilui迭 lau転ymas"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Lau転yti ilgas eilutes"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Neteisingas MIME tipas"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Byla neegzistuoja arba yra tu邸ia."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Savybs"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Koduot"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Kelias"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Bylos vardas"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Neteisinga i邸orinio redaktoriaus komanda: %s\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1183,71 +1186,69 @@ msgstr ""
"Nutraukti proces?\n"
"proceso grups id: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Nutraukto proceso grups id: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Laikina byla: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Ra邸ymas: 眺vestis i邸 pri転i笛rimo proceso\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Negaliu paleisti i邸orinio redaktoriaus\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Negaliu ra邸yti 眺 byl\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Pipe skaitymas nepavyko\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Negaliu 眺dti 転inuts 眺 eil."
-#: src/compose.c:5613
+#: src/compose.c:5621
msgid "Select files"
msgstr "貼ymti bylas"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "貼ymti byl"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Nesaugoti 転inuts"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Si迭sti 転inut"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "貼inut buvo redaguota. Nesaugoti?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Nesaugoti"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "眺 Juodra邸ius"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Ar norite naudoti 邸ablon %s?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Naudoti 邸ablon"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Pakeisti"
@@ -1582,23 +1583,23 @@ msgstr "nepavyko 眺ra邸yti 眺 byl\n"
msgid "Select folder"
msgstr "Pasirinkti katalog"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Gaunami"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "I邸si迭sti"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Eil"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "iuk邸lin"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Juodra邸iai"
@@ -1776,20 +1777,20 @@ msgstr ""
msgid "Delete folder"
msgstr "I邸trinti katalog"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Negaliu pa邸alinti katalogo %s"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "I邸valyti 邸iuk邸lin"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "I邸trinti visas 転inutes 邸iuk邸linje?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1798,34 +1799,34 @@ msgstr ""
"Ar tikrai pa邸alinti d転ut %s ?\n"
"(転inuts NEBUS i邸trintos i邸 disko)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Pa邸alinti d転ut"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Ar tikrai i邸trinti IMAP4 sskait %s?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "I邸trinti IMAP4 sskait"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Ar tikrai i邸trinti naujien迭 grup %s?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "I邸trinti naujien迭 grup"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Ar tikrai pa邸alinti naujien迭 sskait %s?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Pa邸alinti naujien迭 sskait"
@@ -1853,7 +1854,7 @@ msgstr "Naujien迭 grups pavadinimas"
msgid "Messages"
msgstr "貼inuts"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tipas"
@@ -3206,7 +3207,7 @@ msgid "Send queued message(s)"
msgstr "Si迭sti lai邸kus eilje"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Ra邸yti"
@@ -3270,8 +3271,8 @@ msgstr "Nustatymai"
msgid "Common preferences"
msgstr "Bendri nustatymai"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Sskaita"
@@ -3389,23 +3390,23 @@ msgstr "Rasti tekst:"
msgid "Case sensitive"
msgstr "Skirti did転isias-ma転sias raides"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Paie邸ka nepavyko"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Ie邸komas tekstas nerastas."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Pasiekta 転inuts prad転ia; tsti nuo pabaigos?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Pasiekta 転inuts pabaiga; tsti nuo prad転ios?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Paie邸ka baigta"
@@ -3985,7 +3986,7 @@ msgstr "Prie邸 siuniant patikrinti autenti邸kum su POP3"
msgid "Command output"
msgstr "Komandos i邸vestis"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automati邸kai nustatyti sekanius adresus"
@@ -5321,35 +5322,35 @@ msgstr "Slyga neegzistuoja."
msgid "Action not exist."
msgstr "Veiksmas neegzistuoja."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Katalogo savybs"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Bendras"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "町prastas"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Nerodyti [...] arba (...) temos prad転ioje santraukoje"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Atsakant i邸trinti [...] arba (...) temos prad転ioje"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Pritaikyti ir pakatalogiams"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "naudoti ir atsakant"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Atsakyti kam:"
@@ -5832,7 +5833,7 @@ msgstr "Jei teisingi visi"
msgid "Body:"
msgstr "Tekstas:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr "Rasti visas"
@@ -5937,7 +5938,7 @@ msgstr "Palikta 転ymi迭. Vykdyti jas?"
msgid "Scanning folder (%s)..."
msgstr "Skanuojamas katalogas (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Ie邸koti dar kart"
@@ -6220,6 +6221,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "nepavyko 眺ra邸yti 眺 %s.\n"
+#~ msgid "Yes"
+#~ msgstr "Taip"
+
+#~ msgid "+No"
+#~ msgstr "+Ne"
+
+#~ msgid "Discard message"
+#~ msgstr "Nesaugoti 転inuts"
+
+#~ msgid "Discard"
+#~ msgstr "Nesaugoti"
+
+#~ msgid "to Draft"
+#~ msgstr "眺 Juodra邸ius"
+
#~ msgid "can't write headers\n"
#~ msgstr "negaliu 眺ra邸yti antra邸i迭\n"
diff --git a/po/nl.po b/po/nl.po
index f8c9a01f..11c66f0a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 0.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2003-02-18 13:03--100\n"
"Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
"Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -99,10 +99,10 @@ msgstr ""
"u op de knop 'Alles ophalen' klikt."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Naam"
@@ -137,18 +137,6 @@ msgstr "Geen titel"
msgid "Delete account"
msgstr "Account verwijderen"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Ja"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nee"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -246,7 +234,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "Adres toevoegen aan adresboek"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adres"
@@ -386,7 +374,7 @@ msgstr "/Ver_wijderen"
msgid "E-Mail address"
msgstr "E-mail adres"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adresboek"
@@ -413,16 +401,16 @@ msgstr "Toevoegen"
msgid "Lookup"
msgstr "Zoeken"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Aan:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -596,23 +584,23 @@ msgstr "Algemene adressen"
msgid "Personal address"
msgstr "Persoonlijke adressen"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Bericht"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Waarschuwing"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Fout"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Waarschuwingsdialoog wordt gemaakt...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Dit bericht de volgende keer weergeven"
@@ -647,7 +635,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Geen"
@@ -1012,10 +1000,10 @@ msgstr "Bericht opstellen%s"
msgid "Recipient is not specified."
msgstr "Ontvanger is niet gespecificeerd."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Verzenden"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Onderwerp"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1047,7 +1035,7 @@ msgstr "Het bericht kan niet opgeslagen worden in de outbox."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Kon gee bijpassende sleutel vinden voor geselecteerde sleutel-id `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "kan de bestandmodus niet veranderen\n"
@@ -1056,13 +1044,19 @@ msgstr "kan de bestandmodus niet veranderen\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Kan de tekenset van het bericht niet omzetten van\n"
"%s naar %s.\n"
"Toch versturen?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Adresboek omzetprobleem"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1071,146 +1065,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "kan het oude bericht niet verwijderen\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "bericht wordt in de wachtrij geplaatst...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "kan de Wachtrij-map niet vinden\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "kan het bericht niet in de wachtrij plaatsen\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "gegenereerd bericht-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Afzender:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Gereedschap/A_cties"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/Be_richt/Codeer"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME type"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Grootte"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Verzenden"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Verzend bericht"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Wachtrij"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "In de wachtrij plaatsen en later verzenden"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Klad"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Opslaan als klad"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Invoegen"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Bestand invoegen"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Bijvoegen"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Bestand bijvoegen"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Tekenen"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Handtekening (signature) invoegen"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Bewerken met ander (extern) programma"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Terugloop"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Lange regels op meerdere regels zetten"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Ongeldig MIME type."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Bestand bestaat niet of is leeg."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Eigenschappen"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Codering"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Pad"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Bestandsnaam"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "De ingegeven opdracht voor de externe editor is onjuist: '%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1221,72 +1224,70 @@ msgstr ""
"Zal ik het programma afbreken?\n"
"procesgroep id: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Programma (id: %d) afgebroken."
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Tijdelijk bestand: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Opstellen: invoer van \"monitoring process\"\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Kon het externe programma voor bewerken van e-mail niet aanroepen\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Kon niet naar bestand schrijven\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Inlezen van pijp mislukt\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Kan bericht niet in de wachtrij plaatsen."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Selecteer bestand"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Selecteer bestand"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Gooi bericht weg"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Verzend bericht"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Dit bericht is aangepast. weggooien?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Gooi weg"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "opslaan als klad"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Wilt u het sjabloon '%s' toepassen?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Sjabloon toepassen"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Vervangen"
@@ -1623,23 +1624,23 @@ msgstr "opslaan van de configuratie is mislukt\n"
msgid "Select folder"
msgstr "Selecteer map"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Inbox"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Verzonden"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Wachtrij"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Prullenbak"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Klad"
@@ -1819,20 +1820,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Verwijder map"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Kan map '%s' niet verwijderen."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Prullenbak leegmaken"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Alle berichten uit de prullenbak weggooien?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1841,34 +1842,34 @@ msgstr ""
"Wilt u de '%s' mailbox werkelijk verwijderen?\n"
"(De berichten zelf zullen NIET van de schijf worden verwijderd)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "mailbox verwijderen"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "IMAP4 account '%s' werkelijk verwijderen?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Verwijder IMAP4 account"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Verwijder nieuwsgroep"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Verwijder nieuwsaccount"
@@ -1896,7 +1897,7 @@ msgstr "Nieuwsgroep naam"
msgid "Messages"
msgstr "Berichten"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Type"
@@ -3283,7 +3284,7 @@ msgid "Send queued message(s)"
msgstr "Verzend berichten uit de wachtrij"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Opstellen"
@@ -3348,8 +3349,8 @@ msgstr "Voork."
msgid "Common preferences"
msgstr "Algemene voorkeuren"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Account"
@@ -3467,23 +3468,23 @@ msgstr "Zoek naar:"
msgid "Case sensitive"
msgstr "Hoofdlettergevoelig"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Zoeken mislukt"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Opgegeven tekst niet gevonden"
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Begin van het bericht bereikt; verdergaan vanaf het einde?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Einde van het bericht bereikt; verdergaan vanaf het begin?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Zoeken voltooid"
@@ -4071,7 +4072,7 @@ msgstr "Identificatie met POP3 voor het verzenden"
msgid "Command output"
msgstr "Opdracht"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Stel automatisch de volgende adressen in"
@@ -5454,38 +5455,38 @@ msgstr "Opdrachtregel is niet ingesteld."
msgid "Action not exist."
msgstr "%s: bestand bestaat niet\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Mapeigenschappen"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Algemeen"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normaal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
"Geen [...] of (...) weergeven aan het begin van het onderwerp in de "
"berichtenlijst"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
"[...] of (...) verwijderen aan het begin van het onderwerp bij beantwoorden"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Toepassen op submappen"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "ook gebruiken bij beantwoorden"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Antwoord-Aan:"
@@ -5967,7 +5968,7 @@ msgstr "Stel automatisch de volgende adressen in"
msgid "Body:"
msgstr "Inhoud:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6073,7 +6074,7 @@ msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
msgid "Scanning folder (%s)..."
msgstr "Bezig met inlezen van map (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Opnieuw zoeken"
@@ -6362,6 +6363,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "schrijven naar %s is mislukt.\n"
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "+No"
+#~ msgstr "+Nee"
+
+#~ msgid "Discard message"
+#~ msgstr "Gooi bericht weg"
+
+#~ msgid "Discard"
+#~ msgstr "Gooi weg"
+
+#~ msgid "to Draft"
+#~ msgstr "opslaan als klad"
+
#~ msgid "can't write headers\n"
#~ msgstr "kan geen headers schrijven\n"
diff --git a/po/pl.po b/po/pl.po
index ac8d6a32..59f6642d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 1.9.8 \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2005-03-05 18:57+0100\n"
"Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
"Language-Team: POLISH <pl@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
"w kolumnie \"G\" konta, kt坦re maj by sprawdzone przez 'Odbierz wsz.'"
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nazwa"
@@ -132,18 +132,6 @@ msgstr "(Nienazwany)"
msgid "Delete account"
msgstr "Usu konto"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Tak"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nie"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -243,7 +231,7 @@ msgstr "Argumenty u甜ytkownika dla akcji"
msgid "Add Address to Book"
msgstr "Dodaj do ksi甜ki adresowej"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adres"
@@ -383,7 +371,7 @@ msgstr "/_Usu"
msgid "E-Mail address"
msgstr "Adres e-mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Ksi甜ka adresowa"
@@ -410,16 +398,16 @@ msgstr "Dodaj"
msgid "Lookup"
msgstr "Wyszukaj"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Do:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Kopia:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Ukryta kopia:"
@@ -595,23 +583,23 @@ msgstr "Wsp坦lny adres:"
msgid "Personal address"
msgstr "Osobisty adres:"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Notatka"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Ostrze甜enie"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Bd"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Tworzenie panelu z ostrze甜eniami...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Wywietl t wiadomo nastpnym razem"
@@ -646,7 +634,7 @@ msgstr "Brzowy"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Brak"
@@ -978,10 +966,10 @@ msgstr "Utw坦rz wiadomo%s"
msgid "Recipient is not specified."
msgstr "Nie podano odbiorcy."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Wylij"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Temat"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1014,21 +1002,27 @@ msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
"Nie mo甜na znale添 klucza zwizanego z wybranym identyfikatorem klucza \"%s\"."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "nie mo甜na zmieni trybu pliku\n"
#: src/compose.c:2670
-#, c-format
+#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Nie mo甜na przekonwertowa treci wiadomoci z %s na %s.\n"
"Wysa wiadomo mimo to %s ?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Bd konwersji ksi甜ki adresowej"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1037,144 +1031,153 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "Nie mo甜na usun starej wiadomoci\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "kolejkowanie wiadomoci...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "nie mo甜na znale添 katalogu kolejki\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "nie mo甜na zapisa wiadomoci do kolejki\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "wygenerowany Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Tworzenie okna edycji...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Od:"
-#: src/compose.c:3947
+#: src/compose.c:3953
msgid "PGP Sign"
msgstr "Podpis PGP"
-#: src/compose.c:3950
+#: src/compose.c:3956
msgid "PGP Encrypt"
msgstr "Szyfrowanie PGP"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "typ MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Rozmiar"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Wylij"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Wylij wiadomo"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Wylij p坦添niej"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Umie w katalogu kolejki i wylij p坦添niej"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Draft"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Zapisz w katalogu szablon坦w"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Wstaw"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Wstaw plik"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Docz"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Docz plik"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Podpis"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Wstaw podpis"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Edytor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Edytuj w zewntrznym edytorze"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Zawijanie linii"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Zawijaj wszystkie dugie linie"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Niepoprawny typ MIME."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Brak pliku lub pusty plik."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Waciwoci"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Kodowanie"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "cie甜ka"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Nazwa pliku"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Niepoprawna linia wywoania zewntrznego edytora: \"%s\"\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1185,71 +1188,69 @@ msgstr ""
"Czy wymusi zakoczenie procesu?\n"
"identyfikator grupy proces坦w: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Identyfikator zakoczonej grupy proces坦w: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Plik tymczasowy: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Edycja: wejcie z procesu monitorujcego\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Nie mo甜na uruchomi zewntrznego edytora\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Nie mo甜na zapisa do pliku\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Bdny odczyt z potoku\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Nie mo甜na wstawi wiadomoci do kolejki."
-#: src/compose.c:5613
+#: src/compose.c:5621
msgid "Select files"
msgstr "Wybierz pliki"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Wybierz plik"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Porzu wiadomo"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Wylij wiadomo"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Wiadomo zostaa zmieniona, czy porzuci j?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Porzu"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "do Draft"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Czy chcesz zastosowa szablon \"%s\"?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Zastosuj szablon"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Zamie"
@@ -1584,23 +1585,23 @@ msgstr "bd podczas zapisu konfiguracji do pliku\n"
msgid "Select folder"
msgstr "Wybierz katalog"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Odebrane"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Wysane"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Kolejka"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "mietnik"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Szablony"
@@ -1777,20 +1778,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Usu katalog"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Nie mo甜na usun katalogu \"%s\"."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Opr坦甜nij mietnik"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Czy usun wszystkie wiadomoci ze mietnika?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1799,34 +1800,34 @@ msgstr ""
"Czy naprawd usun skrzynk \"%s\" ?\n"
"(Wiadomoci NIE zostan usunite z dysku)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Usu skrzynk"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Czy naprawd chcesz usun konto IMAP4 \"%s\" ?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Usu konto IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Czy naprawd chcesz usun grup dyskusyjn \"%s\"?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Usu grup dyskusyjn"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Czy naprawd chcesz usun konto grup dyskusyjnych \"%s\"?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Usu konto grup dyskusyjnych"
@@ -1854,7 +1855,7 @@ msgstr "Nazwa grupy dyskusyjnej:"
msgid "Messages"
msgstr "Wiadomoci"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Typ"
@@ -3205,7 +3206,7 @@ msgid "Send queued message(s)"
msgstr "Wylij wiadomoci z kolejki"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Utw坦rz"
@@ -3270,8 +3271,8 @@ msgstr "Preferencje"
msgid "Common preferences"
msgstr "Wsp坦lne preferencje "
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Konto"
@@ -3389,23 +3390,23 @@ msgstr "Znajd添 tekst:"
msgid "Case sensitive"
msgstr "Rozr坦甜nianie wielkoci liter"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Bd wyszukiwania"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Nie znaleziono szukanego cigu."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Osignito pocztek wiadomoci; czy kontynuowa od koca?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Osignito koniec wiadomoci; czy kontynuowa od pocztku?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Przeszukiwanie zakoczone"
@@ -3984,7 +3985,7 @@ msgstr "Uwierzytelnianie POP3 przed wysyaniem"
msgid "Command output"
msgstr "Wyjcie polecenia"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automatyczne ustawianie nastpujcych adres坦w"
@@ -5326,35 +5327,35 @@ msgstr "Nie ustawiono polecenia."
msgid "Action not exist."
msgstr "Akcja nie istnieje."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Waciwoci katalogu"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Og坦lne"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Zwyke"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Nie wywietlaj [...] lub (...) na pocztku tematu przy podsumowaniu"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Usu [...] lub (...) z pocztku tematu przy odpowiedzi"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Stosowane tak甜e do podkatalog坦w"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "u甜ycie tak甜e przy odpowiadaniu"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Adres zwrotny:"
@@ -5834,7 +5835,7 @@ msgstr "Dopasuj wszystkie"
msgid "Body:"
msgstr "Ciao:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -5940,7 +5941,7 @@ msgstr "brak niekt坦rych znacznik坦w, czy wykona ?"
msgid "Scanning folder (%s)..."
msgstr "Skanowanie katalogu (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Szukaj ponownie"
@@ -6240,6 +6241,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "bd zapisu do %s.\n"
+#~ msgid "Yes"
+#~ msgstr "Tak"
+
+#~ msgid "+No"
+#~ msgstr "+Nie"
+
+#~ msgid "Discard message"
+#~ msgstr "Porzu wiadomo"
+
+#~ msgid "Discard"
+#~ msgstr "Porzu"
+
+#~ msgid "to Draft"
+#~ msgstr "do Draft"
+
#~ msgid "can't write headers\n"
#~ msgstr "nie mo甜na zapisa nag坦wk坦w\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d5f4798e..03b96038 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2005-07-04 07:54-0300\n"
"Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
"Language-Team: Andr辿 Casteliano <digitalcoder@users.sourceforge.net> Isa鱈as "
@@ -98,10 +98,10 @@ msgstr ""
"na coluna `G' para habilitar essa caixa no `Baixar tudo'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nome"
@@ -135,18 +135,6 @@ msgstr "(Sem t鱈tulo)"
msgid "Delete account"
msgstr "Apagar conta"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Sim"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+N達o"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -246,7 +234,7 @@ msgstr "Argumento do usu叩rio para a a巽達o"
msgid "Add Address to Book"
msgstr "Adicionar ao Cat叩logo de Endere巽os"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Endere巽o"
@@ -386,7 +374,7 @@ msgstr "/_Apagar"
msgid "E-Mail address"
msgstr "Endere巽o de e-mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Cat叩logo de endere巽os"
@@ -413,16 +401,16 @@ msgstr "Adicionar"
msgid "Lookup"
msgstr "Procurar"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Para:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Cco:"
@@ -597,23 +585,23 @@ msgstr "Endere巽os comuns"
msgid "Personal address"
msgstr "Endere巽os pessoais"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Notifica巽達o"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Erro"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Criando a tela de alerta...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Mostrar essa mensagem da pr坦xima vez"
@@ -648,7 +636,7 @@ msgstr "Marrom"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Nenhuma"
@@ -980,10 +968,10 @@ msgstr "Compondo mensagem%s"
msgid "Recipient is not specified."
msgstr "Destinat叩rio n達o especificado."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Enviar"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Assunto"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1015,22 +1003,28 @@ msgstr "N達o foi poss鱈vel armazenar a mensagem na caixa de sa鱈da."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "N達o foi poss鱈vel obter nenhuma chave associada ao ID selecionado '%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "n達o foi poss鱈vel modificar as permiss探es do arquivo\n"
#: src/compose.c:2670
-#, c-format
+#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"N達o foi poss鱈vel converter a codifica巽達o de caracteres do corpo da mensagem "
"de %s para %s.\n"
"Enviar como %s assim mesmo?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Erro convertendo cat叩logo de endere巽os"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1043,144 +1037,153 @@ msgstr ""
"\n"
"Enviar mesmo assim?"
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "n達o posso remover a mensagem antiga\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "enfileirando mensagem...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "n達o foi poss鱈vel encontrar a pasta da fila\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "n達o foi poss鱈vel enfileirar a mensagem\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "Message-ID gerado: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Criando janela de composi巽達o...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "De:"
-#: src/compose.c:3947
+#: src/compose.c:3953
msgid "PGP Sign"
msgstr "Assinar (PGP)"
-#: src/compose.c:3950
+#: src/compose.c:3956
msgid "PGP Encrypt"
msgstr "Encriptar (PGP)"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "Tipo MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Tamanho"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Enviar"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Enviar mensagem"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Enviar depois"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "P担r na 'fila de sa鱈da' e enviar depois"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Rascunho"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Salvar na pasta Rascunho"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Inserir"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Inserir arquivo"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Anexar"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Anexar arquivo"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Assinatura"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Inserir assinatura"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Editar com um editor externo"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Quebra de linha"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Quebrar todas as linhas compridas"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Tipo MIME inv叩lido."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "O arquivo n達o existe ou est叩 vazio."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Propriedades"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Codifica巽達o"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Caminho"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Nome do arquivo"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Linha de comando do editor externo inv叩lida: '%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1191,71 +1194,69 @@ msgstr ""
"Deseja matar o processo?\n"
"Id. do grupo do processo : %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Terminado grupo de processo id.: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Arquivo tempor叩rio: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Compositor: entrada para monitorar processo\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "N達o foi poss鱈vel executar o editor externo\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "N達o foi poss鱈vel gravar o arquivo\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Erro ao ler do pipe\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "N達o foi poss鱈vel enfileirar a mensagem."
-#: src/compose.c:5613
+#: src/compose.c:5621
msgid "Select files"
msgstr "Selecionar arquivos"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Selecionar arquivo"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Descartar mensagem"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Enviar mensagem"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Esta mensagem foi modificada. Deseja descart叩-la ?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Descartar"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "Rascunho"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Quer aplicar o modelo `%s'?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Aplicar Modelo"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Substituir"
@@ -1593,23 +1594,23 @@ msgstr "falhou ao gravar a configura巽達o no arquivo\n"
msgid "Select folder"
msgstr "Selecione uma pasta"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Caixa de Entrada"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Enviadas"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Fila de sa鱈da"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Lixeira"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Rascunhos"
@@ -1787,20 +1788,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Apagar pasta"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "n達o foi poss鱈vel excluir a pasta `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Esvaziar lixeira"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Limpar todas as mensagens na lixeira ?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1809,34 +1810,34 @@ msgstr ""
"Realmente remover a caixa de correio `%s' ?\n"
"(As mensagens NO s達o apagadas do disco)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Remover caixa de correio"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Realmente apagar conta IMAP4 `%s' ?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Apagar conta IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Realmente apagar o grupo de not鱈cias `%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Apagar grupo de not鱈cias"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Realmente apagar o grupo de not鱈cias `%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Apagar conta de grupo de not鱈cias"
@@ -1864,7 +1865,7 @@ msgstr "Nome do Grupos de Not鱈cias:"
msgid "Messages"
msgstr "Mensagens"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tipo"
@@ -3219,7 +3220,7 @@ msgid "Send queued message(s)"
msgstr "Enviar Mensagem(s) da fila"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Escrever"
@@ -3283,8 +3284,8 @@ msgstr "Prefer棚ncias"
msgid "Common preferences"
msgstr "Prefer棚ncias comuns"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Conta"
@@ -3402,23 +3403,23 @@ msgstr "Encontrar texto:"
msgid "Case sensitive"
msgstr "Mai炭s./min炭s."
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Erro na procura"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "String de busca n達o encontrada."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "In鱈cio da mensagem atingido; come巽ar do final?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Fim da mensagem atingido; continuar do in鱈cio?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Procura conclu鱈da"
@@ -3998,7 +3999,7 @@ msgstr "Autenticar com POP3 antes de enviar"
msgid "Command output"
msgstr "Sa鱈da de comando"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Estabelecer os seguintes endere巽os automaticamente"
@@ -5342,35 +5343,35 @@ msgstr "Condi巽達o inexistente."
msgid "Action not exist."
msgstr "A巽達o inexistente."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Propriedades da pasta"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Geral"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "N達o mostrar [...] ou (...) no in鱈cio do assunto no sum叩rio"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Remover [...] ou (...) do come巽o do assunto na resposta"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Aplicar nas subpastas"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "Usar tamb辿m ao responder"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Responder para:"
@@ -5854,7 +5855,7 @@ msgstr "Casar todos os seguintes"
msgid "Body:"
msgstr "Corpo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr "Encontrar todos"
@@ -5959,7 +5960,7 @@ msgstr "Algumas marcas foram deixadas. Process叩-las?"
msgid "Scanning folder (%s)..."
msgstr "Revisando pasta (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Procurar novamente"
@@ -6242,6 +6243,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "erro ao gravar em %s.\n"
+#~ msgid "Yes"
+#~ msgstr "Sim"
+
+#~ msgid "+No"
+#~ msgstr "+N達o"
+
+#~ msgid "Discard message"
+#~ msgstr "Descartar mensagem"
+
+#~ msgid "Discard"
+#~ msgstr "Descartar"
+
+#~ msgid "to Draft"
+#~ msgstr "Rascunho"
+
#~ msgid "can't write headers\n"
#~ msgstr "n達o foi poss鱈vel escrever o cabe巽alho\n"
diff --git a/po/ro.po b/po/ro.po
index b06ec1cc..1a6364fd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2000-08-28\n"
"Last-Translator: Little Dragon <littledragon@altern.org>\n"
"Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -101,10 +101,10 @@ msgstr ""
"mesajelor de comanda `Ia tot'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Nume"
@@ -140,18 +140,6 @@ msgstr "Neintitulat"
msgid "Delete account"
msgstr "tergere cont"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Da"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nu"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -246,7 +234,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "Adugare 樽n agend"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adres"
@@ -391,7 +379,7 @@ msgstr "/_tergere"
msgid "E-Mail address"
msgstr "Adres E-Mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Agend"
@@ -418,16 +406,16 @@ msgstr "Adugare"
msgid "Lookup"
msgstr "Cutare"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "La:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -603,23 +591,23 @@ msgstr "Adresse comun:"
msgid "Personal address"
msgstr "Adresse personal:"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Informa釘ie"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Avertisment"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Eroare"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Creare dialog de avertisment...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Acest mesaj va aprea i data viitoare"
@@ -654,7 +642,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Niciunul"
@@ -1027,10 +1015,10 @@ msgstr "Compunere mesaj%s"
msgid "Recipient is not specified."
msgstr "Destinatarul nu a fost specificat."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Trimitere"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Subiect"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1062,7 +1050,7 @@ msgstr "Salvarea mesajului 樽n outbox este imposibil."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "schimbarea permisiunilor fiierului este imposibil\n"
@@ -1071,10 +1059,16 @@ msgstr "schimbarea permisiunilor fiierului este imposibil\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr "Convertirea codificrii mesajului este imposibil."
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Eroare de convertire a agendei"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1083,148 +1077,157 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "tergerea mesajului vechi a euat\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "punere mesaj 樽n lista de ateptare...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
#, fuzzy
msgid "can't find queue folder\n"
msgstr "directorul nu a putut fi selectat: %s\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "punerea mesajului 樽n lista de ateptare este imposibil\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "Message-ID creat: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Creare fereastra de compunere...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "De la:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/E_xecutare"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Message/Cr_iptare"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "Tip MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Dimensiune"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Trimitere"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Trimitere mesaj"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Mai t但rziu"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Punere 樽n lista de ateptare i trimitere mai t但rziu"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Salvare"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Salvare"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Inserare"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Isertion fiier"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Ataament"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Ataare fiier"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Semntur"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Inserare semntur"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Editare cu editor extern"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Tiere linii"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Tiere toate liniile lungi"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Tip MIME invalid."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Fiierul nu exist sau este gol."
-#: src/compose.c:4894
+#: src/compose.c:4900
#, fuzzy
msgid "Properties"
msgstr "Proprietate"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Codare"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Cale"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Numele fiierului"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Linia de comand este invalid: '%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1235,73 +1238,71 @@ msgstr ""
"Dori釘i terminarea for釘at a procesului ?\n"
"process group id: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Procesul a fost terminat: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Fiier temporar: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Compunere: introducere din proces monitorizat\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Editorul extern nu poate fi executat\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Scrierea 樽n fiier este imposibil\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Citirea din pipe a euat\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Este imposibil punerea mesajului 樽n lista de ateptare."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Selectare fiier"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Selectare fiier"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Anulare mesaj"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Trimitere mesaj"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Acest mesaj a fost modificat. Dori釘i sa anula釘i schimbrile ?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Anulare schimbri"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "Salvare"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, fuzzy, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Sunte釘i sigur c dori釘i s terge釘i aceast regul ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
#, fuzzy
msgid "Apply template"
msgstr "tergere mesaj"
-#: src/compose.c:5717
+#: src/compose.c:5726
#, fuzzy
msgid "Replace"
msgstr "/_Utilitare/_Modele"
@@ -1639,24 +1640,24 @@ msgstr "scrierea configura釘ie 樽n fiier a euat\n"
msgid "Select folder"
msgstr "Selectare director"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Inbox"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
#, fuzzy
msgid "Sent"
msgstr "Trimitere"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Lista de ateptare"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Gunoi"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
#, fuzzy
msgid "Drafts"
msgstr "Salvare"
@@ -1846,21 +1847,21 @@ msgstr ""
msgid "Delete folder"
msgstr "tergere director"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, fuzzy, c-format
msgid "Can't remove the folder `%s'."
msgstr "Directorul `%s' nu a putut fi creat."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr ""
-#: src/folderview.c:2183
+#: src/folderview.c:2184
#, fuzzy
msgid "Empty all messages in trash?"
msgstr "Dori釘i tergerea tuturor mesajelor din gunoi ?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, fuzzy, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1869,35 +1870,35 @@ msgstr ""
"Sunte釘i sigur c dori釘i s terge釘i cutia potal '%s'\n"
"(Mesajele NU sunt terse de pe disc)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
#, fuzzy
msgid "Remove mailbox"
msgstr "/tergere _cutie potal"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Sunte釘i sigur c dori釘i tergerea contului IMAP4 '%s' ?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "tergere cont IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Sunte釘i sigur c dori釘i tergerea newsgroupului '%s' ?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "tergere newsgroup"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Sunte釘i sigur c dori釘i tergerea contului de news '%s' ?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "tergere cont de news"
@@ -1925,7 +1926,7 @@ msgstr "Nume newsgroup"
msgid "Messages"
msgstr "Mesaje"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tip"
@@ -3400,7 +3401,7 @@ msgid "Send queued message(s)"
msgstr "Trimiterea mesajului(lor) din lista de ateptare"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Creare"
@@ -3465,8 +3466,8 @@ msgstr "Preferin釘e"
msgid "Common preferences"
msgstr "Preferin釘e comune"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Cont"
@@ -3585,25 +3586,25 @@ msgstr ""
msgid "Case sensitive"
msgstr "Distinc釘ie minuscule/majuscule"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Cutarea a euat"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Textul cutat nu a fost gsit."
-#: src/message_search.c:210
+#: src/message_search.c:211
#, fuzzy
msgid "Beginning of message reached; continue from end?"
msgstr "S-a atins prima linie din list; continua釘i de la sf但rit ?"
-#: src/message_search.c:213
+#: src/message_search.c:214
#, fuzzy
msgid "End of message reached; continue from beginning?"
msgstr "S-a atins sf但ritul listei; continua釘i de la 樽nceput ?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Cutarea a luat sf但rit"
@@ -4196,7 +4197,7 @@ msgstr ""
msgid "Command output"
msgstr "Command"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
#, fuzzy
msgid "Automatically set the following addresses"
msgstr "Setare automat a adreselor urmtoare"
@@ -5595,37 +5596,37 @@ msgstr "Antetul nu a fost definit."
msgid "Action not exist."
msgstr "%s: fiierul nu exist\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
#, fuzzy
msgid "Folder properties"
msgstr "Proprietate"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr ""
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
#, fuzzy
msgid "Normal"
msgstr "Mod Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr ""
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr ""
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Rspuns La:"
@@ -6139,7 +6140,7 @@ msgstr "Setare automat a adreselor urmtoare"
msgid "Body:"
msgstr ""
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6254,7 +6255,7 @@ msgstr "Au mai rmas nite marcaje. Dori釘i s fie procesate ?"
msgid "Scanning folder (%s)..."
msgstr "Scanare director (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
#, fuzzy
msgid "Search again"
msgstr "Cutarea a euat"
@@ -6572,6 +6573,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "scrierea 樽n %s a euat.\n"
+#~ msgid "Yes"
+#~ msgstr "Da"
+
+#~ msgid "+No"
+#~ msgstr "+Nu"
+
+#~ msgid "Discard message"
+#~ msgstr "Anulare mesaj"
+
+#~ msgid "Discard"
+#~ msgstr "Anulare schimbri"
+
+#~ msgid "to Draft"
+#~ msgstr "Salvare"
+
#~ msgid "can't write headers\n"
#~ msgstr "scrierea antetelor este imposibil\n"
diff --git a/po/ru.po b/po/ru.po
index 0b10635d..e32f51d5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 1.0.0beta4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2004-12-05 17:16+0300\n"
"Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -99,10 +99,10 @@ msgstr ""
"仗仂 从仂仄舒仆亟亠 '仂仍亳 于亠'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "仄"
@@ -137,18 +137,6 @@ msgstr "亠亰 仆舒亰于舒仆亳"
msgid "Delete account"
msgstr "丕亟舒仍亳 亠仆 亰舒仗亳"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "舒"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+亠"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -248,7 +236,7 @@ msgstr "仂仍亰仂于舒亠仍从亳亶 仗舒舒仄亠 亟亠亶于亳"
msgid "Add Address to Book"
msgstr "仂弍舒于仍亠仆亳亠 舒亟亠舒 于 从仆亳亞"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "亟亠"
@@ -388,7 +376,7 @@ msgstr "/丕亟舒仍亳"
msgid "E-Mail address"
msgstr "亟亠 E-Mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "亟亠仆舒 从仆亳亞舒"
@@ -415,16 +403,16 @@ msgstr "仂弍舒于亳"
msgid "Lookup"
msgstr "舒亶亳"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "仂仄:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "仂仗亳:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "弌从仆仂:"
@@ -598,23 +586,23 @@ msgstr "亟亠舒 仂亞舒仆亳亰舒亳亶"
msgid "Personal address"
msgstr "亳仆亠 舒亟亠舒"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "丕于亠亟仂仄仍亠仆亳亠"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "亠亟仗亠亢亟亠仆亳亠"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "亳弍从舒"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仗亠亟仗亠亢亟亠仆亳...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "仂从舒亰于舒 仂 仂仂弍亠仆亳亠 于 仍亠亟ム亳亶 舒亰"
@@ -649,7 +637,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "亠"
@@ -1006,10 +994,10 @@ msgstr "仂亟亞仂仂于从舒 仂仂弍亠仆亳%s"
msgid "Recipient is not specified."
msgstr "仂仍舒亠仍 仂仂弍亠仆亳 仆亠 从舒亰舒仆."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "仗舒于亳"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "丐亠仄舒"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1041,7 +1029,7 @@ msgstr "亳弍从舒 仂舒仆亠仆亳 仂仂弍亠仆亳 于 仗舒仗从亠 仂
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "亠 仆舒亶亟亠仆 从仍ム, 仂仂于亠于ム亳亶 于弍舒仆仆仂仄 亳亟亠仆亳亳从舒仂 '%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "仆亠 亟舒仍仂 亳亰仄亠仆亳 于仂亶于舒 舒亶仍舒\n"
@@ -1050,13 +1038,19 @@ msgstr "仆亠 亟舒仍仂 亳亰仄亠仆亳 于仂亶于舒 舒亶仍舒\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"亠 亟舒仍仂 仗亠仂弍舒亰仂于舒 从仂亟亳仂于从 仂亞仂 仂仂弍亠仆亳\n"
"亳亰 %s 于 %s.\n"
"亠 舒于仆仂 仗仂仍舒 亠亞仂?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "亳弍从舒 仗亠仂弍舒亰仂于舒仆亳 舒亟亠仆仂亶 从仆亳亞亳"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1065,146 +1059,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "仂亳弍从舒 亟舒仍亠仆亳 舒仂亞仂 仂仂弍亠仆亳\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "仗仂舒仆仂于从舒 仂仂弍亠仆亳 于 仂亠亠亟...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "仆亠于仂亰仄仂亢仆仂 仆舒亶亳 仗舒仗从 仂亠亠亟亳\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "仂亳弍从舒 舒亰仄亠亠仆亳 于 仂亠亠亟亳\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "仂亰亟舒仆 Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仗仂亟亞仂仂于从亳 仂仂弍亠仆亳...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr ":"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/仆仄亠仆/仂亟仗亳舒 仂仂弍亠仆亳亠 (PGP)"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/仆仄亠仆/丿亳仂于舒 仂仂弍亠仆亳亠 (PGP)"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "丐亳仗 MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "舒亰仄亠"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "仗舒于亳"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "仗舒于亳 仂仂弍亠仆亳亠"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "仗舒于亳 仗仂亰亢亠"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "仂仄亠亳 于 仂亠亠亟 亳 仂仗舒于亳 仗仂亰亢亠"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "丼亠仆仂于亳从亳"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "弌仂舒仆亳 于 仗舒仗从亠 亠仆仂于亳从仂于"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "舒于亳"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "舒于亳 舒亶仍"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "仍仂亢亠仆亳亠"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "仍仂亢亳 舒亶仍"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "仂亟仗亳"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "仂弍舒于亳 仗仂亟仗亳"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "亠亟舒从仂"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "舒于亳 于仆亠仆亳仄 亠亟舒从仂仂仄"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "亠亠仆仂 仂从"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "仂仄舒亳仂于舒 于亠 仂仂弍亠仆亳亠"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "亠于亠仆亶 亳仗 MIME."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "个舒亶仍 仆亠 亠于亠 亳仍亳 仗."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "弌于仂亶于舒"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "仂亟亳仂于从舒"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr ""
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "仄 舒亶仍舒"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "亠于亠仆舒 从仂仄舒仆亟舒 于亰仂于舒 于仆亠仆亠亞仂 亠亟舒从仂舒: '%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1215,72 +1218,70 @@ msgstr ""
"舒于亠亳 仗仂亠 仗亳仆亟亳亠仍仆仂?\n"
"亟亠仆亳亳从舒仂 亞仗仗 仗仂亠仂于: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "舒于亠亠仆 仗仂亠 亞仗仗: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "亠仄亠仆仆亶 舒亶仍: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "仂亟亞仂仂于从舒 仂仂弍亠仆亳: 于于仂亟 亳亰 仗仂亠舒 仍亠亢亠仆亳\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "亠 亟舒仍仂 亰舒仗亳 于仆亠仆亳亶 亠亟舒从仂\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "亳弍从舒 亰舒仗亳亳 于 舒亶仍\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "亳弍从舒 亠仆亳 亳亰 从舒仆舒仍舒\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "亳弍从舒 仗仂舒仆仂于从亳 于 仂亠亠亟."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "弍仂 舒亶仍舒"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "弍仂 舒亶仍舒"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "从舒亰 仂 仂仂弍亠仆亳"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "仗舒于亳 仂仂弍亠仆亳亠"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "亅仂 仂仂弍亠仆亳亠 亳亰仄亠仆亠仆仂. 从舒亰舒 仂 仆亠亞仂?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "从舒亰舒"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr " 亠仆仂于亳从亳"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "亳仄亠仆亳 舒弍仍仂仆 '%s'?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "亳仄亠仆亳 舒弍仍仂仆"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "舒仄亠仆亳"
@@ -1616,23 +1617,23 @@ msgstr "仂亳弍从舒 亰舒仗亳亳 仆舒仂亠从 于 舒亶仍\n"
msgid "Select folder"
msgstr "弍仂 仗舒仗从亳"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "仂亟亳亠"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "仗舒于仍亠仆仆亠"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "亠亠亟"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "仂亰亳仆舒"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "丼亠仆仂于亳从亳"
@@ -1809,20 +1810,20 @@ msgstr ""
msgid "Delete folder"
msgstr "丕亟舒仍亳 仗舒仗从"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "亳弍从舒 仗亳 亟舒仍亠仆亳亳 仗舒仗从亳 '%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "亳从舒 从仂亰亳仆"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "丕亟舒仍亳 于亠 仂仂弍亠仆亳 亳亰 从仂亰亳仆?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1831,34 +1832,34 @@ msgstr ""
"丕亟舒仍亳 仗仂仂于亶 亳从 '%s' ?\n"
"(弌仂仂弍亠仆亳 仆亠 弍亟 亟舒仍亠仆 亟亳从舒)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "丕亟舒仍亳 仗仂仂于亶 亳从"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "丕亟舒仍亳 亠仆 亰舒仗亳 IMAP4 '%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "丕亟舒仍亳 亠仆 亰舒仗亳 IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "丕亟舒仍亳 亞仗仗 仆仂于仂亠亶 '%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "丕亟舒仍亠仆亳亠 亞仗仗 仆仂于仂亠亶"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "丕亟舒仍亳 亠仆 亰舒仗亳 仆仂于仂亠亶 '%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "丕亟舒仍亳 亠仆 亰舒仗亳 仆仂于仂亠亶"
@@ -1886,7 +1887,7 @@ msgstr "仗仗舒 仆仂于仂亠亶"
msgid "Messages"
msgstr "弌舒亠亶"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "丐亳仗"
@@ -3244,7 +3245,7 @@ msgid "Send queued message(s)"
msgstr "仂仍舒 仂仂弍亠仆亳 亳亰 仂亠亠亟亳"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "舒仗亳舒"
@@ -3309,8 +3310,8 @@ msgstr "弌于仂亶于舒"
msgid "Common preferences"
msgstr "弍亳亠 仆舒仂亶从亳"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "丕亠仆舒 亰舒仗亳"
@@ -3430,23 +3431,23 @@ msgstr "从舒 亠从:"
msgid "Case sensitive"
msgstr "丕亳于舒 亠亞亳"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "仂亳从 仆亠 亟舒仍"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "弌仂从舒 仆亠 仆舒亶亟亠仆舒."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "仂亳亞仆仂 仆舒舒仍仂 仂仂弍亠仆亳; 仗仂亟仂仍亢亳 从仂仆舒?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "仂亳亞仆 从仂仆亠 仂仂弍亠仆亳; 仗仂亟仂仍亢亳 仆舒舒仍舒?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "仂亳从 亰舒从仂仆亠仆"
@@ -4028,7 +4029,7 @@ msgstr "仂于亠从舒 仗舒仂仍 亠亠亰 POP3 仗亠亠亟 仂仗舒于从
msgid "Command output"
msgstr "于仂亟 从仂仄舒仆亟"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "于仂仄舒亳亠从亳 舒仆舒于仍亳于舒 舒亟亠舒"
@@ -5385,35 +5386,35 @@ msgstr "亠 从舒亰舒仆仂 仍仂于亳亠."
msgid "Action not exist."
msgstr "亠 从舒亰舒仆仂 亟亠亶于亳亠."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "弌于仂亶于舒 仗舒仗从亳"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "弍亳亠"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "弍仆亶"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "亠 仂仂弍舒亢舒 [...] 亳仍亳 (...) 于 仆舒舒仍亠 亠仄 仂仂弍亠仆亳 于 仗亳从亠"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "丕亟舒仍 [...] 亳仍亳 (...) 于 仆舒舒仍亠 亠仄 仂仂弍亠仆亳 仗亳 仂于亠亠"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "亳仄亠仆 从 于仍仂亢亠仆仆仄 仗舒仗从舒仄"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "舒从亢亠 亳仗仂仍亰仂于舒 仗亳 仂于亠亠"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "亟亠 亟仍 仂于亠仂于:"
@@ -5895,7 +5896,7 @@ msgstr "仂亳从 仗仂 于亠仄 仗仂仍礆:"
msgid "Body:"
msgstr "丐亠从 仂仂弍亠仆亳:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6001,7 +6002,7 @@ msgstr "亠从仂仍从仂 仄亠仂从 仂舒仍仂. 弍舒弍仂舒 亳
msgid "Scanning folder (%s)..."
msgstr "仂仄仂 仗舒仗从亳 (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "从舒 仆仂于舒"
@@ -6289,6 +6290,21 @@ msgstr "%.2f 弍"
msgid "writing to %s failed.\n"
msgstr "亰舒仗亳 于 %s 仆亠 亟舒仍舒.\n"
+#~ msgid "Yes"
+#~ msgstr "舒"
+
+#~ msgid "+No"
+#~ msgstr "+亠"
+
+#~ msgid "Discard message"
+#~ msgstr "从舒亰 仂 仂仂弍亠仆亳"
+
+#~ msgid "Discard"
+#~ msgstr "从舒亰舒"
+
+#~ msgid "to Draft"
+#~ msgstr " 亠仆仂于亳从亳"
+
#~ msgid "can't write headers\n"
#~ msgstr "仂亳弍从舒 亰舒仗亳亳 亰舒亞仂仍仂于从仂于\n"
diff --git a/po/sk.po b/po/sk.po
index 727872b1..7560836c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -97,10 +97,10 @@ msgstr ""
"pri vo直be 'Prija泥 v邸etko', zatrhnite pol鱈ko v st頂pci oznaenom 'G'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Meno"
@@ -135,18 +135,6 @@ msgstr "Bez n叩zvu"
msgid "Delete account"
msgstr "Zmaza泥 konto"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "no"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nie"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -246,7 +234,7 @@ msgstr "Pou転鱈vate直sk箪 parameter pre akciu"
msgid "Add Address to Book"
msgstr "Prida泥 adresu do adres叩ra"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adres叩r"
@@ -386,7 +374,7 @@ msgstr "/Z_maza泥"
msgid "E-Mail address"
msgstr "E-mailov叩 adresa"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Otvori泥 adres叩r"
@@ -413,16 +401,16 @@ msgstr "Prida泥"
msgid "Lookup"
msgstr "Vyh直ada泥"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Komu:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "K坦pia:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Slep叩 k坦pia:"
@@ -597,23 +585,23 @@ msgstr "Spolon叩 adresa"
msgid "Personal address"
msgstr "S炭kromn叩 adresa"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Upozornenie"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Varovanie"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Chyba"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Vytv叩ram dial坦g pre varovania...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Zobrazi泥 t炭to spr叩vu nabud炭ce"
@@ -648,7 +636,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "貼iadna"
@@ -1013,10 +1001,10 @@ msgstr "P鱈sanie spr叩vy%s"
msgid "Recipient is not specified."
msgstr "Nie je uren箪 pr鱈jemca."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Odosla泥"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Predmet"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1048,7 +1036,7 @@ msgstr "Spr叩va sa ned叩 ulo転i泥 medzi odoslan辿 spr叩vy."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Nem担転em n叩js泥 転iadny k直炭 asociovan箪 so zvolen箪m ID k直炭a `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "ned叩 sa zmeni泥 m坦d s炭boru\n"
@@ -1057,13 +1045,19 @@ msgstr "ned叩 sa zmeni泥 m坦d s炭boru\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Ned叩 sa zmeni泥 k坦dovanie spr叩vy z\n"
"%s na %s.\n"
"Odosla泥 spr叩vu aj napriek tomu?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Chyba pri konverzii adres叩ra"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1072,146 +1066,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "ned叩 sa odstr叩ni泥 star叩 spr叩va\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "zaraujem spr叩vu do fronty...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "nem担転em n叩js泥 prieinok Na odoslanie\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "nem担転em zaradi泥 spr叩vu do fronty\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "vygenerovan箪 Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Vytv叩ram okno pre p鱈sanie spr叩vy...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Od:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_N叩stroje/A_kcie"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/Sp_r叩va/_Za邸ifrova泥"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME typ"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Ve直kos泥"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Odosla泥"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Odosla泥 spr叩vu"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Odosla泥 nesk担r"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Zaradi泥 spr叩vu do prieinka Na odoslanie a odosla泥 nesk担r"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Koncept"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Ulo転i泥 medzi koncepty"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Vlo転i泥"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Vlo転i泥 obsah s炭boru"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Pripoji泥"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Pripoji泥 s炭bor"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Podpis"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Vlo転i泥 podpis"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Upravi泥 pomocou extern辿ho editoru"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Riadkovanie"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Zalomi泥 v邸etky dlh辿 riadky"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Neplatn箪 MIME typ."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "S炭bor neexistuje alebo je pr叩zdny."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Vlastnosti"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "K坦dov叩 str叩nka"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Cesta"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "N叩zov s炭boru"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Neplatn箪 pr鱈kaz pre extern箪 editor: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1222,72 +1225,70 @@ msgstr ""
"Ukoni泥 ho n叩silne?\n"
"skupinov箪 ID procesu: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Ukonen叩 skupina procesov s ID: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Doasn箪 s炭bor: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "P鱈sanie: vstup z extern辿ho procesu\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Ned叩 sa spusti泥 extern箪 editor\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Ned叩 sa zapisova泥 do s炭boru\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Ned叩 sa 鱈ta泥 z potrubia\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Spr叩va sa ned叩 zaradi泥 do fronty."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Vybra泥 s炭bor"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Vybra泥 s炭bor"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Zru邸i泥 spr叩vu"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Odosla泥 spr叩vu"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Obsah spr叩vy sa zmenil. Chcete zahodi泥 zmeny?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Zahodi泥"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "medzi Koncepty"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Chcete pou転i泥 邸abl坦nu `%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Pou転i泥 邸abl坦nu"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Nahradi泥"
@@ -1624,23 +1625,23 @@ msgstr "nepodarilo sa zap鱈sa泥 nastavenie do s炭boru\n"
msgid "Select folder"
msgstr "Zvo直te prieinok"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Prijat辿"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Odoslan辿"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Na odoslanie"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Odpadkov箪 k担邸"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Koncepty"
@@ -1819,20 +1820,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Odstr叩ni泥 prieinok"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Prieinok '%s' sa ned叩 odstr叩ni泥."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Vypr叩zdni泥 k担邸"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Zmaza泥 v邸etky spr叩vy v ko邸i?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1841,34 +1842,34 @@ msgstr ""
"Naozaj chcete odstr叩ni泥 schr叩nku '%s' ?\n"
"(Spr叩vy NEBUD odstr叩nen辿 z disku)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Odstr叩ni泥 schr叩nku"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Naozaj chcete odstr叩ni泥 IMAP4 konto '%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Odstr叩ni泥 IMAP4 konto"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Naozaj chcete odstr叩ni泥 diskusn炭 skupinu '%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Odstr叩ni泥 diskusn炭 skupinu"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Naozaj chcede odstr叩ni泥 news konto '%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Odstr叩ni泥 news konto"
@@ -1896,7 +1897,7 @@ msgstr "N叩zov diskusnej skupiny"
msgid "Messages"
msgstr "Spr叩vy"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Typ"
@@ -3272,7 +3273,7 @@ msgid "Send queued message(s)"
msgstr "Odosla泥 spr叩vy vo fronte"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Nov叩 spr叩va"
@@ -3337,8 +3338,8 @@ msgstr "Nastavenia"
msgid "Common preferences"
msgstr "V邸eobecn辿 nastavenia"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Konto"
@@ -3456,23 +3457,23 @@ msgstr "N叩jdi text:"
msgid "Case sensitive"
msgstr "Z叩le転鱈 na ve直kosti p鱈smen"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "H直adanie sa nepodarilo"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "H直adan箪 re泥azec sa nena邸iel."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Dosiahnut箪 zaiatok spr叩vy; pokraova泥 z konca?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Dosiahnut箪 koniec spr叩vy; pokraova泥 od zaiatku?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "H直adanie dokonen辿"
@@ -4056,7 +4057,7 @@ msgstr "Autentizova泥 cez POP3 pred odosielan鱈m"
msgid "Command output"
msgstr "V箪stup pr鱈kazu"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automaticky nastavi泥 nasleduj炭ce adresy"
@@ -5436,35 +5437,35 @@ msgstr "Nebol zadan箪 pr鱈kazov箪 riadok."
msgid "Action not exist."
msgstr "%s: s炭bor neexistuje\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Vlastnosti prieinka"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "V邸eobecn辿"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Obyajn箪"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Nezobrazova泥 [...] alebo (...) na zaiatku n叩zvu v zozname spr叩v"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Zmaza泥 [...] alebo (...) na zaiatku n叩zvu v zozname spr叩v"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Plat鱈 aj pre podprieinky"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "pou転i泥 aj pri odpovedan鱈"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Odpoveda泥 komu:"
@@ -5947,7 +5948,7 @@ msgstr "Automaticky nastavi泥 nasleduj炭ce adresy"
msgid "Body:"
msgstr "Telo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6053,7 +6054,7 @@ msgstr "Ostali nejak辿 znaky. Spracova泥?"
msgid "Scanning folder (%s)..."
msgstr "Preh直ad叩vam prieinok (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "H直ada泥 znova"
@@ -6340,6 +6341,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "nepodaril sa z叩pis do %s.\n"
+#~ msgid "Yes"
+#~ msgstr "no"
+
+#~ msgid "+No"
+#~ msgstr "+Nie"
+
+#~ msgid "Discard message"
+#~ msgstr "Zru邸i泥 spr叩vu"
+
+#~ msgid "Discard"
+#~ msgstr "Zahodi泥"
+
+#~ msgid "to Draft"
+#~ msgstr "medzi Koncepty"
+
#~ msgid "can't write headers\n"
#~ msgstr "ned叩 sa zap鱈sa泥 hlavika\n"
diff --git a/po/sl.po b/po/sl.po
index 41a8713f..393d27f7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2003-01-24 20:39CET\n"
"Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
"Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -97,10 +97,10 @@ msgstr ""
"v stolpcu `G', da omogoite pobiranje sporoil z ukazom `Poberi vsa'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Ime"
@@ -135,18 +135,6 @@ msgstr "Brez naslova"
msgid "Delete account"
msgstr "Brisanje rauna"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Da"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Ne"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -244,7 +232,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "Dodaj naslov v adresar"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Naslov"
@@ -384,7 +372,7 @@ msgstr "/_Brisanje"
msgid "E-Mail address"
msgstr "Elektronski naslov"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Imenik naslovov"
@@ -411,16 +399,16 @@ msgstr "Dodajanje"
msgid "Lookup"
msgstr "Poi邸i"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Za:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Kp:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Skp:"
@@ -594,23 +582,23 @@ msgstr "Skupni naslov"
msgid "Personal address"
msgstr "Osebni naslov"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Opomba"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Opozorilo"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Napaka"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Delam pogovorno okno z alarmno plo邸o...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Poka転i to sporoilo naslednji"
@@ -645,7 +633,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Ni"
@@ -1011,10 +999,10 @@ msgstr "Sestavi sporoilo%s"
msgid "Recipient is not specified."
msgstr "Naslovnik ni doloen."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Po邸lji"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Zadeva"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1046,7 +1034,7 @@ msgstr "Ne morem shraniti sporoila v imenik Outbox."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Ne najdem tipke, ki bi bila povezana z identifikatorjem tipke `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
@@ -1055,12 +1043,18 @@ msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Ne morem pretvoriti nabora znakov sporoila.\n"
"Naj ga kljub temu po邸ljem?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Napaka pri pretvorbi imenika naslovov"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1069,147 +1063,156 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "ne morem odstraniti starega sporoila\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "prestavljam sporoilo v mapo akajoe...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "ne najdem mape s akajoimi sporoili\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "ne morem prelo転iti sporoila\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "generiran Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Odpiram okno za sestavljanje sporoila...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Po邸iljatelj:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Orodja/Deja_nja"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Sporoilo/_Enkripcija"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "Tip MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Velikost"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Po邸lji"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Po邸lji sporoilo"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Po邸lji kasneje"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Postavi v mapo akajoe in po邸lji kasneje"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Osnutek"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Shrani v imenik Draft"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Vstavi"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Vstavi datoteko"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Pripni"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Pripni datoteko"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Podpis"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Vstavi podpis"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Urejevalnik"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Urejanje z zunanjim urejevalnikom"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Prelom vrstic"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Prelomi vse dolge vrstice"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Napaen tip MIME"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Datoteka ne obstaja ali pa je prazna."
-#: src/compose.c:4894
+#: src/compose.c:4900
#, fuzzy
msgid "Properties"
msgstr "Lastnost"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Nabor znakov"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Pot"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Ime datoteke"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1220,72 +1223,70 @@ msgstr ""
"Ali naj ga prisilim k prekinitvi?\n"
"t. skupine procesov: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "t. prekinjene skupine procesov: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Zaasna datoteka: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Ne morem pognati zunanjega urejevalnika\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Ne morem pisati v datoteko\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Branje preko cevi ni uspelo\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Ne morem prelo転iti po邸iljanja sporoila."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Izberi datoteko"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Izberi datoteko"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Zavrzi sporoilo"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Po邸lji sporoilo"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "To sporoilo je bilo spremenjeno. Naj ga zavr転em?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Zavr転i"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "v Draft"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Ali 転elite uporabiti predlogo `%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Uporabi predlogo"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Zamenjaj"
@@ -1620,23 +1621,23 @@ msgstr "neuspe邸en poskus zapisa konfiguracije v datoteko\n"
msgid "Select folder"
msgstr "Izberi mapo"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Prejeto"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Poslano"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "akajoe"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Smeti"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Osnutki"
@@ -1816,20 +1817,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Izbri邸i mapo"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Ne morem odstraniti mape '%s'"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Izprazni smetnjak"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Izbri邸em vsa sporoila v smetnjaku?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1838,34 +1839,34 @@ msgstr ""
"Ali naj res odstranim po邸tni predal '%s' ?\n"
"(Sporoila se NE bodo izbrisala z diska)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Odstrani po邸tni predal"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Ali naj res izbri邸em raun IMAP4 '%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Izbri邸i raun IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Ali naj res izbri邸em noviarsko skupino '%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Izbri邸i noviarsko skupino"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Ali naj res izbri邸em noviarski raun '%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Izbri邸i noviarski raun"
@@ -1893,7 +1894,7 @@ msgstr "Ime noviarske skupine:"
msgid "Messages"
msgstr "Sporoila"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tip"
@@ -3273,7 +3274,7 @@ msgid "Send queued message(s)"
msgstr "Po邸lji akajoa sporoila"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Sestavi"
@@ -3338,8 +3339,8 @@ msgstr "Nastavitve"
msgid "Common preferences"
msgstr "Splo邸ne preference"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Raun"
@@ -3457,23 +3458,23 @@ msgstr "Poi邸i besedilo:"
msgid "Case sensitive"
msgstr "Razlikuj velike in male rke"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Iskanje neuspe邸no"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Iskan niz ni bil najden."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Dose転en je zaetek sporoila. Naj nadaljujem s konca?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Dose転en je konec sporoila. Naj nadaljujem z zaetka?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Iskanje konano"
@@ -4060,7 +4061,7 @@ msgstr "Pred po邸iljanjem avtenticiraj s POP3"
msgid "Command output"
msgstr "Ukaz"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Samodejno nastavi sledee naslove"
@@ -5438,36 +5439,36 @@ msgstr "Ukazna vrstica ni nastavljena."
msgid "Action not exist."
msgstr "%s: datoteka ne obstaja\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
#, fuzzy
msgid "Folder properties"
msgstr "Lastnost mape"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Splo邸no"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normalno"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Udejani na podmapah"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "uporabi tudi ob odgovoru"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Odgovor za:"
@@ -5949,7 +5950,7 @@ msgstr "Samodejno nastavi sledee naslove"
msgid "Body:"
msgstr "Telo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6055,7 +6056,7 @@ msgstr "Nekaj oznak je ostalo. Naj obdelam?"
msgid "Scanning folder (%s)..."
msgstr "Preiskujem mapo (%s) ..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Ponovno iskanje"
@@ -6344,6 +6345,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "pisanje v %s ni uspelo.\n"
+#~ msgid "Yes"
+#~ msgstr "Da"
+
+#~ msgid "+No"
+#~ msgstr "+Ne"
+
+#~ msgid "Discard message"
+#~ msgstr "Zavrzi sporoilo"
+
+#~ msgid "Discard"
+#~ msgstr "Zavr転i"
+
+#~ msgid "to Draft"
+#~ msgstr "v Draft"
+
#~ msgid "can't write headers\n"
#~ msgstr "Ne morem zapisati zaglavij\n"
diff --git a/po/sr.po b/po/sr.po
index d4e9ba16..f4e1f6f1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2002-11-29 21:08+0100\n"
"Last-Translator: garret <garret@garrets.tk>\n"
"Language-Team: Serbian\n"
@@ -97,10 +97,10 @@ msgstr ""
"`G' one naloge sa kojih 転elite skinuti e-po邸tu sa `Primi sve'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Ime"
@@ -135,18 +135,6 @@ msgstr "Neimenovano"
msgid "Delete account"
msgstr "Obri邸i nalog"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Da"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Ne"
-
#: src/action.c:329
#, fuzzy, c-format
msgid "Could not get message file %d"
@@ -244,7 +232,7 @@ msgstr ""
msgid "Add Address to Book"
msgstr "Dodaj adresu u adresar"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adresa"
@@ -384,7 +372,7 @@ msgstr "/_Obri邸i"
msgid "E-Mail address"
msgstr "Adresa e-po邸te"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adresar"
@@ -411,16 +399,16 @@ msgstr "Dodaj"
msgid "Lookup"
msgstr "Potra転i"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Za:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -588,23 +576,23 @@ msgstr "Uobiajene adrese"
msgid "Personal address"
msgstr "Line adrese"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Obave邸tenje"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Upozorenje"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Gre邸ka"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Stvaram dijalog za prozor sa upozorenjem...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Prika転i ovu poruku sledei put"
@@ -639,7 +627,7 @@ msgstr "Smea"
#. create sub items. for the menu item activation callback we pass the
#. * color flag value as data parameter. Also we attach a data pointer
#. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Ni邸ta"
@@ -1005,10 +993,10 @@ msgstr "Pisanje poruke%s"
msgid "Recipient is not specified."
msgstr "Primalac nije upisan."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Po邸alji"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Tema"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1041,7 +1029,7 @@ msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
"Ne mogu pronai nijedan klju kome je trenutno dodeljen id kljua `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "ne mogu promeniti atribut datoteke\n"
@@ -1050,12 +1038,18 @@ msgstr "ne mogu promeniti atribut datoteke\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Ne mogu promeniti kodni raspored poruke.\n"
"Da je ipak po邸aljem?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Gre邸ka pri prebacivanju adresara"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1064,147 +1058,156 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "ne mogu skloniti staru poruku\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "odlaganje poruke...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "ne mogu da pronaem direktorijum odlo転eno\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "ne mogu odlo転iti poruku\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "generisan ID-poruke: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Stvaranje prozora za pisanje...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Od:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/_Alat/Akci_je"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/_Poruka/_Enkriptuj"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME tip"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Veliina"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Po邸alji"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Po邸alji poruku"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Po邸alji kasnije"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Odlo転i u direktotijum odlo転eno i po邸alji kasnije"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Nedovr邸eno"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Sauvaj u direktorijum nedovr邸eno"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Unesi"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Unesi datoteku"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Prikai"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Prikai datoteku"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Potpis"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Unesi potpis"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Editor"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Izmeni sa nezavisnim ediorom"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Sa転imanje"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Sa転mi sve duge linije"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Pogre邸an MIME tip"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Datoteka ne postoji ili je prazna."
-#: src/compose.c:4894
+#: src/compose.c:4900
#, fuzzy
msgid "Properties"
msgstr "Svojstva"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Kodiranje"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Putanja"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Ime datoteke"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Naredba za nezavisni editor je pogre邸na: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1215,72 +1218,70 @@ msgstr ""
"Nasilno prekinuti proces?\n"
"grupa procesa: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Prekinuta grupa procesa: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Privremena datoteka: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Napi邸i: unos iz procesa praenja\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Ne mogu pokrenuti nezavisni editor\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Ne mogu snimiti u datoteku\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "itanje pipe-a nije uspelo\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Ne mogu odlo転iti poruku."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Odaberite datoteku"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Odaberite datoteku"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Odbaci poruku"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Po邸alji poruku"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Ova poruka je promenjena, odbaciti?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Odbaci"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "u Nedovr邸eno"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "貼elite li primeniti 邸ablon `%s'?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Primeni 邸ablon"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Zameni"
@@ -1615,23 +1616,23 @@ msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
msgid "Select folder"
msgstr "Odaberite direktorijum"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Sandue"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Poslato"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Odlo転eno"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Smee"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Nedovr邸eno"
@@ -1811,20 +1812,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Obri邸i direktorijum"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Ne mogu da premestim direktorijum `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "Isprazni smee"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "Isprazniti sve poruke iz smea?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1833,34 +1834,34 @@ msgstr ""
"Zista premestiti direktorijum `%s' ?\n"
"(Poruke NEE biti obrisane sa diska)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "/_Ukloni sandue"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Zaista obrisati `%s' IMAP4 nalog?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Obri邸i IMAP4 nalog"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Zaista obrisati `%s' news grupu?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Obri邸i news grupu"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Zaista obrisati `%s' news nalog?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Obri邸i news nalog"
@@ -1888,7 +1889,7 @@ msgstr "News grupa:"
msgid "Messages"
msgstr "Poruke"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Tip"
@@ -3269,7 +3270,7 @@ msgid "Send queued message(s)"
msgstr "alje odlo転ene poruku/e"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Napi邸i"
@@ -3334,8 +3335,8 @@ msgstr "Svojstva"
msgid "Common preferences"
msgstr "Uobiajena svojstva"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Nalog"
@@ -3453,23 +3454,23 @@ msgstr "Pronai tekst:"
msgid "Case sensitive"
msgstr "Osjetljiv na velika/mala slova"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Polje pretrage"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Zadani uzorak nije pronaen."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "Poetak liste dosegnut; nastaviti od kraja?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Kraj liste dosegnut; nastaviti od poetka?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Pretraga zavr邸ena"
@@ -4056,7 +4057,7 @@ msgstr "Proveri identitet sa POP3 pre slanja"
msgid "Command output"
msgstr "Naredba"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Automatski postavi sledee adrese"
@@ -5433,36 +5434,36 @@ msgstr "Linija za neredbe nije pode邸ena."
msgid "Action not exist."
msgstr "%s: datoteka ne postoji\n"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
#, fuzzy
msgid "Folder properties"
msgstr "Osobine direktorijuma"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Glavno"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normalno"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr ""
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr ""
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Primeni na poddirektorijume"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "koristi i prilikom odovora"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Odvovori-Na:"
@@ -5947,7 +5948,7 @@ msgstr "Automatski postavi sledee adrese"
msgid "Body:"
msgstr "Telo:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6053,7 +6054,7 @@ msgstr "Neke oznake su izostavljene. Izvr邸iti ih?"
msgid "Scanning folder (%s)..."
msgstr "Pregledanje direktorijuma (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Pretra転i ponovo"
@@ -6341,6 +6342,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "pisanje u %s nije uspelo.\n"
+#~ msgid "Yes"
+#~ msgstr "Da"
+
+#~ msgid "+No"
+#~ msgstr "+Ne"
+
+#~ msgid "Discard message"
+#~ msgstr "Odbaci poruku"
+
+#~ msgid "Discard"
+#~ msgstr "Odbaci"
+
+#~ msgid "to Draft"
+#~ msgstr "u Nedovr邸eno"
+
#~ msgid "can't write headers\n"
#~ msgstr "ne mogu upisati zaglavlje\n"
diff --git a/po/sv.po b/po/sv.po
index 23e8be48..6d3b6446 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2004-12-05 14:40+0100\n"
"Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -99,10 +99,10 @@ msgstr ""
"via \"H辰mta alla\""
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "Namn"
@@ -137,18 +137,6 @@ msgstr "Namnl旦s"
msgid "Delete account"
msgstr "Ta bort konto"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Ja"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Nej"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -248,7 +236,7 @@ msgstr "tg辰rdens anv辰ndarargument"
msgid "Add Address to Book"
msgstr "L辰gg till i adressbok"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adress"
@@ -388,7 +376,7 @@ msgstr "/_Ta bort"
msgid "E-Mail address"
msgstr "E-postadress"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adressbok"
@@ -415,16 +403,16 @@ msgstr "L辰gg till"
msgid "Lookup"
msgstr "Sl奪 upp"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Till:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Kopia:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Dold kopia:"
@@ -594,23 +582,23 @@ msgstr "Vanlig adress"
msgid "Personal address"
msgstr "Privat adress"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Notera"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Varning"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Fel"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Skapar dialog f旦r meddelandepanel...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Visa detta meddelande n辰sta g奪ng"
@@ -645,7 +633,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Ingen"
@@ -1002,10 +990,10 @@ msgstr "Skriv meddelande%s"
msgid "Recipient is not specified."
msgstr "Mottagare 辰r inte angiven."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "Skicka"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "rende"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1038,7 +1026,7 @@ msgid "Could not find any key associated with currently selected key id `%s'."
msgstr ""
"Kunde inte hitta n奪gon nyckel associerad med nu aktiva nyckel-ID \"%s\"."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "kan inte 辰ndra filr辰ttigheter\n"
@@ -1047,13 +1035,19 @@ msgstr "kan inte 辰ndra filr辰ttigheter\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"Kan inte konvertera meddelandets teckenkodning fr奪n\n"
"%s till %s.\n"
"Skicka 辰nd奪?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Fel vid konvertering av adressbok"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1062,146 +1056,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "kan inte ta bort det gamla meddelandet\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "l辰gger meddelandet i k旦...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "kan inte hitta k旦mapp\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "kan inte l辰gga meddelandet i k旦\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "skapat Meddelande-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "Skapar skrivf旦nster...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Fr奪n:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/V_erktyg/_Signera"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/V_erktyg/_Kryptera"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME-typ"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Storlek"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "Skicka"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "Skicka meddelande"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Skicka senare"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "Placera i k旦mapp och skicka senare"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Utkast"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Spara i utkastsmapp"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "Infoga"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Infoga fil"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Bifoga"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Bifoga fil"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "Signatur"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "Infoga signatur"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "Redigerare"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Redigera med extern redigerare"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Radbrytning"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "Radbryt l奪nga rader"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Ogiltig MIME-typ"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Filen finns inte eller 辰r tom."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "Egenskaper"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Kodning"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "S旦kv辰g"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Filnamn"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Ogiltig kommandorad f旦r extern redigerare: \"%s\"\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1212,72 +1215,70 @@ msgstr ""
"Framtvinga avslutning av processen?\n"
"processgrupps-id: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Avslutade processgrupps-id: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Tempor辰r fil: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "Skriv: indata fr奪n bevakad process\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Kunde inte k旦ra extern redigerare\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Kunde inte skriva till fil\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Kunde inte l辰sa fr奪n r旦r\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "Kan inte l辰gga meddelandet i k旦."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "V辰lj fil"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "V辰lj fil"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "Kasta meddelande"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "Skicka meddelande"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Detta meddelande har 辰ndrats. Kasta det?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Kasta"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "till Utkast"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "Vill du anv辰nda mallen \"%s\" ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "Anv辰nd mall"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Ers辰tt"
@@ -1612,23 +1613,23 @@ msgstr "misslyckades skriva konfiguration till fil\n"
msgid "Select folder"
msgstr "V辰lj mapp"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Inkorg"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "Skickat"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "K旦"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "Papperskorg"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Utkast"
@@ -1805,20 +1806,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Ta bort mapp"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "Kan inte ta bort mappen \"%s\"."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "T旦m papperskorgen"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "T旦m alla meddelanden i papperskorgen?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1827,34 +1828,34 @@ msgstr ""
"Vill du verkligen ta bort brevl奪dan \"%s\" ?\n"
"(Meddelandena tas INTE bort fr奪n disken)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Ta bort brevl奪da"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "Ta bort IMAP4-konto"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Ta bort diskussionsgrupp"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Ta bort diskussionsgruppskonto"
@@ -1882,7 +1883,7 @@ msgstr "Diskussionsgruppsnamn"
msgid "Messages"
msgstr "Meddelanden"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "Typ"
@@ -3238,7 +3239,7 @@ msgid "Send queued message(s)"
msgstr "Skicka k旦ade meddelanden"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "Skriv"
@@ -3303,8 +3304,8 @@ msgstr "Inst."
msgid "Common preferences"
msgstr "Allm辰nna inst辰llningar"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Konto"
@@ -3422,23 +3423,23 @@ msgstr "S旦ktext:"
msgid "Case sensitive"
msgstr "Skiftl辰gesk辰nslig"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "S旦kning misslyckades"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "S旦kstr辰ngen inte funnen."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "B旦rjan av meddelandet n奪tt; forts辰tta fr奪n slutet?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "Slutet av meddelandet n奪tt; forts辰tta fr奪n b旦rjan?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "S旦kning klar"
@@ -4020,7 +4021,7 @@ msgstr "Autentisera med POP3 innan brev skickas"
msgid "Command output"
msgstr "Kommandoutdata"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "S辰tt automatiskt f旦ljande adresser"
@@ -5378,35 +5379,35 @@ msgstr "Villkor saknas."
msgid "Action not exist."
msgstr "tg辰rd saknas"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "Mappegenskaper"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Allm辰nt"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "Visa inte [...] eller (...) i b旦rjan av 辰rendet i summering"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Ta bort [...] eller (...) i b旦rjan av 辰rendet vid svar"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "G辰ller 辰ven undermappar"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "anv辰nd ocks奪 vid svar"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Svara till:"
@@ -5888,7 +5889,7 @@ msgstr "Matcha alla av f旦ljande"
msgid "Body:"
msgstr "Text:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -5994,7 +5995,7 @@ msgstr "N奪gra markeringar finns kvar. Behandla dem?"
msgid "Scanning folder (%s)..."
msgstr "S旦ker igenom mapp (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "S旦k igen"
@@ -6282,6 +6283,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "skrivning till %s misslyckades.\n"
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "+No"
+#~ msgstr "+Nej"
+
+#~ msgid "Discard message"
+#~ msgstr "Kasta meddelande"
+
+#~ msgid "Discard"
+#~ msgstr "Kasta"
+
+#~ msgid "to Draft"
+#~ msgstr "till Utkast"
+
#~ msgid "can't write headers\n"
#~ msgstr "kan inte skriva brevhuvud\n"
diff --git a/po/tr.po b/po/tr.po
index 7a7f26cf..63658368 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2004-12-03 11:44+0200\n"
"Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
"Language-Team: <gnome-turk@gnome.org>\n"
@@ -100,10 +100,10 @@ msgstr ""
"etkin duruma getirilebilir."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "聴sim"
@@ -138,18 +138,6 @@ msgstr "Bal脹ks脹z"
msgid "Delete account"
msgstr "Hesab脹 sil"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "Evet"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+Hay脹r"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -249,7 +237,7 @@ msgstr "Eylemin kullan脹c脹 arg端man脹"
msgid "Add Address to Book"
msgstr "Adres Defterine Ekle"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "Adres"
@@ -389,7 +377,7 @@ msgstr "/_Sil"
msgid "E-Mail address"
msgstr "聴leti adresi"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "Adres defteri"
@@ -416,16 +404,16 @@ msgstr "Ekle"
msgid "Lookup"
msgstr "Ara"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "Kime:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "Bcc:"
@@ -598,23 +586,23 @@ msgstr "Ortak adres"
msgid "Personal address"
msgstr "Kiisel adres"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "Not"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "Uyar脹"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "Hata"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "Uyar脹 panel penceresi oluturuluyor...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "Bu iletiyi sonraki a巽脹l脹ta tekrar g旦ster"
@@ -649,7 +637,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "Hi巽biri"
@@ -1006,10 +994,10 @@ msgstr "聴leti d端zenle (%s)"
msgid "Recipient is not specified."
msgstr "Al脹c脹 belirtilmedi."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "G旦nder"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "Konu"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1041,7 +1029,7 @@ msgstr "聴leti, giden kutusuna kaydedilemiyor."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "Se巽ilen `%s' anahtar kimliiyle bir eletirme yap脹lamad脹."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "dosya modu deitirilemedi\n"
@@ -1050,13 +1038,19 @@ msgstr "dosya modu deitirilemedi\n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"聴letinin kod k端mesi 巽evrilemedi\n"
"%s / %s\n"
"Yine de g旦nderilsin mi?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "Adres defteri 巽evrim hatas脹"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1065,146 +1059,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "eski ileti silinemedi\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "ileti kuyrua g旦nderiliyor...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "kuyruk dizini bulunamad脹\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "ileti kuyrua g旦nderilemedi\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "聴leti numaras脹 oluturuldu: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "D端zenleme penceresi oluturuluyor...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "Kimden:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/A_ra巽lar/PGP 聴_mza"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/A_ra巽lar/PGP ile _ifrele"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME t端r端"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "Boyut"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "G旦nder"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "聴letiyi g旦nder"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "Sonra g旦nder"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "聴letiyi kuyrua aktar ve sonra g旦nder"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "Taslak"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "Taslak dizinine kaydet"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "聴巽er"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "Dosya i巽er"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "Ekle"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "Dosya ekle"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "聴mza"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "聴mza ekle"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "D端zenleyici"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "Harici bir d端zenleyici kullan"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "Sat脹r kayd脹r"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "T端m uzun sat脹rlar脹 kayd脹r"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "Ge巽ersiz MIME t端r端."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "Dosya yok, ya da bo."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "zellikler"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "Kodlama"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "Yol"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "Dosya ad脹"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "Harici d端zenleyici komut sat脹r脹 ge巽ersiz: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1215,72 +1218,70 @@ msgstr ""
"Bu s端reci sonland脹ray脹m m脹?\n"
"Program脹n grup numaras脹 (GID): %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "Grup numaras脹 %d olan s端re巽 sonland脹r脹ld脹"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "Ge巽ici dosya: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "D端zenle: s端re巽 g旦r端nt端s端n端 i巽er\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "Harici d端zenleyici 巽al脹t脹r脹lamad脹\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "Dosyaya yaz脹lamad脹\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Boru okumada hata\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "聴leti kuyrua g旦nderilemedi."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "Dosya se巽"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "Dosya se巽"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "聴letiyi sil"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "聴letiyi g旦nder"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "Bu ileti deitirildi. Silinsin mi?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "Sil"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "Taslaa G旦nder"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "%s ablonunu uygulamak istiyor musunuz?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "ablonu uygula"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "Deitir"
@@ -1616,23 +1617,23 @@ msgstr "Yap脹land脹rma dosyas脹na kay脹t yap脹lamad脹\n"
msgid "Select folder"
msgstr "Dizini se巽"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "Gelen"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "G旦nderilen"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "Kuyruk"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "旦p"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "Taslaklar"
@@ -1809,20 +1810,20 @@ msgstr ""
msgid "Delete folder"
msgstr "Dizini sil"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "`%s' dizini silinemiyor."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "旦p端 boalt"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "旦pteki t端m iletiler silinsin mi?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1831,34 +1832,34 @@ msgstr ""
"`%s' posta kutusu kald脹r脹ls脹n m脹?\n"
"(聴letiler diskten silinmeyecektir)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "Posta kutusunu sil"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "`%s' IMAP4 hesab脹 silinsin mi?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "IMAP4 hesab脹n脹 sil"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "`%s' haber grubu silinsin mi?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "Haber grubunu sil"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "`%s' haber grubu hesab脹 silinsin mi?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "Haber grubu hesab脹n脹 sil"
@@ -1886,7 +1887,7 @@ msgstr "Haber grubu ad脹"
msgid "Messages"
msgstr "聴letiler"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "T端r"
@@ -3243,7 +3244,7 @@ msgid "Send queued message(s)"
msgstr "Kuyruktaki iletileri g旦nder"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "D端zenle"
@@ -3308,8 +3309,8 @@ msgstr "Tercihler"
msgid "Common preferences"
msgstr "Ortak tercihler"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "Hesap"
@@ -3428,23 +3429,23 @@ msgstr "Metni bul:"
msgid "Case sensitive"
msgstr "Durum duyarl脹l脹脹"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "Aramada hata olutu"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "Aranan dizi bulunamad脹."
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "聴letinin ba脹na ula脹ld脹, sonundan balans脹n m脹?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "聴letinin sonuna ula脹ld脹, ba脹ndan balans脹n m脹?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "Arama tamamland脹"
@@ -4026,7 +4027,7 @@ msgstr "G旦ndermeden 旦nce POP3 ile kimlik denetimi yap"
msgid "Command output"
msgstr "Komut 巽脹kt脹s脹"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "Aa脹daki adresleri otomatik olarak tan脹mla"
@@ -5383,35 +5384,35 @@ msgstr "Durum bulunamad脹."
msgid "Action not exist."
msgstr "Eylem bulunamad脹."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr " Dizin Ayarlar脹"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "Genel"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "Normal"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "zette bal脹脹nda ba脹nda [...] veya (...) g旦sterme"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "Cevaplarken bal脹脹n ba脹ndaki [...] veya (...) iaretlerini sil"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "Alt dizinlere uygula"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "ayr脹ca yan脹tlarken kullan"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "Yan脹tla:"
@@ -5891,7 +5892,7 @@ msgstr "Aa脹daki t端m koullar eleirse"
msgid "Body:"
msgstr "G旦vde:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -5997,7 +5998,7 @@ msgstr "Baz脹 iaretler b脹rak脹lm脹. 聴lemeye devam edilsin mi?"
msgid "Scanning folder (%s)..."
msgstr "Dizin taran脹yor (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "Yeniden ara"
@@ -6285,6 +6286,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "yazarken hata olutu: %s\n"
+#~ msgid "Yes"
+#~ msgstr "Evet"
+
+#~ msgid "+No"
+#~ msgstr "+Hay脹r"
+
+#~ msgid "Discard message"
+#~ msgstr "聴letiyi sil"
+
+#~ msgid "Discard"
+#~ msgstr "Sil"
+
+#~ msgid "to Draft"
+#~ msgstr "Taslaa G旦nder"
+
#~ msgid "can't write headers\n"
#~ msgstr "bal脹klar yaz脹lamad脹\n"
diff --git a/po/uk.po b/po/uk.po
index 968ba1c6..624a150a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 1.0.0beta1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
"Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@@ -100,10 +100,10 @@ msgstr ""
"account'亳, 磻 仗仂仗仂于仆ムム 亠亠亰 `亳仄舒亳 于'."
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "仄'"
@@ -138,18 +138,6 @@ msgstr "亠亰舒亰于亳"
msgid "Delete account"
msgstr "亳亟舒仍亳亳 仂弍仍从仂于亳亶 亰舒仗亳"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr "于亢亠亢"
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+亰舒仂"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -249,7 +237,7 @@ msgstr "亞仄亠仆 从仂亳于舒舒"
msgid "Add Address to Book"
msgstr "仂亟舒亳 舒亟亠 亟仂 从仆亳亞亳"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "亟亠舒"
@@ -389,7 +377,7 @@ msgstr "/亳亟舒仍亳亳"
msgid "E-Mail address"
msgstr "亟亠舒 e-mail"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "亟亠仆舒 从仆亳亞舒"
@@ -416,16 +404,16 @@ msgstr "仂亟舒亳"
msgid "Lookup"
msgstr "仂从"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "仂仄:"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "仂仗:"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "亳仂于舒仆仂:"
@@ -593,23 +581,23 @@ msgstr "亟亠舒 仂亞舒仆亰舒"
msgid "Personal address"
msgstr "仂弍亳舒 舒亟亠舒"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "亳仄从舒"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "仂仗亠亠亟亢亠仆仆"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "仂仄亳仍从舒"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "弌于仂亠仆仆 亟舒仍仂亞 亠仄仆仂于仂亞仂 仗仂仗亠亠亟亢亠仆仆...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "仂从舒亰舒亳 亠 仗仂于亟仂仄仍亠仆仆 仆舒仗仆仂亞仂 舒亰"
@@ -644,7 +632,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "磻亳亶"
@@ -1001,10 +989,10 @@ msgstr "弌于仂亳亳 仍亳%s"
msgid "Recipient is not specified."
msgstr "亠 于从舒亰舒仆仂 仂亳仄于舒舒."
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr "仂仍舒亳"
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "丐亠仄舒"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1036,7 +1024,7 @@ msgstr "亠 于亟舒仍仂 亰弍亠亠亞亳 仍亳 于 outbox."
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "亠 于亟舒仍仂 亰仆舒亶亳 从仍ム舒, 于亟仗仂于亟仆仂亞仂 仂弍舒仆仂仄 亟亠仆亳从舒仂 `%s'."
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "仆亠 于亟舒仍仂 亰仄仆亳亳 仗舒于舒 亟仂仗 舒亶仍舒\n"
@@ -1045,13 +1033,19 @@ msgstr "仆亠 于亟舒仍仂 亰仄仆亳亳 仗舒于舒 亟仂仗 舒亶仍舒\
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"亠 于亟舒仍仂 从仂仆于亠于舒亳 从仂亟于舒仆仆 仍亠 仂亞仂 仍亳舒 亰\n"
"%s 仆舒 %s.\n"
"亠 亢 仗仂仍舒亳?"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "仂仄亳仍从舒 仗亳 从仂仆于亠于舒仆仆 舒亟亠仆仂 从仆亳亞亳"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1060,146 +1054,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "仆亠 于亟舒仍仂 于亳亟舒仍亳亳 舒亳亶 仍亳\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "仍亳 于 亠亞...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "仆亠 于亟舒仍仂 亰仆舒亶亳 仗舒仗从 亠亞亳\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "仆亠 于亟舒仍仂 仗仂舒于亳亳 仍亳 于 亠亞\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "亞亠仆亠仂于舒仆亳亶 Message-ID: %s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "亟从亳于舒仄仂 于从仆仂 于仂亠仆仆 仍亳舒...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "亟:"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/仆仄亠仆亳/亟仗亳 PGP"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/仆仄亠仆亳/丿亳于舒仆仆 PGP"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "亳仗 MIME"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "仂亰仄"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr "仂仍舒亳"
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "仂仍舒亳 仍亳"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "仂仍舒亳 仗亰仆亠"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "仂从仍舒亳 于 仗舒仗从 亠亞亳 仗仂仍舒亳 仗亰仆亠"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "丼仂仆仂于亳从"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "弍亠亠亞亳 于 仗舒仗 仂仆仂于亳从于"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr "舒于亳亳"
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "舒于亳亳 舒亶仍"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "亳亟仆舒亳"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "亳亟仆舒亳 舒亶仍"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "亟仗亳"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "舒于亳亳 仗亟仗亳"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "亠亟舒从仂"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "亠亟舒亞于舒亳 亰仂于仆仆仄 亠亟舒从仂仂仄"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "亞仂舒仆仆 磲从于"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "亞仂仆亳 于 亟仂于亞 磲从亳"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "亠仗舒于亳仍仆亳亶 亳仗 MIME."
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "个舒亶仍 仆亠 仆 舒弍仂 仗仂仂亢仆亶."
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "仍舒亳于仂"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "仂亟于舒仆仆"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "丿仍"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "仄' 舒亶仍"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "仂仄舒仆亟仆亳亶 磲仂从 亰仂于仆仆仂亞仂 亠亟舒从仂舒 仆亠仗舒于亳仍仆亳亶: `%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1210,72 +1213,70 @@ msgstr ""
"亳仄仂于仂 仂弍于舒亳 仗仂亠?\n"
"group id 仗仂亠: %d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "弍于舒仆仂 仗仂亠 亰 group id: %d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "丐亳仄舒仂于亳亶 舒亶仍: %s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "弌于仂亠仆仆: 于于亟 于亟 仗仂亠亞舒ム仂亞仂 仗仂亠\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "亠 于亟舒仍仂 亰舒仗亳亳 亰仂于仆仆亶 亠亟舒从仂\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "亠 于亟舒仍仂 亰舒仗亳舒亳 于 舒亶仍\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "亠 于亟舒仍仂 仗仂亳舒亳 亰 从舒仆舒仍\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "亠 于亟舒仍仂 仗仂舒于亳亳 仍亳 于 亠亞."
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "弍舒亳 舒亶仍"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "弍舒亳 舒亶仍"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "亟仄仂于亳亳 于亟 仍亳舒"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "仂仍舒亳 仍亳"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "丶亠亶 仍亳 弍仍仂 亰仄仆亠仆仂. 亟仄仂于亳亳 于亟 仆仂亞仂?"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "亟仄仂于亳亳"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr " 仂仆仂于亳从亳"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "丼亳 弍舒亢舒亠 亳 亰舒仂于舒亳 舒弍仍仂仆 `%s' ?"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "舒仂于舒亳 舒弍仍仂仆"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "舒仄仆亳亳"
@@ -1610,23 +1611,23 @@ msgstr "仆亠 于亟舒仍仂 亰舒仗亳舒亳 从仂仆亞舒 于 舒亶
msgid "Select folder"
msgstr "弍舒亳 仗舒仗从"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "亟仆"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "亟仍舒仆"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "丼亠亞舒"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "仂亳从"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "丼仂仆仂于亳从亳"
@@ -1804,20 +1805,20 @@ msgstr ""
msgid "Delete folder"
msgstr "亳亟舒仍亳亳 仗舒仗从"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "亠 于亟舒仍仂 于亳亟舒仍亳亳 仗舒仗从 `%s'."
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "弌仗仂仂亢仆亳亳 从仂亳从"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "亳亟舒仍亳亳 于 仍亳亳 亰 从仂亳从舒?"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1826,34 +1827,34 @@ msgstr ""
"弌仗舒于亟 于亳亟舒仍亳亳 从亳仆从 `%s' ?\n"
"(亳亳 于亳亟舒仍ム 亰 亟亳从舒)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "亳亟舒仍亳亳 从亳仆从"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "弌仗舒于亟 于亳亟舒仍亳亳 仂弍仍从仂于亳亶 亰舒仗亳 IMAP4 `%s'?"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr "亳亟舒仍亳亳 仂弍仍从仂于亳亶 亰舒仗亳 IMAP4"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "亶仆仂 于亳亟舒仍亳亳 从仂仆亠亠仆 `%s'?"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "亳亟舒仍亳亳 从仂仆亠亠仆"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "亶仆仂 于亳亟舒仍亳亳 仂弍仍从仂于亳亶 亰舒仗亳 从仂仆亠亠仆 `%s'?"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "亳亟舒仍亳亳 仂弍仍从仂于亳亶 亰舒仗亳 从仂仆亠亠仆"
@@ -1881,7 +1882,7 @@ msgstr "舒亰于舒 从仂仆亠亠仆"
msgid "Messages"
msgstr "弌舒亠亶"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "丐亳仗"
@@ -3248,7 +3249,7 @@ msgid "Send queued message(s)"
msgstr "亟仍舒亳 仍亳(亳) 亰 亠亞亳"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "弌于仂亠仆仆 仍亳舒"
@@ -3313,8 +3314,8 @@ msgstr "舒仍舒于舒仆仆"
msgid "Common preferences"
msgstr "弌仗仍仆 仆舒仍舒于舒仆仆"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "弍仍从仂于亳亶 亰舒仗亳"
@@ -3432,23 +3433,23 @@ msgstr "仆舒亶亳 亠从:"
msgid "Case sensitive"
msgstr "舒仂于于舒亳 亠亞"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "亠于亟舒舒 仗仂从"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "丿从舒仆亳亶 磲仂从 仆亠 亰仆舒亶亟亠仆仂"
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "仂磪仆仂 仗仂舒从 仍亳舒; 仗仂亟仂于亢亳亳 亰 从仆?"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "仂磪仆仂 从仆 仍亳舒; 仗仂亟仂于亢亳亳 亰 仗仂舒从?"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "仂从 亰舒从仆亠仆仂"
@@ -4031,7 +4032,7 @@ msgstr "亠仆亳从舒 POP3 仗亠亠亟 于亟亳仍舒仆仆礆"
msgid "Command output"
msgstr "亳于亟 从仂仄舒仆亟亳"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "于仂仄舒亳仆仂 于舒仆仂于仍ミ火委亳 仆舒仗仆 舒亟亠亳"
@@ -5388,35 +5389,35 @@ msgstr "丕仄仂于舒 仆亠 仆."
msgid "Action not exist."
msgstr " 仆亠 仆."
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "仍舒亳于仂 仗舒仗从亳"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "舒亞舒仍仆"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "仂仄舒仍仆亳亶"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "亠 仗仂从舒亰于舒亳 [...] 亳 (...) 仆舒 仗仂舒从 亠仄亳 仗亳从"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "亳亟舒仍亳 [...] 亳 (...) 仆舒 仗仂舒从 亠仄亳 仗亳 于亟仗仂于亟"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "舒仂于舒亳 亟仂 仗亟仗舒仗仂从"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "于亢亳于舒亳 仗亳 于亟仗仂于亟"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "于仂仂仆:"
@@ -5899,7 +5900,7 @@ msgstr "亊从仂 于亳从仂仆舒仆仂 于 仄仂于亳"
msgid "Body:"
msgstr "丐亠从 仗仂于亟仂仄仍亠仆仆:"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -6005,7 +6006,7 @@ msgstr "舒仍亳亳仍亳 亟亠磻 仗仂亰仆舒从亳. 仗舒ミ火委亳?"
msgid "Scanning folder (%s)..."
msgstr "亠亠亳仄仂 仗舒仗从 (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "丿从舒亳 亰仆仂于"
@@ -6293,6 +6294,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr "亠于亟舒舒 亰舒仗亳 于 %s.\n"
+#~ msgid "Yes"
+#~ msgstr "于亢亠亢"
+
+#~ msgid "+No"
+#~ msgstr "+亰舒仂"
+
+#~ msgid "Discard message"
+#~ msgstr "亟仄仂于亳亳 于亟 仍亳舒"
+
+#~ msgid "Discard"
+#~ msgstr "亟仄仂于亳亳"
+
+#~ msgid "to Draft"
+#~ msgstr " 仂仆仂于亳从亳"
+
#~ msgid "can't write headers\n"
#~ msgstr "仆亠 于亟舒仍仂 亰舒仗亳舒亳 亰舒亞仂仍仂于从亳\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d114b584..748a9877 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+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"
@@ -95,10 +95,10 @@ msgstr ""
"銀罍ユ育篁吟"
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "腱"
@@ -133,18 +133,6 @@ msgstr "蘂"
msgid "Delete account"
msgstr "ゅ"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr ""
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -244,7 +232,7 @@ msgstr "篏桁"
msgid "Add Address to Book"
msgstr "絨医羞糸医医膂"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "医"
@@ -384,7 +372,7 @@ msgstr "/(_D)"
msgid "E-Mail address"
msgstr "球篁九医"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "医膂"
@@ -411,16 +399,16 @@ msgstr "羞糸"
msgid "Lookup"
msgstr "ユ"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "銀散篋削"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr "鐚"
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "絲篁倶鐚"
@@ -585,23 +573,23 @@ msgstr "医"
msgid "Personal address"
msgstr "筝篋阪医"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "羈"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "茘"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "莚"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "罩e綮堺∽水壕罅...\n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "筝罨∴丞ず莚ヤ拭"
@@ -636,7 +624,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr "羃≧"
@@ -971,10 +959,10 @@ msgstr "医篁%s"
msgid "Recipient is not specified."
msgstr "羃≧絎銀散篋冴"
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr ""
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "筝脂"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1006,21 +994,27 @@ msgstr "羈絨莚ラ篁銀絖医篁句宴"
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "羈上医綵筝絲ユ莚%s梧膤紫ュ"
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "羈劫篁九\n"
#: src/compose.c:2670
-#, c-format
+#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"羈絨篁句絖膃膽篁 %s 莉√ %s\n"
"篁句 %s 鐚"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "医膂粋習∫莚"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1029,146 +1023,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "羈ゆч篁\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "罩e篁...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "羈上育篁九す鐚%s\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "羈莚ラ篁\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "篁倶莚埦%s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "罩e綮堺医腦...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "篁銀査鐚"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/綏ュ(_T)/PGP 膈上(_G)"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/綏ュ(_T)/PGP 絲(_E)"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME 膠糸"
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "紊у"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr ""
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "腴喝篁"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "篁ュ"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "上ラ篁九す鐚篁ュ"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "腮"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "篆絖域腮炊篁九す"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr ""
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "ユ篁九絎"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr "篁"
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "ラ篁"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "膈上"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "ョ上"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "膽莨"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "篏睡紊膽莨膽莨"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr "∵"
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "粋∵"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "MIME膠糸"
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "篁銀絖筝榊冴"
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "絮"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "膽劫"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "莊緇"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "篁九"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "紊膽莨巡擦茵鐚%s\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1179,71 +1182,69 @@ msgstr ""
"綣阪句腮綺鐚\n"
"腮綺靳莚埦%d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "綏牙腮綺靳莚埦%d"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "筝贋倶篁駈%s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr "医鐚篁菴腮筝莨\n"
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "羈ц紊膽莨\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "羈ユ篁\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "膊♂莚糸紊沿乾\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "羈絨莚ラ篁倶"
-#: src/compose.c:5613
+#: src/compose.c:5621
msgid "Select files"
msgstr "篁"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "篁"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "筝√篁"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "腴喝篁"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "莚ラ篁九群篆鴻筝√絎鐚"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "筝√"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "上ヨ腮睡"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "荀篏睡罔≧垂%s鐚"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "篏睡罔≧"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "炊"
@@ -1578,23 +1579,23 @@ msgstr "羈ラ臀篁\n"
msgid "Select folder"
msgstr "篁九す"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "銀散膊"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "綏峨"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr ""
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "綺篁句"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "腮睡"
@@ -1771,20 +1772,20 @@ msgstr ""
msgid "Delete folder"
msgstr "ゆ篁九す"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "羈ゆ篁九す%s"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "羝腥阪篁句"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "羝腥阪篁句演篆>散鐚"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1793,34 +1794,34 @@ msgstr ""
"荀ら篁句奄%s鐚\n"
"(篁銀篌篁脾)"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "ら膊"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "荀 IMAP4 絽垨%s鐚"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr " IMAP4 絽"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "荀ゆ育紫%s鐚"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "ゆ育紫"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "域ゆ育紫絽垨%s鐚"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "ゆ育紫絽"
@@ -1848,7 +1849,7 @@ msgstr "育紫"
msgid "Messages"
msgstr "篁倶"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "膠糸"
@@ -3197,7 +3198,7 @@ msgid "Send queued message(s)"
msgstr "筝篁"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "医"
@@ -3262,8 +3263,8 @@ msgstr "薤蕁"
msgid "Common preferences"
msgstr "薤蕁"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "絽"
@@ -3381,23 +3382,23 @@ msgstr "ユ丈絖鐚"
msgid "Case sensitive"
msgstr "阪紊у"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "膣√け茣"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "荀膣∝絖膃筝我押上違"
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "綏我ユ上育篁九紊器篁膸絨丞薩膸鐚"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "綏我ユ上育篁句絨常篁綣紊雁薩膸鐚"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "膣∝"
@@ -3973,7 +3974,7 @@ msgstr "POP3薨莚"
msgid "Command output"
msgstr "巡擦莨"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "莅丞舟篁ヤ医"
@@ -5315,35 +5316,35 @@ msgstr "筝絖>散"
msgid "Action not exist."
msgstr "筝絖篏"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "篁九す絮"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "絽梧"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr ""
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "荀筝筝脂箙筝丞ず [...] (...)"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "紊九や源蘂 [...] (...)"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "綺医篁九す"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "紊銀篏睡"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "紊鰹"
@@ -5825,7 +5826,7 @@ msgstr "拷篁ヤ"
msgid "Body:"
msgstr "絎刻"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -5931,7 +5932,7 @@ msgstr "筝篋篏莅違紊鐚"
msgid "Scanning folder (%s)..."
msgstr "罩e篁九す (%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "罨≧ユ"
@@ -6218,6 +6219,21 @@ msgstr "%.2fGB"
msgid "writing to %s failed.\n"
msgstr " %s 九け茣ャ\n"
+#~ msgid "Yes"
+#~ msgstr ""
+
+#~ msgid "+No"
+#~ msgstr "+"
+
+#~ msgid "Discard message"
+#~ msgstr "筝√篁"
+
+#~ msgid "Discard"
+#~ msgstr "筝√"
+
+#~ msgid "to Draft"
+#~ msgstr "上ヨ腮睡"
+
#~ msgid "can't write headers\n"
#~ msgstr "羈篁九ご\n"
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index c188bf06..a85fb31d 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-07 19:19+0900\n"
+"POT-Creation-Date: 2005-07-08 16:18+0900\n"
"PO-Revision-Date: 2004-12-04 08:24+0800\n"
"Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
"Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -82,10 +82,10 @@ msgstr ""
"箴羆阪罟∽ャ荀罟∽ヨ峨験灸散"
#: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4007 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4013 src/editaddress.c:200 src/editaddress.c:942
#: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
#: src/editjpilot.c:304 src/editldap.c:307 src/editvcard.c:217
-#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:171
+#: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
#: src/select-keys.c:319
msgid "Name"
msgstr "腮"
@@ -120,18 +120,6 @@ msgstr "≧蕁"
msgid "Delete account"
msgstr "ゅ験"
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "Yes"
-msgstr ""
-
-#: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5121
-#: src/folderview.c:2126 src/folderview.c:2222 src/folderview.c:2268
-#: src/folderview.c:2410 src/folderview.c:2456
-msgid "+No"
-msgstr "+筝荀"
-
#: src/action.c:329
#, c-format
msgid "Could not get message file %d"
@@ -231,7 +219,7 @@ msgstr "篏睡荐絎箙巡擦"
msgid "Add Address to Book"
msgstr "絨篏ヤ膂"
-#: src/addressadd.c:202 src/compose.c:4439 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4445 src/editaddress.c:201
#: src/select-keys.c:320
msgid "Address"
msgstr "篏"
@@ -371,7 +359,7 @@ msgstr "/(_D)"
msgid "E-Mail address"
msgstr "E-Mail篏"
-#: src/addressbook.c:495 src/compose.c:4440 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4446 src/prefs_common.c:2399
msgid "Address book"
msgstr "篏膂"
@@ -398,16 +386,16 @@ msgstr "医"
msgid "Lookup"
msgstr "絨"
-#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:309
+#: src/addressbook.c:645 src/headerview.c:55 src/prefs_folder_item.c:308
#: src/prefs_template.c:174 src/summary_search.c:221
msgid "To:"
msgstr "銀散篋"
-#: src/addressbook.c:649 src/prefs_folder_item.c:326 src/prefs_template.c:176
+#: src/addressbook.c:649 src/prefs_folder_item.c:325 src/prefs_template.c:176
msgid "Cc:"
msgstr ""
-#: src/addressbook.c:653 src/prefs_folder_item.c:337
+#: src/addressbook.c:653 src/prefs_folder_item.c:336
msgid "Bcc:"
msgstr "絲篁九"
@@ -576,23 +564,23 @@ msgstr "援篏膣"
msgid "Personal address"
msgstr "腱篋坂膣"
-#: src/alertpanel.c:123 src/compose.c:5121 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5127 src/main.c:483
msgid "Notice"
msgstr "羈"
-#: src/alertpanel.c:136 src/compose.c:2746 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
msgid "Warning"
msgstr "茘"
-#: src/alertpanel.c:149 src/compose.c:2675 src/inc.c:570
+#: src/alertpanel.c:164 src/inc.c:570
msgid "Error"
msgstr "茯"
-#: src/alertpanel.c:190
+#: src/alertpanel.c:206
msgid "Creating alert panel dialog...\n"
msgstr "∝茘絨荅掩筝... \n"
-#: src/alertpanel.c:269
+#: src/alertpanel.c:285
msgid "Show this message next time"
msgstr "筝罨≦"
@@ -627,7 +615,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:280 src/prefs_folder_item.c:286 src/summaryview.c:4064
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
msgid "None"
msgstr ""
@@ -984,10 +972,10 @@ msgstr "育灸散%s"
msgid "Recipient is not specified."
msgstr "羃絎銀散篋冴"
-#: src/compose.c:2415 src/compose.c:4360 src/mainwindow.c:2224
-#: src/prefs_account.c:718 src/prefs_common.c:943
-msgid "Send"
-msgstr ""
+#: src/compose.c:2415
+#, fuzzy
+msgid "Empty subject"
+msgstr "筝脂"
#: src/compose.c:2416
msgid "Subject is empty. Send it anyway?"
@@ -1019,7 +1007,7 @@ msgstr "≧絨篆>散喝篁九ぞ筝"
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "≧上井絎 key id '%s'"
-#: src/compose.c:2638 src/compose.c:2888 src/compose.c:2951 src/compose.c:3071
+#: src/compose.c:2638 src/compose.c:2894 src/compose.c:2957 src/compose.c:3077
#: src/utils.c:2246
msgid "can't change file mode\n"
msgstr "≧壕罟罅 \n"
@@ -1028,12 +1016,18 @@ msgstr "≧壕罟罅 \n"
#, fuzzy, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
+"\n"
"Send it as %s anyway?"
msgstr ""
"≧莉絨篆>散膩腆取┃絎 %s 莉 %s\n"
"篁荀渇鐚"
-#: src/compose.c:2742
+#: src/compose.c:2676
+#, fuzzy
+msgid "Code conversion error"
+msgstr "莉篏膂炊弱主茯"
+
+#: src/compose.c:2745
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1042,146 +1036,155 @@ msgid ""
"Send it anyway?"
msgstr ""
-#: src/compose.c:3031
+#: src/compose.c:2749
+msgid "Line length limit"
+msgstr ""
+
+#: src/compose.c:3037
msgid "can't remove the old message\n"
msgstr "≧ゅ篆>散\n"
-#: src/compose.c:3049
+#: src/compose.c:3055
msgid "queueing message...\n"
msgstr "我絖莖紊鞘賢...\n"
-#: src/compose.c:3131
+#: src/compose.c:3137
msgid "can't find queue folder\n"
msgstr "鞘井絖莖紊障\n"
-#: src/compose.c:3138
+#: src/compose.c:3144
msgid "can't queue the message\n"
msgstr "≧冗我絖莖紊障\n"
-#: src/compose.c:3718
+#: src/compose.c:3724
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "∝篆>散膩鐚%s\n"
-#: src/compose.c:3827
+#: src/compose.c:3833
msgid "Creating compose window...\n"
msgstr "∝育灸散...\n"
-#: src/compose.c:3875 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3881 src/headerview.c:54 src/summary_search.c:214
msgid "From:"
msgstr "箴鐚"
-#: src/compose.c:3947
+#: src/compose.c:3953
#, fuzzy
msgid "PGP Sign"
msgstr "/綏ュ(_T)/PGP 膂順(_g)"
-#: src/compose.c:3950
+#: src/compose.c:3956
#, fuzzy
msgid "PGP Encrypt"
msgstr "/綏ュ(_T)/PGP 絲(_E)"
-#: src/compose.c:3988 src/compose.c:4912
+#: src/compose.c:3994 src/compose.c:4918
msgid "MIME type"
msgstr "MIME "
#. S_COL_DATE
-#: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4003 src/mimeview.c:192 src/prefs_filter_edit.c:585
#: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
msgid "Size"
msgstr "紊у"
-#: src/compose.c:4361
+#: src/compose.c:4366 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/prefs_common.c:943
+msgid "Send"
+msgstr ""
+
+#: src/compose.c:4367
msgid "Send message"
msgstr "坂拭篁"
-#: src/compose.c:4369
+#: src/compose.c:4375
msgid "Send later"
msgstr "緇"
-#: src/compose.c:4370
+#: src/compose.c:4376
msgid "Put into queue folder and send later"
msgstr "上医篁九ぞ筝緇"
-#: src/compose.c:4378
+#: src/compose.c:4384
msgid "Draft"
msgstr "腮"
-#: src/compose.c:4379
+#: src/compose.c:4385
msgid "Save to draft folder"
msgstr "峨活腮粋紊"
-#: src/compose.c:4389 src/compose.c:5717
+#: src/compose.c:4395 src/compose.c:5726
msgid "Insert"
msgstr ""
-#: src/compose.c:4390
+#: src/compose.c:4396
msgid "Insert file"
msgstr "ユ罅"
-#: src/compose.c:4398
+#: src/compose.c:4404
msgid "Attach"
msgstr ""
-#: src/compose.c:4399
+#: src/compose.c:4405
msgid "Attach file"
msgstr "罟罅"
#. signature
-#: src/compose.c:4409 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4415 src/prefs_account.c:1390 src/prefs_common.c:1352
msgid "Signature"
msgstr "膂遵"
-#: src/compose.c:4410
+#: src/compose.c:4416
msgid "Insert signature"
msgstr "ョ綾"
-#: src/compose.c:4419 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4425 src/prefs_common.c:1374 src/prefs_common.c:2378
msgid "Editor"
msgstr "膩莠"
-#: src/compose.c:4420
+#: src/compose.c:4426
msgid "Edit with external editor"
msgstr "篏睡銀膩莠"
-#: src/compose.c:4428
+#: src/compose.c:4434
msgid "Linewrap"
msgstr ""
-#: src/compose.c:4429
+#: src/compose.c:4435
msgid "Wrap all long lines"
msgstr "我欠絖茵"
-#: src/compose.c:4808
+#: src/compose.c:4814
msgid "Invalid MIME type."
msgstr "筝羈 MIME "
-#: src/compose.c:4826
+#: src/compose.c:4832
msgid "File doesn't exist or is empty."
msgstr "罟罅筝絖, 罟罅腥榊"
-#: src/compose.c:4894
+#: src/compose.c:4900
msgid "Properties"
msgstr "у"
-#: src/compose.c:4914
+#: src/compose.c:4920
msgid "Encoding"
msgstr "膩腆"
-#: src/compose.c:4937 src/prefs_folder_item.c:184
+#: src/compose.c:4943 src/prefs_folder_item.c:183
msgid "Path"
msgstr "莊緇"
-#: src/compose.c:4938
+#: src/compose.c:4944
msgid "File name"
msgstr "罟"
-#: src/compose.c:5092
+#: src/compose.c:5098
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "紊膩莠巡擦茯ょ鐚`%s'\n"
-#: src/compose.c:5118
+#: src/compose.c:5124
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1192,72 +1195,70 @@ msgstr ""
"荀綣決辱腟荅画腮鐚\n"
"茵腮臂ょ篁g⊆鐚%d"
-#: src/compose.c:5131
+#: src/compose.c:5139
#, c-format
msgid "Terminated process group id: %d"
msgstr "腟臂ょ篁g⊆ %d 茵腮"
-#: src/compose.c:5132
+#: src/compose.c:5140
#, c-format
msgid "Temporary file: %s"
msgstr "絖罟罅鐚%s"
-#: src/compose.c:5156
+#: src/compose.c:5164
msgid "Compose: input from monitoring process\n"
msgstr ""
#. failed
-#: src/compose.c:5197
+#: src/compose.c:5205
msgid "Couldn't exec external editor\n"
msgstr "≧決紊膩莠\n"
-#: src/compose.c:5201
+#: src/compose.c:5209
msgid "Couldn't write to file\n"
msgstr "≧絲ユ罅\n"
-#: src/compose.c:5203
+#: src/compose.c:5211
msgid "Pipe read failed\n"
msgstr "Pipe 莅紊掩\n"
-#: src/compose.c:5508 src/compose.c:5516 src/compose.c:5522
+#: src/compose.c:5516 src/compose.c:5524 src/compose.c:5530
msgid "Can't queue the message."
msgstr "≧冗我絖莖紊障"
-#: src/compose.c:5613
+#: src/compose.c:5621
#, fuzzy
msgid "Select files"
msgstr "御罟罅"
-#: src/compose.c:5635
+#: src/compose.c:5643
msgid "Select file"
msgstr "御罟罅"
-#: src/compose.c:5670
-msgid "Discard message"
-msgstr "丈篆>散"
+#: src/compose.c:5678
+#, fuzzy
+msgid "Save message"
+msgstr "坂拭篁"
-#: src/compose.c:5671
-msgid "This message has been modified. discard it?"
+#: src/compose.c:5679
+#, fuzzy
+msgid "This message has been modified. Save it to draft folder?"
msgstr "篆>散綏画←篆拷荀丈絎鐚"
-#: src/compose.c:5672
-msgid "Discard"
-msgstr "丈"
-
-#: src/compose.c:5672
-msgid "to Draft"
-msgstr "上ヨ腮粋紊"
+#: src/compose.c:5681
+msgid "Close _without saving"
+msgstr ""
-#: src/compose.c:5714
+#: src/compose.c:5723
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "腆阪荀絅 '%s' 篆>散罔f水鐚"
-#: src/compose.c:5716
+#: src/compose.c:5725
msgid "Apply template"
msgstr "絅篆>散罔f"
-#: src/compose.c:5717
+#: src/compose.c:5726
msgid "Replace"
msgstr "臀"
@@ -1592,23 +1593,23 @@ msgstr "絲ョ荐絎紊掩\n"
msgid "Select folder"
msgstr "御莖紊"
-#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:213
+#: src/foldersel.c:350 src/folderview.c:1069 src/prefs_folder_item.c:212
msgid "Inbox"
msgstr "銀散紊"
-#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:214
+#: src/foldersel.c:354 src/folderview.c:1075 src/prefs_folder_item.c:213
msgid "Sent"
msgstr "絲篁九ぞ"
-#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:216
+#: src/foldersel.c:358 src/folderview.c:1081 src/prefs_folder_item.c:215
msgid "Queue"
msgstr "絖莖紊"
-#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:217
+#: src/foldersel.c:362 src/folderview.c:1087 src/prefs_folder_item.c:216
msgid "Trash"
msgstr "ょ灸散"
-#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:215
+#: src/foldersel.c:366 src/folderview.c:1093 src/prefs_folder_item.c:214
msgid "Drafts"
msgstr "腮"
@@ -1785,20 +1786,20 @@ msgstr ""
msgid "Delete folder"
msgstr "よ紊"
-#: src/folderview.c:2149
+#: src/folderview.c:2150
#, c-format
msgid "Can't remove the folder `%s'."
msgstr "≧よ紊 `%s'"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty trash"
msgstr "羝腥阪ょ灸散"
-#: src/folderview.c:2183
+#: src/folderview.c:2184
msgid "Empty all messages in trash?"
msgstr "腆阪荀羝ゆ茴ょ灸散鐚"
-#: src/folderview.c:2219
+#: src/folderview.c:2220
#, c-format
msgid ""
"Really remove the mailbox `%s' ?\n"
@@ -1807,34 +1808,34 @@ msgstr ""
"腆阪荀や拭膊 %s鐚\n"
"羈鐚篆∞延賢灸散絨筝緇隋腆筝茴ゃ"
-#: src/folderview.c:2221
+#: src/folderview.c:2222
msgid "Remove mailbox"
msgstr "/や拭膊"
-#: src/folderview.c:2266
+#: src/folderview.c:2268
#, c-format
msgid "Really delete IMAP4 account `%s'?"
msgstr "腆阪荀 %s IMAP4 絽活鐚"
-#: src/folderview.c:2267
+#: src/folderview.c:2269
msgid "Delete IMAP4 account"
msgstr " IMAP4 絽活"
-#: src/folderview.c:2408
+#: src/folderview.c:2411
#, c-format
msgid "Really delete newsgroup `%s'?"
msgstr "腆阪荀ゆ域臂ょ `%s' 鐚"
-#: src/folderview.c:2409
+#: src/folderview.c:2412
msgid "Delete newsgroup"
msgstr "ゆ域臂ょ"
-#: src/folderview.c:2454
+#: src/folderview.c:2458
#, c-format
msgid "Really delete news account `%s'?"
msgstr "腆阪荀ゆ域臂ょ絽活 `%s' 鐚"
-#: src/folderview.c:2455
+#: src/folderview.c:2459
msgid "Delete news account"
msgstr "ゅ験"
@@ -1862,7 +1863,7 @@ msgstr "域臂ょ腮縁"
msgid "Messages"
msgstr "篆>散"
-#: src/grouplistdialog.c:221 src/prefs_folder_item.c:197
+#: src/grouplistdialog.c:221 src/prefs_folder_item.c:196
msgid "Type"
msgstr "MIME "
@@ -3214,7 +3215,7 @@ msgid "Send queued message(s)"
msgstr "絨絖莖紊鞘賢篆>散"
#: src/mainwindow.c:2235 src/prefs_account.c:720 src/prefs_common.c:945
-#: src/prefs_folder_item.c:138
+#: src/prefs_folder_item.c:137
msgid "Compose"
msgstr "医灸散"
@@ -3279,8 +3280,8 @@ msgstr "荐絎"
msgid "Common preferences"
msgstr "筝荐絎"
-#: src/mainwindow.c:2343 src/prefs_folder_item.c:259
-#: src/prefs_folder_item.c:270 src/progressdialog.c:128
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:128
msgid "Account"
msgstr "絽活"
@@ -3398,23 +3399,23 @@ msgstr "絨丈絖鐚"
msgid "Case sensitive"
msgstr "紊у鎛"
-#: src/message_search.c:201 src/summary_search.c:385
+#: src/message_search.c:202 src/summary_search.c:385
msgid "Search failed"
msgstr "絨紊掩"
-#: src/message_search.c:202 src/summary_search.c:386
+#: src/message_search.c:203 src/summary_search.c:386
msgid "Search string not found."
msgstr "鞘域峨筝蚊"
-#: src/message_search.c:210
+#: src/message_search.c:211
msgid "Beginning of message reached; continue from end?"
msgstr "絨綏峨育腴荀緇絨丞膵主絨鐚"
-#: src/message_search.c:213
+#: src/message_search.c:214
msgid "End of message reached; continue from beginning?"
msgstr "絨綏峨医鮎腴荀緇腴膵主絨鐚"
-#: src/message_search.c:216 src/summary_search.c:396
+#: src/message_search.c:217 src/summary_search.c:396
msgid "Search finished"
msgstr "絨腟"
@@ -3990,7 +3991,7 @@ msgstr "篆≦ POP3 茯茘"
msgid "Command output"
msgstr "巡擦莠後"
-#: src/prefs_account.c:1420 src/prefs_folder_item.c:301
+#: src/prefs_account.c:1420 src/prefs_folder_item.c:300
msgid "Automatically set the following addresses"
msgstr "檎罨篏筝ヤ糸灸散篆∞縁"
@@ -5333,35 +5334,35 @@ msgstr "荐絎罌篁"
msgid "Action not exist."
msgstr "絎篁や絖"
-#: src/prefs_folder_item.c:116
+#: src/prefs_folder_item.c:115
msgid "Folder properties"
msgstr "莖紊上卯"
-#: src/prefs_folder_item.c:137
+#: src/prefs_folder_item.c:136
msgid "General"
msgstr "筝"
-#: src/prefs_folder_item.c:212
+#: src/prefs_folder_item.c:211
msgid "Normal"
msgstr "罩e幻"
-#: src/prefs_folder_item.c:225
+#: src/prefs_folder_item.c:224
msgid "Don't display [...] or (...) at the beginning of subject in summary"
msgstr "篆>散茵筝筝荀蕁腓坂拭篁倶蕁∝筝 [] 絨 ()"
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:226
msgid "Delete [...] or (...) at the beginning of subject on reply"
msgstr "荀や拭篁倶蕁∝筝 [] 絨 ()"
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:298
msgid "Apply to subfolders"
msgstr "医莖紊"
-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:323
msgid "use also on reply"
msgstr "荀篆>散箙篏睡"
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:347
msgid "Reply-To:"
msgstr "篆>鐚"
@@ -5842,7 +5843,7 @@ msgstr "筝罌篁九膃"
msgid "Body:"
msgstr ":"
-#: src/summary_search.c:258
+#: src/summary_search.c:263
msgid "Find all"
msgstr ""
@@ -5948,7 +5949,7 @@ msgstr "篋篆>散綏画←罔荐荀膵主鐚"
msgid "Scanning folder (%s)..."
msgstr "顚紊(%s)..."
-#: src/summaryview.c:1146
+#: src/summaryview.c:1147
msgid "Search again"
msgstr "罨≧絨"
@@ -6235,6 +6236,21 @@ msgstr ""
msgid "writing to %s failed.\n"
msgstr "絲ュ %s 篏紊掩\n"
+#~ msgid "Yes"
+#~ msgstr ""
+
+#~ msgid "+No"
+#~ msgstr "+筝荀"
+
+#~ msgid "Discard message"
+#~ msgstr "丈篆>散"
+
+#~ msgid "Discard"
+#~ msgstr "丈"
+
+#~ msgid "to Draft"
+#~ msgstr "上ヨ腮粋紊"
+
#~ msgid "can't write headers\n"
#~ msgstr "≧絲ユ\n"
diff --git a/src/account.c b/src/account.c
index 2c57fcda..bd1bf2f8 100644
--- a/src/account.c
+++ b/src/account.c
@@ -811,8 +811,10 @@ static void account_delete(void)
_("Do you really want to delete the account '%s'?"),
ac_prefs->account_name ? ac_prefs->account_name :
_("(Untitled)"));
- if (alertpanel(_("Delete account"), buf,
- _("Yes"), _("+No"), NULL) != G_ALERTDEFAULT)
+ if (alertpanel_full(_("Delete account"), buf,
+ ALERT_QUESTION, G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL)
+ != G_ALERTDEFAULT)
return;
if (ac_prefs->folder) {
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 46d7dd5a..e1454d3f 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -47,11 +47,12 @@ static GtkWidget *dialog;
static void alertpanel_show (void);
static void alertpanel_create (const gchar *title,
const gchar *message,
+ AlertType type,
+ AlertValue default_value,
+ gboolean can_disable,
const gchar *button1_label,
const gchar *button2_label,
- const gchar *button3_label,
- gboolean can_disable,
- AlertType type);
+ const gchar *button3_label);
static void alertpanel_button_toggled (GtkToggleButton *button,
gpointer data);
@@ -64,25 +65,37 @@ static gboolean alertpanel_close (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-AlertValue alertpanel(const gchar *title,
- const gchar *message,
- const gchar *button1_label,
- const gchar *button2_label,
- const gchar *button3_label)
+AlertValue alertpanel_full(const gchar *title, const gchar *message,
+ AlertType type, AlertValue default_value,
+ gboolean can_disable,
+ const gchar *button1_label,
+ const gchar *button2_label,
+ const gchar *button3_label)
{
if (alertpanel_is_open)
return -1;
else
alertpanel_is_open = TRUE;
- alertpanel_create(title, message, button1_label, button2_label,
- button3_label, FALSE, ALERT_QUESTION);
+ alertpanel_create(title, message, type, default_value, can_disable,
+ button1_label, button2_label, button3_label);
alertpanel_show();
debug_print("return value = %d\n", value);
return value;
}
+AlertValue alertpanel(const gchar *title,
+ const gchar *message,
+ const gchar *button1_label,
+ const gchar *button2_label,
+ const gchar *button3_label)
+{
+ return alertpanel_full(title, message, ALERT_QUESTION, G_ALERTDEFAULT,
+ FALSE,
+ button1_label, button2_label, button3_label);
+}
+
void alertpanel_message(const gchar *title, const gchar *message,
AlertType type)
{
@@ -91,7 +104,8 @@ void alertpanel_message(const gchar *title, const gchar *message,
else
alertpanel_is_open = TRUE;
- alertpanel_create(title, message, NULL, NULL, NULL, FALSE, type);
+ alertpanel_create(title, message, type, G_ALERTDEFAULT, FALSE,
+ NULL, NULL, NULL);
alertpanel_show();
}
@@ -104,7 +118,8 @@ AlertValue alertpanel_message_with_disable(const gchar *title,
else
alertpanel_is_open = TRUE;
- alertpanel_create(title, message, NULL, NULL, NULL, TRUE, type);
+ alertpanel_create(title, message, type, G_ALERTDEFAULT, TRUE,
+ NULL, NULL, NULL);
alertpanel_show();
return value;
@@ -168,11 +183,12 @@ static void alertpanel_show(void)
static void alertpanel_create(const gchar *title,
const gchar *message,
+ AlertType type,
+ AlertValue default_value,
+ gboolean can_disable,
const gchar *button1_label,
const gchar *button2_label,
- const gchar *button3_label,
- gboolean can_disable,
- AlertType type)
+ const gchar *button3_label)
{
static PangoFontDescription *font_desc;
GtkWidget *image;
@@ -294,11 +310,13 @@ static void alertpanel_create(const gchar *title,
gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
gtk_widget_grab_default(button1);
gtk_widget_grab_focus(button1);
- if (button2_label && *button2_label == '+') {
+ if (button2_label &&
+ (default_value == G_ALERTALTERNATE || *button2_label == '+')) {
gtk_widget_grab_default(button2);
gtk_widget_grab_focus(button2);
}
- if (button3_label && *button3_label == '+') {
+ if (button3_label &&
+ (default_value == G_ALERTOTHER || *button3_label == '+')) {
gtk_widget_grab_default(button3);
gtk_widget_grab_focus(button3);
}
diff --git a/src/alertpanel.h b/src/alertpanel.h
index 3e03323b..ac8e2eb9 100644
--- a/src/alertpanel.h
+++ b/src/alertpanel.h
@@ -43,11 +43,20 @@ typedef enum
ALERT_ERROR
} AlertType;
-AlertValue alertpanel (const gchar *title,
- const gchar *message,
- const gchar *button1_label,
- const gchar *button2_label,
- const gchar *button3_label);
+AlertValue alertpanel_full (const gchar *title,
+ const gchar *message,
+ AlertType type,
+ AlertValue default_value,
+ gboolean can_disable,
+ const gchar *button1_label,
+ const gchar *button2_label,
+ const gchar *button3_label);
+
+AlertValue alertpanel (const gchar *title,
+ const gchar *message,
+ const gchar *button1_label,
+ const gchar *button2_label,
+ const gchar *button3_label);
void alertpanel_message (const gchar *title,
const gchar *message,
diff --git a/src/compose.c b/src/compose.c
index ee02ac50..3ed07ed5 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2412,7 +2412,7 @@ static gboolean compose_check_entries(Compose *compose)
if (*str == '\0') {
AlertValue aval;
- aval = alertpanel(_("Send"),
+ aval = alertpanel(_("Empty subject"),
_("Subject is empty. Send it anyway?"),
GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (aval != G_ALERTDEFAULT)
@@ -2668,11 +2668,14 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
g_free(buf);
msg = g_strdup_printf(_("Can't convert the character encoding of the message body from %s to %s.\n"
+ "\n"
"Send it as %s anyway?"),
src_charset, body_charset,
src_charset);
- aval = alertpanel
- (_("Error"), msg, _("Yes"), _("+No"), NULL);
+ aval = alertpanel_full
+ (_("Code conversion error"), msg, ALERT_ERROR,
+ G_ALERTALTERNATE,
+ FALSE, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(msg);
if (aval != G_ALERTDEFAULT) {
@@ -2743,7 +2746,10 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
"The contents of the message might be broken on the way to the delivery.\n"
"\n"
"Send it anyway?"), line + 1);
- aval = alertpanel(_("Warning"), msg, _("Yes"), _("+No"), NULL);
+ aval = alertpanel_full(_("Line length limit"),
+ msg, ALERT_WARNING,
+ G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (aval != G_ALERTDEFAULT) {
g_free(msg);
fclose(fp);
@@ -5118,7 +5124,9 @@ static gboolean compose_ext_editor_kill(Compose *compose)
(_("The external editor is still working.\n"
"Force terminating the process?\n"
"process group id: %d"), -pgid);
- val = alertpanel(_("Notice"), msg, _("Yes"), _("+No"), NULL);
+ val = alertpanel_full(_("Notice"), msg, ALERT_NOTICE,
+ G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(msg);
if (val == G_ALERTDEFAULT) {
@@ -5667,16 +5675,17 @@ static void compose_close_cb(gpointer data, guint action, GtkWidget *widget)
}
if (compose->modified) {
- val = alertpanel(_("Discard message"),
- _("This message has been modified. discard it?"),
- _("Discard"), _("to Draft"), GTK_STOCK_CANCEL);
+ val = alertpanel(_("Save message"),
+ _("This message has been modified. Save it to draft folder?"),
+ GTK_STOCK_SAVE, GTK_STOCK_CANCEL,
+ _("Close _without saving"));
switch (val) {
case G_ALERTDEFAULT:
- break;
- case G_ALERTALTERNATE:
compose_draft_cb(data, 0, NULL);
return;
+ case G_ALERTOTHER:
+ break;
default:
return;
}
diff --git a/src/folderview.c b/src/folderview.c
index 6cee00af..5491d6e6 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2122,8 +2122,9 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
(_("All folders and messages under `%s' will be permanently deleted.\n"
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
- avalue = alertpanel(_("Delete folder"), message,
- _("Yes"), _("+No"), NULL);
+ avalue = alertpanel_full(_("Delete folder"), message,
+ ALERT_WARNING, G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(message);
if (avalue != G_ALERTDEFAULT) return;
@@ -2218,8 +2219,9 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
message = g_strdup_printf
(_("Really remove the mailbox `%s' ?\n"
"(The messages are NOT deleted from the disk)"), name);
- avalue = alertpanel(_("Remove mailbox"), message,
- _("Yes"), _("+No"), NULL);
+ avalue = alertpanel_full(_("Remove mailbox"), message,
+ ALERT_WARNING, G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(message);
g_free(name);
if (avalue != G_ALERTDEFAULT) return;
@@ -2264,8 +2266,9 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
name = trim_string(item->folder->name, 32);
message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"), name);
- avalue = alertpanel(_("Delete IMAP4 account"), message,
- _("Yes"), _("+No"), NULL);
+ avalue = alertpanel_full(_("Delete IMAP4 account"), message,
+ ALERT_WARNING, G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(message);
g_free(name);
@@ -2406,8 +2409,9 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
name = trim_string_before(item->path, 32);
message = g_strdup_printf(_("Really delete newsgroup `%s'?"), name);
- avalue = alertpanel(_("Delete newsgroup"), message,
- _("Yes"), _("+No"), NULL);
+ avalue = alertpanel_full(_("Delete newsgroup"), message,
+ ALERT_WARNING, G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(message);
g_free(name);
if (avalue != G_ALERTDEFAULT) return;
@@ -2452,8 +2456,9 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
name = trim_string(item->folder->name, 32);
message = g_strdup_printf(_("Really delete news account `%s'?"), name);
- avalue = alertpanel(_("Delete news account"), message,
- _("Yes"), _("+No"), NULL);
+ avalue = alertpanel_full(_("Delete news account"), message,
+ ALERT_WARNING, G_ALERTALTERNATE, FALSE,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(message);
g_free(name);