aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--po/ja.po348
-rw-r--r--src/compose.c40
-rw-r--r--src/compose.h2
4 files changed, 222 insertions, 173 deletions
diff --git a/ChangeLog b/ChangeLog
index b4b6a0b8..20150e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-09
+
+ * src/compose.[ch]: added a menu item to request disposition
+ notification.
+
2009-12-08
* src/icons/stock_book.png
diff --git a/po/ja.po b/po/ja.po
index a2867951..58701f18 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: 2009-12-08 15:40+0900\n"
+"POT-Creation-Date: 2009-12-09 13:09+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"
@@ -685,7 +685,7 @@ msgstr ""
"の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:682
-#: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5135 src/editaddress.c:777 src/editaddress.c:826
#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
#: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
#: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -820,7 +820,7 @@ msgstr "アクションのユーザ引数"
msgid "Add Address to Book"
msgstr "アドレスをアドレス帳に追加"
-#: src/addressadd.c:187 src/compose.c:3208 src/prefs_toolbar.c:89
+#: src/addressadd.c:187 src/compose.c:3226 src/prefs_toolbar.c:89
#: src/select-keys.c:312
msgid "Address"
msgstr "アドレス"
@@ -834,7 +834,7 @@ msgstr "備考"
msgid "Select Address Book Folder"
msgstr "アドレス帳フォルダを選択"
-#: src/addressbook.c:341 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:341 src/compose.c:564 src/mainwindow.c:540
#: src/messageview.c:149
msgid "/_File"
msgstr "/ファイル(_F)"
@@ -855,8 +855,8 @@ msgstr "/ファイル(_F)/新規_JPilot"
msgid "/_File/New _LDAP Server"
msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:565
-#: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
+#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:569
+#: src/compose.c:574 src/compose.c:577 src/compose.c:580 src/mainwindow.c:558
#: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
#: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
#: src/messageview.c:156
@@ -875,21 +875,21 @@ msgstr "/ファイル(_F)/削除(_D)"
msgid "/_File/_Save"
msgstr "/ファイル(_F)/保存(_S)"
-#: src/addressbook.c:355 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:355 src/compose.c:581 src/messageview.c:157
msgid "/_File/_Close"
msgstr "/ファイル(_F)/閉じる(_C)"
#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
-#: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
+#: src/compose.c:583 src/mainwindow.c:576 src/messageview.c:159
msgid "/_Edit"
msgstr "/編集(_E)"
-#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:577
#: src/messageview.c:160
msgid "/_Edit/_Copy"
msgstr "/編集(_E)/コピー(_C)"
-#: src/addressbook.c:359 src/compose.c:585
+#: src/addressbook.c:359 src/compose.c:589
msgid "/_Edit/_Paste"
msgstr "/編集(_E)/ペースト(_P)"
@@ -921,7 +921,7 @@ msgstr "/アドレス(_A)/編集(_E)"
msgid "/_Address/_Delete"
msgstr "/アドレス(_A)/削除(_D)"
-#: src/addressbook.c:369 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:369 src/compose.c:699 src/mainwindow.c:824
#: src/messageview.c:282
msgid "/_Tools"
msgstr "/ツール(_T)"
@@ -934,12 +934,12 @@ msgstr "/ツール(_T)/_LDIFファイルをインポート"
msgid "/_Tools/Import _CSV file"
msgstr "/ツール(_T)/_CSVファイルをインポート"
-#: src/addressbook.c:373 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:373 src/compose.c:723 src/mainwindow.c:880
#: src/messageview.c:302
msgid "/_Help"
msgstr "/ヘルプ(_H)"
-#: src/addressbook.c:374 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:374 src/compose.c:724 src/mainwindow.c:894
#: src/messageview.c:303
msgid "/_Help/_About"
msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -957,7 +957,7 @@ msgid "/New _Folder"
msgstr "/新規フォルダ(_F)"
#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
+#: src/compose.c:558 src/folderview.c:256 src/folderview.c:258
#: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
#: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
#: src/folderview.c:291 src/folderview.c:305 src/folderview.c:307
@@ -999,17 +999,17 @@ msgstr "電子メール アドレス"
msgid "Search:"
msgstr "検索:"
-#: src/addressbook.c:788 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:788 src/compose.c:3171 src/headerview.c:55
#: src/prefs_folder_item.c:339 src/prefs_template.c:179
msgid "To:"
msgstr "宛先:"
-#: src/addressbook.c:792 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:792 src/compose.c:3188 src/headerview.c:56
#: src/prefs_folder_item.c:356 src/prefs_template.c:181
msgid "Cc:"
msgstr "Cc:"
-#: src/addressbook.c:796 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:796 src/compose.c:3205 src/prefs_folder_item.c:367
#: src/prefs_template.c:183
msgid "Bcc:"
msgstr "Bcc:"
@@ -1216,7 +1216,7 @@ msgstr "共有アドレス"
msgid "Personal address"
msgstr "個人用アドレス"
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:743
+#: src/alertpanel.c:142 src/compose.c:6465 src/main.c:743
msgid "Notice"
msgstr "注意"
@@ -1271,388 +1271,392 @@ msgstr "茶"
msgid "None"
msgstr "なし"
-#: src/compose.c:552
+#: src/compose.c:556
msgid "/_Add..."
msgstr "/追加(_A)..."
-#: src/compose.c:553
+#: src/compose.c:557
msgid "/_Remove"
msgstr "/削除(_R)"
-#: src/compose.c:555 src/folderview.c:270 src/folderview.c:295
+#: src/compose.c:559 src/folderview.c:270 src/folderview.c:295
#: src/folderview.c:317
msgid "/_Properties..."
msgstr "/プロパティ(_P)..."
-#: src/compose.c:561
+#: src/compose.c:565
msgid "/_File/_Send"
msgstr "/ファイル(_F)/送信(_S)"
-#: src/compose.c:563
+#: src/compose.c:567
msgid "/_File/Send _later"
msgstr "/ファイル(_F)/後で送信(_L)"
-#: src/compose.c:566
+#: src/compose.c:570
msgid "/_File/Save to _draft folder"
msgstr "/ファイル(_F)/草稿フォルダに保存(_D)"
-#: src/compose.c:568
+#: src/compose.c:572
msgid "/_File/Save and _keep editing"
msgstr "/ファイル(_F)/保存して編集を続ける(_K)"
-#: src/compose.c:571
+#: src/compose.c:575
msgid "/_File/_Attach file"
msgstr "/ファイル(_F)/ファイルを添付(_A)"
-#: src/compose.c:572
+#: src/compose.c:576
msgid "/_File/_Insert file"
msgstr "/ファイル(_F)/ファイルを挿入(_I)"
-#: src/compose.c:574
+#: src/compose.c:578
msgid "/_File/Insert si_gnature"
msgstr "/ファイル(_F)/署名を挿入(_G)"
-#: src/compose.c:575
+#: src/compose.c:579
msgid "/_File/A_ppend signature"
msgstr "/ファイル(_F)/署名を追加(_P)"
-#: src/compose.c:580
+#: src/compose.c:584
msgid "/_Edit/_Undo"
msgstr "/編集(_E)/元に戻す(_U)"
-#: src/compose.c:581
+#: src/compose.c:585
msgid "/_Edit/_Redo"
msgstr "/編集(_E)/やり直し(_R)"
-#: src/compose.c:582 src/compose.c:589 src/mainwindow.c:580
+#: src/compose.c:586 src/compose.c:593 src/mainwindow.c:580
#: src/messageview.c:162
msgid "/_Edit/---"
msgstr "/編集(_E)/---"
-#: src/compose.c:583
+#: src/compose.c:587
msgid "/_Edit/Cu_t"
msgstr "/編集(_E)/カット(_T)"
-#: src/compose.c:586
+#: src/compose.c:590
msgid "/_Edit/Paste as _quotation"
msgstr "/編集(_E)/引用としてペースト(_Q)"
-#: src/compose.c:588 src/mainwindow.c:578 src/messageview.c:161
+#: src/compose.c:592 src/mainwindow.c:578 src/messageview.c:161
msgid "/_Edit/Select _all"
msgstr "/編集(_E)/すべて選択(_A)"
-#: src/compose.c:590
+#: src/compose.c:594
msgid "/_Edit/_Wrap current paragraph"
msgstr "/編集(_E)/現在の段落を整形する(_W)"
-#: src/compose.c:592
+#: src/compose.c:596
msgid "/_Edit/Wrap all long _lines"
msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
-#: src/compose.c:594
+#: src/compose.c:598
msgid "/_Edit/Aut_o wrapping"
msgstr "/編集(_E)/自動整形(_O)"
-#: src/compose.c:595 src/mainwindow.c:586 src/messageview.c:166
+#: src/compose.c:599 src/mainwindow.c:586 src/messageview.c:166
#: src/summaryview.c:460
msgid "/_View"
msgstr "/表示(_V)"
-#: src/compose.c:596
+#: src/compose.c:600
msgid "/_View/_To"
msgstr "/表示(_V)/宛先(_T)"
-#: src/compose.c:597
+#: src/compose.c:601
msgid "/_View/_Cc"
msgstr "/表示(_V)/_Cc"
-#: src/compose.c:598
+#: src/compose.c:602
msgid "/_View/_Bcc"
msgstr "/表示(_V)/_Bcc"
-#: src/compose.c:599
+#: src/compose.c:603
msgid "/_View/_Reply-To"
msgstr "/表示(_V)/返信先を指定(_Reply-To)"
-#: src/compose.c:600 src/compose.c:602 src/compose.c:604 src/compose.c:606
-#: src/compose.c:609 src/mainwindow.c:609 src/mainwindow.c:615
+#: src/compose.c:604 src/compose.c:606 src/compose.c:608 src/compose.c:610
+#: src/compose.c:613 src/mainwindow.c:609 src/mainwindow.c:615
#: src/mainwindow.c:642 src/mainwindow.c:666 src/mainwindow.c:769
#: src/mainwindow.c:773 src/messageview.c:258
msgid "/_View/---"
msgstr "/表示(_V)/---"
-#: src/compose.c:601
+#: src/compose.c:605
msgid "/_View/_Followup-To"
msgstr "/表示(_V)/フォロー先を指定(_Followup-To)"
-#: src/compose.c:603
+#: src/compose.c:607
msgid "/_View/R_uler"
msgstr "/表示(_V)/ルーラ(_U)"
-#: src/compose.c:605
+#: src/compose.c:609
msgid "/_View/_Attachment"
msgstr "/表示(_V)/添付(_A)"
-#: src/compose.c:607
+#: src/compose.c:611
msgid "/_View/Cu_stomize toolbar..."
msgstr "/表示(_V)/ツールバーをカスタマイズ(_S)..."
-#: src/compose.c:615 src/mainwindow.c:673 src/messageview.c:173
+#: src/compose.c:619 src/mainwindow.c:673 src/messageview.c:173
msgid "/_View/Character _encoding"
msgstr "/表示(_V)/文字エンコーディング(_E)"
-#: src/compose.c:616
+#: src/compose.c:620
msgid "/_View/Character _encoding/_Automatic"
msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
-#: src/compose.c:618 src/compose.c:624 src/compose.c:630 src/compose.c:634
-#: src/compose.c:642 src/compose.c:646 src/compose.c:652 src/compose.c:658
-#: src/compose.c:662 src/compose.c:672 src/compose.c:676 src/compose.c:684
-#: src/compose.c:688 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/compose.c:622 src/compose.c:628 src/compose.c:634 src/compose.c:638
+#: src/compose.c:646 src/compose.c:650 src/compose.c:656 src/compose.c:662
+#: src/compose.c:666 src/compose.c:676 src/compose.c:680 src/compose.c:688
+#: src/compose.c:692 src/mainwindow.c:669 src/mainwindow.c:676
#: src/messageview.c:169
msgid "/_View/Character _encoding/---"
msgstr "/表示(_V)/文字エンコーディング(_E)/---"
-#: src/compose.c:620 src/mainwindow.c:677 src/messageview.c:177
+#: src/compose.c:624 src/mainwindow.c:677 src/messageview.c:177
msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
-#: src/compose.c:622 src/mainwindow.c:679 src/messageview.c:180
+#: src/compose.c:626 src/mainwindow.c:679 src/messageview.c:180
msgid "/_View/Character _encoding/Unicode (_UTF-8)"
msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
-#: src/compose.c:626 src/mainwindow.c:683 src/messageview.c:183
+#: src/compose.c:630 src/mainwindow.c:683 src/messageview.c:183
msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
-#: src/compose.c:628 src/mainwindow.c:685 src/messageview.c:185
+#: src/compose.c:632 src/mainwindow.c:685 src/messageview.c:185
msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
-#: src/compose.c:632 src/mainwindow.c:691 src/messageview.c:190
+#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:190
msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
-#: src/compose.c:636 src/mainwindow.c:695 src/messageview.c:193
+#: src/compose.c:640 src/mainwindow.c:695 src/messageview.c:193
msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
-#: src/compose.c:638 src/mainwindow.c:697 src/messageview.c:195
+#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:195
msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
-#: src/compose.c:640 src/mainwindow.c:699 src/messageview.c:197
+#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:197
msgid "/_View/Character _encoding/Baltic (Windows-1257)"
msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (Windows-1257)"
-#: src/compose.c:644 src/mainwindow.c:703 src/messageview.c:200
+#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:200
msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
-#: src/compose.c:648 src/mainwindow.c:707 src/messageview.c:203
+#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:203
msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (ISO-8859-_6)"
-#: src/compose.c:650 src/mainwindow.c:709 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:205
msgid "/_View/Character _encoding/Arabic (Windows-1256)"
msgstr "/表示(_V)/文字エンコーディング(_E)/アラビア語 (Windows-1256)"
-#: src/compose.c:654 src/mainwindow.c:713 src/messageview.c:208
+#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:208
msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
-#: src/compose.c:656 src/mainwindow.c:715 src/messageview.c:210
+#: src/compose.c:660 src/mainwindow.c:715 src/messageview.c:210
msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
-#: src/compose.c:660 src/mainwindow.c:719 src/messageview.c:213
+#: src/compose.c:664 src/mainwindow.c:719 src/messageview.c:213
msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
-#: src/compose.c:664 src/mainwindow.c:723 src/messageview.c:216
+#: src/compose.c:668 src/mainwindow.c:723 src/messageview.c:216
msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
-#: src/compose.c:666 src/mainwindow.c:725 src/messageview.c:218
+#: src/compose.c:670 src/mainwindow.c:725 src/messageview.c:218
msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
-#: src/compose.c:668 src/mainwindow.c:727 src/messageview.c:220
+#: src/compose.c:672 src/mainwindow.c:727 src/messageview.c:220
msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
-#: src/compose.c:670 src/mainwindow.c:729 src/messageview.c:222
+#: src/compose.c:674 src/mainwindow.c:729 src/messageview.c:222
msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
-#: src/compose.c:674 src/mainwindow.c:733 src/messageview.c:225
+#: src/compose.c:678 src/mainwindow.c:733 src/messageview.c:225
msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
-#: src/compose.c:678 src/mainwindow.c:743 src/messageview.c:234
+#: src/compose.c:682 src/mainwindow.c:743 src/messageview.c:234
msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
-#: src/compose.c:680 src/mainwindow.c:745 src/messageview.c:236
+#: src/compose.c:684 src/mainwindow.c:745 src/messageview.c:236
msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
-#: src/compose.c:682 src/mainwindow.c:747 src/messageview.c:238
+#: src/compose.c:686 src/mainwindow.c:747 src/messageview.c:238
msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
-#: src/compose.c:686 src/mainwindow.c:755 src/messageview.c:245
+#: src/compose.c:690 src/mainwindow.c:755 src/messageview.c:245
msgid "/_View/Character _encoding/Korean (EUC-_KR)"
msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
-#: src/compose.c:690 src/mainwindow.c:761 src/messageview.c:250
+#: src/compose.c:694 src/mainwindow.c:761 src/messageview.c:250
msgid "/_View/Character _encoding/Thai (TIS-620)"
msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
-#: src/compose.c:692 src/mainwindow.c:763 src/messageview.c:252
+#: src/compose.c:696 src/mainwindow.c:763 src/messageview.c:252
msgid "/_View/Character _encoding/Thai (Windows-874)"
msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
-#: src/compose.c:696 src/mainwindow.c:825 src/messageview.c:283
+#: src/compose.c:700 src/mainwindow.c:825 src/messageview.c:283
msgid "/_Tools/_Address book"
msgstr "/ツール(_T)/アドレス帳(_A)"
-#: src/compose.c:697
+#: src/compose.c:701
msgid "/_Tools/_Template"
msgstr "/ツール(_T)/テンプレート(_T)"
-#: src/compose.c:699 src/mainwindow.c:849 src/messageview.c:299
+#: src/compose.c:703 src/mainwindow.c:849 src/messageview.c:299
msgid "/_Tools/Actio_ns"
msgstr "/ツール(_T)/アクション(_N)"
-#: src/compose.c:701 src/compose.c:705 src/compose.c:711 src/mainwindow.c:828
-#: src/mainwindow.c:842 src/mainwindow.c:847 src/mainwindow.c:850
-#: src/mainwindow.c:854 src/mainwindow.c:856 src/messageview.c:286
-#: src/messageview.c:298
+#: src/compose.c:705 src/compose.c:708 src/compose.c:712 src/compose.c:718
+#: src/mainwindow.c:828 src/mainwindow.c:842 src/mainwindow.c:847
+#: src/mainwindow.c:850 src/mainwindow.c:854 src/mainwindow.c:856
+#: src/messageview.c:286 src/messageview.c:298
msgid "/_Tools/---"
msgstr "/ツール(_T)/---"
-#: src/compose.c:702
+#: src/compose.c:706
msgid "/_Tools/Edit with e_xternal editor"
msgstr "/ツール(_T)/外部エディタで編集(_X)"
-#: src/compose.c:706
+#: src/compose.c:709
+msgid "/_Tools/Request _disposition notification"
+msgstr "/ツール(_T)/開封確認を要求する(_D)"
+
+#: src/compose.c:713
msgid "/_Tools/PGP Si_gn"
msgstr "/ツール(_T)/PGP署名(_G)"
-#: src/compose.c:707
+#: src/compose.c:714
msgid "/_Tools/PGP _Encrypt"
msgstr "/ツール(_T)/PGP暗号化(_E)"
-#: src/compose.c:712
+#: src/compose.c:719
msgid "/_Tools/_Check spell"
msgstr "/ツール(_T)/スペルチェック(_C)"
-#: src/compose.c:713
+#: src/compose.c:720
msgid "/_Tools/_Set spell language"
msgstr "/ツール(_T)/スペルチェックの言語を指定(_S)"
-#: src/compose.c:977
+#: src/compose.c:984
#, c-format
msgid "%s: file not exist\n"
msgstr "%s: ファイルが存在しません\n"
-#: src/compose.c:1081 src/compose.c:1155
+#: src/compose.c:1088 src/compose.c:1162
msgid "Can't get text part\n"
msgstr "テキストパートを取得できません\n"
-#: src/compose.c:1635
+#: src/compose.c:1653
msgid "Quote mark format error."
msgstr "引用符の書式が不正です。"
-#: src/compose.c:1647
+#: src/compose.c:1665
msgid "Message reply/forward format error."
msgstr "メッセージの返信/転送の書式が不正です。"
-#: src/compose.c:2135
+#: src/compose.c:2153
#, c-format
msgid "File %s doesn't exist\n"
msgstr "ファイル %s は存在しません\n"
-#: src/compose.c:2139
+#: src/compose.c:2157
#, c-format
msgid "Can't get file size of %s\n"
msgstr "ファイル %s のサイズを取得できません\n"
-#: src/compose.c:2143 src/compose.c:4204
+#: src/compose.c:2161 src/compose.c:4222
#, c-format
msgid "File %s is empty."
msgstr "ファイル %s は空です。"
-#: src/compose.c:2147
+#: src/compose.c:2165
#, c-format
msgid "Can't read %s."
msgstr "%s を読み込めません。"
-#: src/compose.c:2180
+#: src/compose.c:2198
#, c-format
msgid "Message: %s"
msgstr "メッセージ: %s"
-#: src/compose.c:2240 src/mimeview.c:583
+#: src/compose.c:2258 src/mimeview.c:583
msgid "Can't get the part of multipart message."
msgstr "マルチパートメッセージのパートを取得できません。"
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2748 src/headerview.c:233 src/query_search.c:790
#: src/rpop3.c:667 src/summaryview.c:2301
msgid "(No Subject)"
msgstr "(件名なし)"
-#: src/compose.c:2733
+#: src/compose.c:2751
#, c-format
msgid "%s - Compose%s"
msgstr "%s - 作成%s"
-#: src/compose.c:2848
+#: src/compose.c:2866
msgid "Recipient is not specified."
msgstr "宛先が指定されていません。"
-#: src/compose.c:2856
+#: src/compose.c:2874
msgid "Empty subject"
msgstr "空の件名"
-#: src/compose.c:2857
+#: src/compose.c:2875
msgid "Subject is empty. Send it anyway?"
msgstr "件名が空です。とにかく送信しますか?"
-#: src/compose.c:2921
+#: src/compose.c:2939
msgid "Attachment is missing"
msgstr "添付ファイルがありません"
-#: src/compose.c:2922
+#: src/compose.c:2940
msgid "There is no attachment. Send it without attachments?"
msgstr "添付ファイルがありません。添付ファイルなしで送信しますか?"
-#: src/compose.c:3039 src/compose.c:3065
+#: src/compose.c:3057 src/compose.c:3083
msgid "Check recipients"
msgstr "宛先の確認"
-#: src/compose.c:3085
+#: src/compose.c:3103
msgid "Really send this mail to the following addresses?"
msgstr "このメールを以下のアドレスに送信してもよろしいですか?"
-#: src/compose.c:3098 src/compose.c:4976 src/headerview.c:54
+#: src/compose.c:3116 src/compose.c:5001 src/headerview.c:54
msgid "From:"
msgstr "差出人:"
-#: src/compose.c:3120 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3138 src/headerview.c:58 src/prefs_template.c:187
msgid "Subject:"
msgstr "件名:"
-#: src/compose.c:3213
+#: src/compose.c:3231
msgid "_Send"
msgstr "送信(_S)"
-#: src/compose.c:3298
+#: src/compose.c:3316
msgid "can't get recipient list."
msgstr "送信先のリストを取得できません。"
-#: src/compose.c:3318
+#: src/compose.c:3336
msgid ""
"Account for sending mail is not specified.\n"
"Please select a mail account before sending."
@@ -1660,37 +1664,37 @@ msgstr ""
"メールを送信するためのアカウントが指定されていません。\n"
"送信する前にメールアカウントを選択してください。"
-#: src/compose.c:3332 src/send_message.c:315
+#: src/compose.c:3350 src/send_message.c:315
#, c-format
msgid "Error occurred while posting the message to %s ."
msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
-#: src/compose.c:3382
+#: src/compose.c:3400
msgid "Can't save the message to outbox."
msgstr "メッセージを送信控に保存できません。"
-#: src/compose.c:3420
+#: src/compose.c:3438
#, c-format
msgid "Could not find any key associated with currently selected key id `%s'."
msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
-#: src/compose.c:3447 src/compose.c:3832
+#: src/compose.c:3465 src/compose.c:3850
msgid "Can't sign the message."
msgstr "メッセージに署名できません。"
-#: src/compose.c:3474 src/compose.c:3875
+#: src/compose.c:3492 src/compose.c:3893
msgid "Can't encrypt the message."
msgstr "メッセージを暗号化できません。"
-#: src/compose.c:3509 src/compose.c:3870
+#: src/compose.c:3527 src/compose.c:3888
msgid "Can't encrypt or sign the message."
msgstr "メッセージを暗号化または署名できません。"
-#: src/compose.c:3555 src/compose.c:3903 src/compose.c:3966 src/compose.c:4086
+#: src/compose.c:3573 src/compose.c:3921 src/compose.c:3984 src/compose.c:4104
msgid "can't change file mode\n"
msgstr "ファイルモードを変更できません\n"
-#: src/compose.c:3588
+#: src/compose.c:3606
#, c-format
msgid ""
"Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1701,11 +1705,11 @@ msgstr ""
"\n"
"%s のままとにかく送信しますか?"
-#: src/compose.c:3594
+#: src/compose.c:3612
msgid "Code conversion error"
msgstr "文字コード変換エラー"
-#: src/compose.c:3680
+#: src/compose.c:3698
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -1718,15 +1722,15 @@ msgstr ""
"\n"
"とにかく送信しますか?"
-#: src/compose.c:3684
+#: src/compose.c:3702
msgid "Line length limit"
msgstr "行の長さの制限"
-#: src/compose.c:3850
+#: src/compose.c:3868
msgid "Encrypting with Bcc"
msgstr "Bcc を伴う暗号化"
-#: src/compose.c:3851
+#: src/compose.c:3869
msgid ""
"This message has Bcc recipients. If this message is encrypted, all Bcc "
"recipients will be visible by examing the encryption key list, leading to "
@@ -1740,90 +1744,90 @@ msgstr ""
"\n"
"とにかく送信しますか?"
-#: src/compose.c:4046
+#: src/compose.c:4064
msgid "can't remove the old message\n"
msgstr "古いメッセージを削除できません\n"
-#: src/compose.c:4064
+#: src/compose.c:4082
msgid "queueing message...\n"
msgstr "メッセージを送信待ちに入れています...\n"
-#: src/compose.c:4152
+#: src/compose.c:4170
msgid "can't find queue folder\n"
msgstr "送信待ちフォルダが見つかりません\n"
-#: src/compose.c:4159
+#: src/compose.c:4177
msgid "can't queue the message\n"
msgstr "メッセージを送信待機できません\n"
-#: src/compose.c:4199
+#: src/compose.c:4217
#, c-format
msgid "File %s doesn't exist."
msgstr "ファイル %s は存在しません。"
-#: src/compose.c:4208
+#: src/compose.c:4226
#, c-format
msgid "Can't open file %s."
msgstr "ファイル %s を開けません。"
-#: src/compose.c:4808
+#: src/compose.c:4833
#, c-format
msgid "generated Message-ID: %s\n"
msgstr "生成されたメッセージID: %s\n"
-#: src/compose.c:4923
+#: src/compose.c:4948
msgid "Creating compose window...\n"
msgstr "メッセージ作成ウィンドウを作成中...\n"
-#: src/compose.c:5050
+#: src/compose.c:5075
msgid "PGP Sign"
msgstr "PGP署名"
-#: src/compose.c:5053
+#: src/compose.c:5078
msgid "PGP Encrypt"
msgstr "PGP暗号化"
-#: src/compose.c:5091 src/compose.c:6257
+#: src/compose.c:5116 src/compose.c:6284
msgid "MIME type"
msgstr "MIME タイプ"
#. S_COL_DATE
-#: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
+#: src/compose.c:5125 src/mimeview.c:217 src/prefs_filter_edit.c:503
#: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
#: src/summaryview.c:5160
msgid "Size"
msgstr "サイズ"
-#: src/compose.c:6152
+#: src/compose.c:6179
msgid "Invalid MIME type."
msgstr "無効な MIME タイプです。"
-#: src/compose.c:6170
+#: src/compose.c:6197
msgid "File doesn't exist or is empty."
msgstr "ファイルが存在しないかまたは空です。"
-#: src/compose.c:6239
+#: src/compose.c:6266
msgid "Properties"
msgstr "プロパティ"
-#: src/compose.c:6259 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1620
msgid "Encoding"
msgstr "エンコーディング"
-#: src/compose.c:6282 src/prefs_folder_item.c:202
+#: src/compose.c:6309 src/prefs_folder_item.c:202
msgid "Path"
msgstr "パス"
-#: src/compose.c:6283
+#: src/compose.c:6310
msgid "File name"
msgstr "ファイル名"
-#: src/compose.c:6373
+#: src/compose.c:6400
#, c-format
msgid "External editor command line is invalid: `%s'\n"
msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
-#: src/compose.c:6435
+#: src/compose.c:6462
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -1832,48 +1836,48 @@ msgstr ""
"外部エディタが動作中です。\n"
"プロセスを強制終了しますか(pid: %d)?\n"
-#: src/compose.c:6772 src/mainwindow.c:3016
+#: src/compose.c:6799 src/mainwindow.c:3016
msgid "_Customize toolbar..."
msgstr "ツールバーをカスタマイズ(_C)..."
-#: src/compose.c:6892 src/compose.c:6897 src/compose.c:6903
+#: src/compose.c:6919 src/compose.c:6924 src/compose.c:6930
msgid "Can't queue the message."
msgstr "メッセージを送信待機できません。"
-#: src/compose.c:6994
+#: src/compose.c:7021
msgid "Select files"
msgstr "ファイルの選択"
-#: src/compose.c:7017
+#: src/compose.c:7044
msgid "Select file"
msgstr "ファイルの選択"
-#: src/compose.c:7068
+#: src/compose.c:7095
msgid "Save message"
msgstr "メッセージの保存"
-#: src/compose.c:7069
+#: src/compose.c:7096
msgid "This message has been modified. Save it to draft folder?"
msgstr "このメッセージは変更されています。草稿に保存しますか?"
-#: src/compose.c:7071 src/compose.c:7075
+#: src/compose.c:7098 src/compose.c:7102
msgid "Close _without saving"
msgstr "保存せずに閉じる(_W)"
-#: src/compose.c:7122
+#: src/compose.c:7149
#, c-format
msgid "Do you want to apply the template `%s' ?"
msgstr "テンプレート `%s' を適用しますか?"
-#: src/compose.c:7124
+#: src/compose.c:7151
msgid "Apply template"
msgstr "テンプレートの適用"
-#: src/compose.c:7125
+#: src/compose.c:7152
msgid "_Replace"
msgstr "置換(_R)"
-#: src/compose.c:7125
+#: src/compose.c:7152
msgid "_Insert"
msgstr "挿入(_I)"
@@ -2030,12 +2034,12 @@ msgstr "フォルダの編集"
msgid "Input the new name of folder:"
msgstr "フォルダの新しい名前を入力してください:"
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2278
+#: src/editgroup.c:540 src/foldersel.c:604 src/folderview.c:2278
#: src/folderview.c:2284
msgid "New folder"
msgstr "新規フォルダ"
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2285
+#: src/editgroup.c:541 src/foldersel.c:605 src/folderview.c:2285
msgid "Input the name of new folder:"
msgstr "新規フォルダの名前を入力してください:"
@@ -2235,47 +2239,47 @@ msgstr "ファイルがすでに存在します。上書きしますか?"
msgid "Select directory"
msgstr "ディレクトリの選択"
-#: src/foldersel.c:252
+#: src/foldersel.c:255
msgid "Select folder"
msgstr "フォルダの選択"
-#: src/foldersel.c:390 src/folderview.c:1224 src/prefs_folder_item.c:235
+#: src/foldersel.c:409 src/folderview.c:1224 src/prefs_folder_item.c:235
msgid "Inbox"
msgstr "受信箱"
-#: src/foldersel.c:394 src/folderview.c:1230 src/prefs_folder_item.c:236
+#: src/foldersel.c:413 src/folderview.c:1230 src/prefs_folder_item.c:236
msgid "Sent"
msgstr "送信控"
-#: src/foldersel.c:398 src/folderview.c:1236 src/prefs_folder_item.c:238
+#: src/foldersel.c:417 src/folderview.c:1236 src/prefs_folder_item.c:238
msgid "Queue"
msgstr "送信待ち"
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:239
+#: src/foldersel.c:421 src/folderview.c:1242 src/prefs_folder_item.c:239
msgid "Trash"
msgstr "ごみ箱"
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:237
+#: src/foldersel.c:425 src/folderview.c:1248 src/prefs_folder_item.c:237
msgid "Drafts"
msgstr "草稿"
-#: src/foldersel.c:587 src/folderview.c:2282 src/folderview.c:2286
+#: src/foldersel.c:606 src/folderview.c:2282 src/folderview.c:2286
msgid "NewFolder"
msgstr "NewFolder"
-#: src/foldersel.c:595 src/folderview.c:2296 src/folderview.c:2304
+#: src/foldersel.c:614 src/folderview.c:2296 src/folderview.c:2304
#: src/folderview.c:2366
#, c-format
msgid "`%c' can't be included in folder name."
msgstr "フォルダ名に `%c' を含むことはできません。"
-#: src/foldersel.c:605 src/folderview.c:2315 src/folderview.c:2374
+#: src/foldersel.c:624 src/folderview.c:2315 src/folderview.c:2374
#: src/query_search.c:1155
#, c-format
msgid "The folder `%s' already exists."
msgstr "フォルダ `%s' はすでに存在します。"
-#: src/foldersel.c:613 src/folderview.c:2322
+#: src/foldersel.c:632 src/folderview.c:2322
#, c-format
msgid "Can't create the folder `%s'."
msgstr "フォルダ `%s' を作成できません。"
diff --git a/src/compose.c b/src/compose.c
index 2b509cf7..09a3f9b6 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -488,6 +488,10 @@ static void compose_customize_toolbar_cb(gpointer data,
guint action,
GtkWidget *widget);
+static void compose_toggle_mdn_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
+
#if USE_GPGME
static void compose_toggle_sign_cb (gpointer data,
guint action,
@@ -701,6 +705,9 @@ static GtkItemFactoryEntry compose_entries[] =
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/Edit with e_xternal editor"),
"<shift><control>X", compose_ext_editor_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/Request _disposition notification"), NULL, compose_toggle_mdn_cb , 0, "<ToggleItem>"},
+
#if USE_GPGME
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/PGP Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
@@ -1194,6 +1201,13 @@ void compose_reedit(MsgInfo *msginfo)
compose_connect_changed_callbacks(compose);
compose_set_title(compose);
+ if (compose->use_mdn) {
+ GtkItemFactory *ifactory;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menu_set_active(ifactory, "/Tools/Request disposition notification", TRUE);
+ }
+
if (prefs_common.enable_autosave && prefs_common.autosave_itv > 0)
compose->autosave_tag =
g_timeout_add(prefs_common.autosave_itv * 60 * 1000,
@@ -1562,6 +1576,7 @@ static gint compose_parse_source_msg(Compose *compose, MsgInfo *msginfo)
{"X-Sylpheed-Forward:", NULL, FALSE},
{"REP:", NULL, FALSE},
{"FWD:", NULL, FALSE},
+ {"Disposition-Notification-To:", NULL, FALSE},
{NULL, NULL, FALSE}};
enum
@@ -1569,7 +1584,8 @@ static gint compose_parse_source_msg(Compose *compose, MsgInfo *msginfo)
H_X_SYLPHEED_REPLY = 0,
H_X_SYLPHEED_FORWARD = 1,
H_REP = 2,
- H_FWD = 3
+ H_FWD = 3,
+ H_MDN = 4
};
gchar *file;
@@ -1598,6 +1614,8 @@ static gint compose_parse_source_msg(Compose *compose, MsgInfo *msginfo)
} else if ((hnum == H_X_SYLPHEED_FORWARD || hnum == H_FWD) &&
!compose->forward_targets) {
compose->forward_targets = g_strdup(str);
+ } else if (hnum == H_MDN) {
+ compose->use_mdn = TRUE;
}
}
@@ -4516,6 +4534,13 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
}
}
+ /* Disposition-Notification-To */
+ if (compose->use_mdn &&
+ !IS_IN_CUSTOM_HEADER("Disposition-Notification-To")) {
+ fprintf(fp, "Disposition-Notification-To: %s\n",
+ compose->account->address);
+ }
+
/* Organization */
if (compose->account->organization &&
!IS_IN_CUSTOM_HEADER("Organization")) {
@@ -5340,6 +5365,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
compose->out_encoding = C_AUTO;
+ compose->use_mdn = FALSE;
+
#if USE_GPGME
compose->use_signing = FALSE;
compose->use_encryption = FALSE;
@@ -7512,6 +7539,17 @@ static void compose_customize_toolbar_cb(gpointer data, guint action,
toolbar_customize(widget, data);
}
+static void compose_toggle_mdn_cb(gpointer data, guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *)data;
+
+ if (GTK_CHECK_MENU_ITEM(widget)->active)
+ compose->use_mdn = TRUE;
+ else
+ compose->use_mdn = FALSE;
+}
+
#if USE_GPGME
static void compose_toggle_sign_cb(gpointer data, guint action,
GtkWidget *widget)
diff --git a/src/compose.h b/src/compose.h
index c81b31a0..10b4900b 100644
--- a/src/compose.h
+++ b/src/compose.h
@@ -170,6 +170,8 @@ struct _Compose
CharSet out_encoding;
+ gboolean use_mdn;
+
/* privacy settings */
gboolean use_signing;
gboolean use_encryption;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:29:06 +0000