X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=po%2Fja.po;h=e8313839950a3be3592c3a7d7f8cdfdccd04bfa0;hb=c22c84b23ab59c81ccd397c992b1c4adbbddeb80;hp=7bf95d9e35351c1f4ef7c8acef8d63a09f8c05ca;hpb=f5b0e714a215eddd4d9f8084b434b713f0a580b4;p=apps%2Fmadmutt.git

diff --git a/po/ja.po b/po/ja.po
index 7bf95d9..e831383 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 09:41+0000\n"
+"POT-Creation-Date: 2006-10-29 13:26+0100\n"
 "PO-Revision-Date: 2005-08-12 19:00+0900\n"
 "Last-Translator: Tamotsu TAKAHASHI <tamo@momonga-linux.org>\n"
 "Language-Team: mutt-j <mutt-j-users@lists.sourceforge.jp>\n"
@@ -16,222 +16,218 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:162
+#: account.c:163
 #, c-format
 msgid "Username at %s: "
 msgstr "%s ¤Î¥æ¡¼¥¶Ì¾: "
 
-#: account.c:219
+#: account.c:220
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É: "
 
-#: alias.c:35 browser.c:48 browser.c:57 pager.c:1372 postpone.c:43 query.c:42
-#: recvattach.c:53
+#: alias.c:36 browser.c:49 browser.c:58 pager.c:1373 postpone.c:44 query.c:43
+#: recvattach.c:56
 msgid "Exit"
 msgstr "Ìá¤ë"
 
-#: alias.c:36 curs_main.c:374 curs_main.c:387 pager.c:1379 pager.c:1389
-#: postpone.c:44
+#: alias.c:37 curs_main.c:381 curs_main.c:394 pager.c:1380 pager.c:1390
+#: postpone.c:45
 msgid "Del"
 msgstr "ºï½ü"
 
-#: alias.c:37 curs_main.c:375 curs_main.c:388 postpone.c:45
+#: alias.c:38 curs_main.c:382 curs_main.c:395 postpone.c:46
 msgid "Undel"
 msgstr "ºï½ü¤ò²ò½ü"
 
-#: alias.c:38
+#: alias.c:39
 msgid "Select"
 msgstr "ÁªÂò"
 
-#. __STRCAT_CHECKED__
-#: alias.c:39 browser.c:51 browser.c:63 compose.c:116 compose.c:128
-#: crypt-gpgme.c:3307 curs_main.c:380 curs_main.c:393 mutt_ssl.c:639
-#: mutt_ssl_gnutls.c:745 pager.c:1484 pgpkey.c:496 postpone.c:46 query.c:47
-#: recvattach.c:57 smime.c:427
+#: alias.c:40 browser.c:52 browser.c:64 compose.c:118 compose.c:130
+#: crypt-gpgme.c:3305 curs_main.c:387 curs_main.c:400 mutt_ssl.c:640
+#: mutt_ssl_gnutls.c:748 pager.c:1485 pgpkey.c:497 postpone.c:47 query.c:48
+#: recvattach.c:60 smime.c:428
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#. add a new alias
-#: alias.c:236
+#: alias.c:237
 msgid "Alias as: "
 msgstr "ÊÌ̾ÆþÎÏ: "
 
-#: alias.c:241
+#: alias.c:242
 msgid "You already have an alias defined with that name!"
 msgstr "¤¹¤Ç¤Ë¤³¤Î̾Á°¤ÎÊÌ̾¤¬¤¢¤ë!"
 
-#: alias.c:248
+#: alias.c:249
 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr "·Ù¹ð: ¤³¤ÎÊÌ̾¤ÏÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡£½¤Àµ?"
 
-#: alias.c:271
+#: alias.c:272
 msgid "Address: "
 msgstr "¥¢¥É¥ì¥¹: "
 
-#: alias.c:279 send.c:195
+#: alias.c:280 send.c:197
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "¥¨¥é¡¼: '%s' ¤ÏÉÔÀµ¤Ê IDN."
 
-#: alias.c:291
+#: alias.c:292
 msgid "Personal name: "
 msgstr "¸Ä¿Í̾: "
 
-#: alias.c:299
+#: alias.c:300
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] λ²ò?"
 
-#: alias.c:314 recvattach.c:417 recvattach.c:441 recvattach.c:454
-#: recvattach.c:469 recvattach.c:494
+#: alias.c:315 recvattach.c:437 recvattach.c:461 recvattach.c:474
+#: recvattach.c:489 recvattach.c:514
 msgid "Save to file: "
 msgstr "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: "
 
-#: alias.c:328
+#: alias.c:329
 msgid "Alias added."
 msgstr "ÊÌ̾¤òÄɲä·¤¿¡£"
 
-#: alias.c:642
+#: alias.c:643
 msgid "You have no aliases!"
 msgstr "ÊÌ̾¤¬¤Ê¤¤!"
 
-#: alias.c:654
+#: alias.c:655
 msgid "Aliases"
 msgstr "ÊÌ̾"
 
-#: attach.c:106 attach.c:227 attach.c:437 attach.c:903
+#: attach.c:107 attach.c:228 attach.c:441 attach.c:907
 msgid "Can't match nametemplate, continue?"
 msgstr "̾Á°¤Î¥Æ¥ó¥×¥ì¡¼¥È¤Ë°ìÃפµ¤»¤é¤ì¤Ê¤¤¡£Â³¹Ô?"
 
-#. For now, editing requires a file, no piping
-#: attach.c:119
+#: attach.c:120
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤Ë %%s ¤¬É¬Í×"
 
-#: attach.c:126 attach.c:245 commands.c:219 compose.c:1320 curs_lib.c:179
-#: curs_lib.c:413
+#: attach.c:127 attach.c:247 commands.c:228 compose.c:1317 curs_lib.c:168
+#: curs_lib.c:431
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "\"%s\" ¼Â¹Ô¥¨¥é¡¼!"
 
-#: attach.c:134
+#: attach.c:135
 msgid "Failure to open file to parse headers."
 msgstr "¥Ø¥Ã¥À²òÀϤΤ¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
 
-#: attach.c:162
+#: attach.c:163
 msgid "Failure to open file to strip headers."
 msgstr "¥Ø¥Ã¥Àºï½ü¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
 
-#: attach.c:171
+#: attach.c:172
 msgid "Failure to rename file."
 msgstr "¥Õ¥¡¥¤¥ë¤Î¥ê¥Í¡¼¥à (°ÜÆ°) ¤Ë¼ºÇÔ¡£"
 
-#: attach.c:184
+#: attach.c:185
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "%s ¤Î¤¿¤á¤Î mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤¬¤Ê¤¤¤Î¤Ç¶õ¥Õ¥¡¥¤¥ë¤òºîÀ®¡£"
 
-#. For now, editing requires a file, no piping
-#: attach.c:240
+#: attach.c:241
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "Mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤Ë¤Ï %%s ¤¬É¬Í×"
 
-#: attach.c:255
+#: attach.c:259
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "%s ¤Î¤¿¤á¤Î mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤¬¤Ê¤¤"
 
-#: attach.c:407
+#: attach.c:411
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "mailcap ¤Ë°ìÃ×¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£¥Æ¥­¥¹¥È¤È¤·¤Æɽ¼¨Ãæ¡£"
 
-#: attach.c:419
+#: attach.c:423
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME ·Á¼°¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£ÅºÉÕ¥Õ¥¡¥¤¥ë¤òɽ¼¨¤Ç¤­¤Ê¤¤¡£"
 
-#: attach.c:503
+#: attach.c:507
 msgid "Cannot create filter"
 msgstr "¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: attach.c:627 attach.c:656 attach.c:934 attach.c:988 handler.c:1308
-#: pgpkey.c:545 pgpkey.c:730
+#: attach.c:631 attach.c:660 attach.c:938 attach.c:992 handler.c:1139
+#: pgpkey.c:546 pgpkey.c:731
 msgid "Can't create filter"
 msgstr "¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: attach.c:785
+#: attach.c:789
 msgid "Write fault!"
 msgstr "½ñ¤­¹þ¤ß¼ºÇÔ!"
 
-#: attach.c:1011
+#: attach.c:1015
 msgid "I don't know how to print that!"
 msgstr "¤É¤Î¤è¤¦¤Ë°õºþ¤¹¤ë¤«ÉÔÌÀ!"
 
-#: browser.c:49
+#: browser.c:50
 msgid "Chdir"
 msgstr "¥Ç¥£¥ì¥¯¥È¥êÊѹ¹"
 
-#: browser.c:50 browser.c:62
+#: browser.c:51 browser.c:63
 msgid "Mask"
 msgstr "¥Þ¥¹¥¯"
 
-#: browser.c:58
+#: browser.c:59
 msgid "List"
 msgstr ""
 
-#: browser.c:59
+#: browser.c:60
 msgid "Subscribe"
 msgstr ""
 
-#: browser.c:60
+#: browser.c:61
 #, fuzzy
 msgid "Unsubscribe"
 msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..."
 
-#: browser.c:61 curs_main.c:392
+#: browser.c:62 curs_main.c:399
 msgid "Catchup"
 msgstr ""
 
-#: browser.c:522 browser.c:1173
+#: browser.c:519 browser.c:1175
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¡£"
 
-#: browser.c:685
+#: browser.c:682
 msgid "Subscribed newsgroups"
 msgstr ""
 
-#: browser.c:687
+#: browser.c:684
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: browser.c:693
+#: browser.c:690
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ [%d]"
 
-#: browser.c:699
+#: browser.c:696
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "¹ØÆÉ [%s], ¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: %s"
 
-#: browser.c:703
+#: browser.c:700
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê [%s], ¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: %s"
 
-#: browser.c:716
+#: browser.c:713
 msgid "Can't attach a directory!"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÏźÉդǤ­¤Ê¤¤!"
 
-#: browser.c:861 browser.c:1234 browser.c:1330
+#: browser.c:859 browser.c:1237 browser.c:1336
 msgid "No files match the file mask"
 msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤"
 
-#: browser.c:1046
+#: browser.c:1045
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "ºîÀ®µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
@@ -239,257 +235,256 @@ msgstr "
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
-#: browser.c:1085
+#: browser.c:1086
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "ºï½üµ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
-#: browser.c:1092
+#: browser.c:1093
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "ËÜÅö¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ \"%s\" ¤òºï½ü?"
 
-#: browser.c:1105
+#: browser.c:1106
 msgid "Mailbox deleted."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ïºï½ü¤µ¤ì¤¿¡£"
 
-#: browser.c:1112
+#: browser.c:1113
 msgid "Mailbox not deleted."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ïºï½ü¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: browser.c:1137
+#: browser.c:1138
 msgid "Chdir to: "
 msgstr "¥Ç¥£¥ì¥¯¥È¥êÊѹ¹Àè: "
 
-#: browser.c:1161 browser.c:1227
+#: browser.c:1163 browser.c:1230
 msgid "Error scanning directory."
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¹¥­¥ã¥ó¥¨¥é¡¼¡£"
 
-#: browser.c:1184
+#: browser.c:1186
 msgid "File Mask: "
 msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: "
 
-#: browser.c:1252
+#: browser.c:1255
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "µÕ½ç¤ÎÀ°Îó (d:ÆüÉÕ, a:ABC½ç, z:¥µ¥¤¥º, n:À°Î󤷤ʤ¤)"
 
-#: browser.c:1255
+#: browser.c:1258
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "À°Îó (d:ÆüÉÕ, a:ABC½ç, z:¥µ¥¤¥º, n:À°Î󤷤ʤ¤)"
 
-#: browser.c:1256
+#: browser.c:1259
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1318
+#: browser.c:1324
 msgid "New file name: "
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë̾: "
 
-#: browser.c:1347
+#: browser.c:1353
 msgid "Can't view a directory"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Ï±ÜÍ÷¤Ç¤­¤Ê¤¤"
 
-#: browser.c:1364
+#: browser.c:1370
 msgid "Error trying to view file"
 msgstr "¥Õ¥¡¥¤¥ë±ÜÍ÷¥¨¥é¡¼"
 
-#: browser.c:1446
+#: browser.c:1452
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:1448
+#: browser.c:1454
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..."
 
-#: browser.c:1465
+#: browser.c:1471
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤"
 
-#: buffy.c:515
+#: buffy.c:514
 msgid "New mail in "
 msgstr "¿·Ãå¥á¡¼¥ë¤¢¤ê: "
 
-#: color.c:311
+#: color.c:312
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "¿§ %s ¤Ï¤³¤ÎüËö¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤"
 
-#: color.c:317
+#: color.c:318
 #, c-format
 msgid "%s: no such color"
 msgstr "%s ¤È¤¤¤¦¿§¤Ï¤Ê¤¤"
 
-#: color.c:362 color.c:543 color.c:553
+#: color.c:363 color.c:544 color.c:554
 #, c-format
 msgid "%s: no such object"
 msgstr "%s ¤È¤¤¤¦¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤Ê¤¤"
 
-#: color.c:368
+#: color.c:369
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s ¥³¥Þ¥ó¥É¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤Î¤ßÍ­¸ú"
 
-#: color.c:375
+#: color.c:376
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
 
-#: color.c:534
+#: color.c:535
 msgid "Missing arguments."
 msgstr "°ú¿ô¤¬¤Ê¤¤¡£"
 
-#: color.c:570 color.c:580
+#: color.c:571 color.c:581
 msgid "color: too few arguments"
 msgstr "color: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
 
-#: color.c:605
+#: color.c:606
 msgid "mono: too few arguments"
 msgstr "mono: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
 
-#: color.c:624
+#: color.c:625
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s ¤È¤¤¤¦Â°À­¤Ï¤Ê¤¤"
 
-#: color.c:663 hook.c:68 hook.c:78 keymap.c:709
+#: color.c:664 hook.c:71 hook.c:81 keymap.c:712
 msgid "too few arguments"
 msgstr "°ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
 
-#: color.c:671 hook.c:83
+#: color.c:672 hook.c:86
 msgid "too many arguments"
 msgstr "°ú¿ô¤¬Â¿¤¹¤®¤ë"
 
-#: color.c:687
+#: color.c:688
 msgid "default colors not supported"
 msgstr "´ûÄêÃͤ理¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤"
 
-#: commands.c:79 mbox.c:611
+#: commands.c:80 mbox.c:612
 msgid "Could not create temporary file!"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿!"
 
-#: commands.c:91
+#: commands.c:92
 msgid "Cannot create display filter"
 msgstr "ɽ¼¨ÍÑ¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#. find out whether or not the verify signature
-#: commands.c:122
+#: commands.c:123
 msgid "Verify PGP signature?"
 msgstr "PGP ½ð̾¤ò¸¡¾Ú?"
 
-#: commands.c:153
+#: commands.c:154
 msgid "Could not copy message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: commands.c:185
+#: commands.c:194
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
 
-#: commands.c:187
+#: commands.c:196
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME ¾ÚÌÀ½ñ½êÍ­¼Ô¤¬Á÷¿®¼Ô¤Ë°ìÃפ·¤Ê¤¤¡£"
 
-#: commands.c:191 commands.c:202
+#: commands.c:200 commands.c:211
 msgid "Warning: Part of this message has not been signed."
 msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤Î°ìÉô¤Ï½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: commands.c:193
+#: commands.c:202
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME ½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:199
+#: commands.c:208
 msgid "PGP signature successfully verified."
 msgstr "PGP ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
 
-#: commands.c:204
+#: commands.c:213
 msgid "PGP signature could NOT be verified."
 msgstr "PGP ½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:225
+#: commands.c:234
 msgid "Command: "
 msgstr "¥³¥Þ¥ó¥É: "
 
-#: commands.c:244 recvcmd.c:137
+#: commands.c:253 recvcmd.c:138
 msgid "Bounce message to: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
 
-#: commands.c:246 recvcmd.c:139
+#: commands.c:255 recvcmd.c:140
 msgid "Bounce tagged messages to: "
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
 
-#: commands.c:259 recvcmd.c:147
+#: commands.c:268 recvcmd.c:148
 msgid "Error parsing address!"
 msgstr "¥¢¥É¥ì¥¹²òÀÏ¥¨¥é¡¼!"
 
-#: commands.c:267 recvcmd.c:155
+#: commands.c:276 recvcmd.c:156
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "ÉÔÀµ¤Ê IDN: '%s'"
 
-#: commands.c:278 recvcmd.c:169
+#: commands.c:287 recvcmd.c:170
 #, c-format
 msgid "Bounce message to %s"
 msgstr "%s ¤Ø¥á¥Ã¥»¡¼¥¸ºÆÁ÷"
 
-#: commands.c:278 recvcmd.c:169
+#: commands.c:287 recvcmd.c:170
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "%s ¤Ø¥á¥Ã¥»¡¼¥¸ºÆÁ÷"
 
-#: commands.c:293 recvcmd.c:184
+#: commands.c:302 recvcmd.c:185
 msgid "Message not bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:293 recvcmd.c:184
+#: commands.c:302 recvcmd.c:185
 msgid "Messages not bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: commands.c:303 recvcmd.c:201
+#: commands.c:312 recvcmd.c:202
 msgid "Message bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºÆÁ÷¤·¤¿¡£"
 
-#: commands.c:303 recvcmd.c:201
+#: commands.c:312 recvcmd.c:202
 msgid "Messages bounced."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºÆÁ÷¤·¤¿¡£"
 
-#: commands.c:371 commands.c:402 commands.c:419
+#: commands.c:380 commands.c:411 commands.c:428
 msgid "Can't create filter process"
 msgstr "¥Õ¥£¥ë¥¿¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: commands.c:449
+#: commands.c:458
 msgid "Pipe to command: "
 msgstr "¥³¥Þ¥ó¥É¤Ø¤Î¥Ñ¥¤¥×: "
 
-#: commands.c:463
+#: commands.c:472
 msgid "No printing command has been defined."
 msgstr "°õºþ¥³¥Þ¥ó¥É¤¬Ì¤ÄêµÁ¡£"
 
-#: commands.c:468
+#: commands.c:477
 msgid "Print message?"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò°õºþ?"
 
-#: commands.c:468
+#: commands.c:477
 msgid "Print tagged messages?"
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò°õºþ?"
 
-#: commands.c:475
+#: commands.c:484
 msgid "Message printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤µ¤ì¤¿"
 
-#: commands.c:475
+#: commands.c:484
 msgid "Messages printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤µ¤ì¤¿"
 
-#: commands.c:477
+#: commands.c:486
 msgid "Message could not be printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: commands.c:478
+#: commands.c:487
 msgid "Messages could not be printed"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: commands.c:488
+#: commands.c:497
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
@@ -497,125 +492,100 @@ msgstr ""
 "µÕ½çÀ°Îó (d:»þ f:Á÷¼Ô r:Ãå½ç s:Âê o:°¸Àè t:¥¹¥ì u:̵ z:¥µ¥¤¥º c:ÆÀÅÀ p:¥¹¥Ñ"
 "¥à)"
 
-#: commands.c:491
+#: commands.c:500
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
 "À°Îó (d:»þ f:Á÷¼Ô r:Ãå½ç s:Âê o:°¸Àè t:¥¹¥ì u:̵ z:¥µ¥¤¥º c:ÆÀÅÀ p:¥¹¥Ñ¥à)"
 
-#: commands.c:492
+#: commands.c:501
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzcp"
 
-#: commands.c:548
+#: commands.c:557
 msgid "Shell command: "
 msgstr "¥·¥§¥ë¥³¥Þ¥ó¥É: "
 
-#: commands.c:689
+#: commands.c:698
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥Ç¥³¡¼¥É¤·¤ÆÊݸ"
 
-#: commands.c:690
+#: commands.c:699
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥Ç¥³¡¼¥É¤·¤Æ¥³¥Ô¡¼"
 
-#: commands.c:691
+#: commands.c:700
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÉü¹æ²½¤·¤ÆÊݸ"
 
-#: commands.c:692
+#: commands.c:701
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÉü¹æ²½¤·¤Æ¥³¥Ô¡¼"
 
-#: commands.c:693
+#: commands.c:702
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊݸ"
 
-#: commands.c:693
+#: commands.c:702
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥³¥Ô¡¼"
 
-#: commands.c:694
+#: commands.c:703
 msgid " tagged"
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò"
 
-#: commands.c:759
+#: commands.c:768
 #, c-format
 msgid "Copying to %s..."
 msgstr "%s ¤Ë¥³¥Ô¡¼Ãæ..."
 
-#: commands.c:843
-#, fuzzy
-msgid "Unable to create backup file"
-msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤"
-
-#: commands.c:849
-#, fuzzy
-msgid "Unable to open backup file for reading"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
-
-#: commands.c:856
-#, fuzzy
-msgid "Unable to open new file for writing"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
-
-#: commands.c:863
-#, c-format
-msgid "Unable to lock %s, old file saved as %s"
-msgstr ""
-
-#: commands.c:940
-#, c-format
-msgid "Cannot write new %s, old file saved as %s"
-msgstr ""
-
-#: commands.c:1001
+#: commands.c:890
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Á÷¿®»þ¤Ë %s ¤ËÊÑ´¹?"
 
-#: commands.c:1011
+#: commands.c:900
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type¤ò %s ¤ËÊѹ¹¤·¤¿¡£"
 
-#: commands.c:1015
+#: commands.c:904
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "ʸ»ú¥»¥Ã¥È¤ò %s ¤ËÊѹ¹¤·¤¿; %s¡£"
 
-#: commands.c:1017
+#: commands.c:906
 msgid "not converting"
 msgstr "ÊÑ´¹¤Ê¤·"
 
-#: commands.c:1017
+#: commands.c:906
 msgid "converting"
 msgstr "ÊÑ´¹¤¢¤ê"
 
-#: compose.c:53
+#: compose.c:54
 msgid "There are no attachments."
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤¡£"
 
-#: compose.c:109 compose.c:122
+#: compose.c:111 compose.c:124
 msgid "Send"
 msgstr "Á÷¿®"
 
-#: compose.c:110 compose.c:123 remailer.c:458
+#: compose.c:112 compose.c:125 remailer.c:463
 msgid "Abort"
 msgstr "̾ȧ"
 
-#: compose.c:114 compose.c:126 compose.c:783
+#: compose.c:116 compose.c:128 compose.c:783
 msgid "Attach file"
 msgstr "¥Õ¥¡¥¤¥ëźÉÕ"
 
-#: compose.c:115 compose.c:127
+#: compose.c:117 compose.c:129
 msgid "Descrip"
 msgstr "ÆâÍÆÀâÌÀ"
 
@@ -679,119 +649,119 @@ msgstr "
 msgid "You may not delete the only attachment."
 msgstr "Í£°ì¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤Ï¤¤¤±¤Ê¤¤¡£"
 
-#: compose.c:718 send.c:1543
+#: compose.c:718 send.c:1580
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "\"%s\" Ãæ¤ËÉÔÀµ¤Ê IDN: '%s'"
 
-#: compose.c:800
+#: compose.c:799
 msgid "Attaching selected files..."
 msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òźÉÕÃæ..."
 
-#: compose.c:812
+#: compose.c:811
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s ¤ÏźÉդǤ­¤Ê¤¤!"
 
-#: compose.c:835
+#: compose.c:834
 msgid "Open mailbox to attach message from"
 msgstr "Ãæ¤Î¥á¥Ã¥»¡¼¥¸¤òźÉÕ¤¹¤ë¤¿¤á¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: compose.c:843
+#: compose.c:842
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Ãæ¤Î¥á¥Ã¥»¡¼¥¸¤òźÉÕ¤¹¤ë¤¿¤á¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: compose.c:894
+#: compose.c:893
 msgid "No messages in that folder."
 msgstr "¤½¤Î¥Õ¥©¥ë¥À¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: compose.c:905
+#: compose.c:904
 msgid "Tag the messages you want to attach!"
 msgstr "źÉÕ¤·¤¿¤¤¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤è!"
 
-#: compose.c:935
+#: compose.c:932
 msgid "Unable to attach!"
 msgstr "źÉդǤ­¤Ê¤¤!"
 
-#: compose.c:985
+#: compose.c:982
 msgid "Recoding only affects text attachments."
 msgstr "¥³¡¼¥ÉÊÑ´¹¤Ï¥Æ¥­¥¹¥È·¿ÅºÉÕ¥Õ¥¡¥¤¥ë¤Ë¤Î¤ßÍ­¸ú¡£"
 
-#: compose.c:990
+#: compose.c:987
 msgid "The current attachment won't be converted."
 msgstr "¸½ºß¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤ÏÊÑ´¹¤µ¤ì¤Ê¤¤¡£"
 
-#: compose.c:992
+#: compose.c:989
 msgid "The current attachment will be converted."
 msgstr "¸½ºß¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤ÏÊÑ´¹¤µ¤ì¤ë¡£"
 
-#: compose.c:1063
+#: compose.c:1060
 msgid "Invalid encoding."
 msgstr "ÉÔÀµ¤Ê¥¨¥ó¥³¡¼¥ÉË¡¡£"
 
-#: compose.c:1087
+#: compose.c:1084
 msgid "Save a copy of this message?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Î¥³¥Ô¡¼¤òÊݸ?"
 
-#: compose.c:1143
+#: compose.c:1140
 msgid "Rename to: "
 msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) Àè: "
 
 # system call ¤Î stat() ¤ò¡Ö°À­Ä´ºº¡×¤ÈÌõ¤·¤Æ¤¤¤ë
-#: compose.c:1146 editmsg.c:107 sendlib.c:820
+#: compose.c:1143 editmsg.c:108 sendlib.c:821
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "%s ¤ò°À­Ä´ºº¤Ç¤­¤Ê¤¤: %s"
 
-#: compose.c:1173
+#: compose.c:1170
 msgid "New file: "
 msgstr "¿·µ¬¥Õ¥¡¥¤¥ë: "
 
-#: compose.c:1185
+#: compose.c:1182
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ¤Ï base/sub ¤È¤¤¤¦·Á¼°¤Ë¤¹¤ë¤³¤È"
 
-#: compose.c:1191
+#: compose.c:1188
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "%s ¤ÏÉÔÌÀ¤Ê Content-Type"
 
-#: compose.c:1202
+#: compose.c:1199
 #, c-format
 msgid "Can't create file %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: compose.c:1210
+#: compose.c:1207
 msgid "What we have here is a failure to make an attachment"
 msgstr "¤Ä¤Þ¤êźÉÕ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤¿¤È¤¤¤¦¤³¤È¤À"
 
-#: compose.c:1281
+#: compose.c:1278
 msgid "Postpone this message?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¤«¤±¤ÇÊÝα?"
 
-#: compose.c:1337
+#: compose.c:1334
 msgid "Write message to mailbox"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë½ñ¤­¹þ¤à"
 
-#: compose.c:1339
+#: compose.c:1336
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë½ñ¤­¹þ¤ßÃæ..."
 
-#: compose.c:1348
+#: compose.c:1345
 msgid "Message written."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï½ñ¤­¹þ¤Þ¤ì¤¿¡£"
 
-#: compose.c:1359
+#: compose.c:1356
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
 
-#: compose.c:1383
+#: compose.c:1380
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
 
-#: compress.c:202 mbox.c:519
+#: compress.c:202 mbox.c:520
 msgid "Mailbox was corrupted!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤³¤ï¤ì¤¿!"
 
@@ -800,7 +770,7 @@ msgstr "
 msgid "Decompressing %s..."
 msgstr "%s ¤òÁªÂòÃæ..."
 
-#: compress.c:245 compress.c:363 compress.c:438 mbox.c:586
+#: compress.c:245 compress.c:363 compress.c:438 mbox.c:587
 msgid "Unable to lock mailbox!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¥í¥Ã¥¯ÉÔǽ!"
 
@@ -846,46 +816,45 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: crypt.c:65
+#: crypt.c:66
 #, c-format
 msgid " (current time: %c)"
 msgstr " (¸½ºß»þ¹ï: %c)"
 
-#: crypt.c:71
+#: crypt.c:72
 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- %s ½ÐÎϤϰʲ¼¤ÎÄ̤ê%s --]\n"
 
-#: crypt.c:87
+#: crypt.c:88
 msgid "Passphrase(s) forgotten."
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¹¤Ù¤Æ¥á¥â¥ê¤«¤é¾Ãµî¤µ¤ì¤¿¡£"
 
-#: crypt.c:144 cryptglue.c:102 pgpkey.c:536
+#: crypt.c:145 cryptglue.c:103 pgpkey.c:537
 msgid "Invoking PGP..."
 msgstr "PGP µ¯Æ°Ãæ..."
 
-#: crypt.c:156
+#: crypt.c:157
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥¤¥ó¥é¥¤¥ó¤ÇÁ÷¿®¤Ç¤­¤Ê¤¤¡£PGP/MIME ¤ò»È¤¦?"
 
-#: crypt.c:158 send.c:1490
+#: crypt.c:159 send.c:1527 send.c:1625
 msgid "Mail not sent."
 msgstr "¥á¡¼¥ë¤ÏÁ÷¿®¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
-#: crypt.c:385
+#: crypt.c:386
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "ÆâÍÆ¥Ò¥ó¥È¤Î¤Ê¤¤ S/MIME ¥á¥Ã¥»¡¼¥¸¤Ï̤¥µ¥Ý¡¼¥È¡£"
 
-#: crypt.c:588 crypt.c:627
+#: crypt.c:589 crypt.c:628
 msgid "Trying to extract PGP keys...\n"
 msgstr "PGP ¸°¤ÎŸ³«¤ò»î¹ÔÃæ...\n"
 
-#. else ?
-#: crypt.c:610 crypt.c:646
+#: crypt.c:611 crypt.c:647
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S/MIME ¾ÚÌÀ½ñ¤ÎŸ³«¤ò»î¹ÔÃæ...\n"
 
-#: crypt.c:762
+#: crypt.c:763
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -893,7 +862,7 @@ msgstr ""
 "[-- ¥¨¥é¡¼: multipart/signed ¹½Â¤¤¬Ì·½â¤·¤Æ¤¤¤ë! --]\n"
 "\n"
 
-#: crypt.c:779
+#: crypt.c:780
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -902,7 +871,7 @@ msgstr ""
 "[-- ¥¨¥é¡¼: ÉÔÌÀ¤Ê multipart/signed ¥×¥í¥È¥³¥ë %s! --]\n"
 "\n"
 
-#: crypt.c:814
+#: crypt.c:815
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -911,8 +880,7 @@ msgstr ""
 "[-- ·Ù¹ð: ¤³¤Î Mutt ¤Ç¤Ï %s/%s ½ð̾¤ò¸¡¾Ú¤Ç¤­¤Ê¤¤ --]\n"
 "\n"
 
-#. Now display the signed body
-#: crypt.c:826
+#: crypt.c:827
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -920,7 +888,7 @@ msgstr ""
 "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï½ð̾¤µ¤ì¤Æ¤¤¤ë --]\n"
 "\n"
 
-#: crypt.c:832
+#: crypt.c:833
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -928,7 +896,7 @@ msgstr ""
 "[-- ·Ù¹ð: °ì¤Ä¤â½ð̾¤ò¸¡½Ð¤Ç¤­¤Ê¤«¤Ã¤¿ --]\n"
 "\n"
 
-#: crypt.c:839
+#: crypt.c:840
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -936,173 +904,166 @@ msgstr ""
 "\n"
 "[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
 
-#: cryptglue.c:81
+#: cryptglue.c:82
 msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
 msgstr ""
 "crypt_use_gpgme ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤¬ GPGME ¥µ¥Ý¡¼¥ÈÉÕ¤­¤Ç¥Ó¥ë¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: cryptglue.c:105
-msgid "Invoking SMIME..."
+#: cryptglue.c:106
+#, fuzzy
+msgid "Invoking S/MIME..."
 msgstr "S/MIME µ¯Æ°Ãæ..."
 
-#: crypt-gpgme.c:326
+#: crypt-gpgme.c:325
 #, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr "gpgme ¥³¥ó¥Æ¥¯¥¹¥ÈºîÀ®¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:334
+#: crypt-gpgme.c:333
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr "CMS ¥×¥í¥È¥³¥ëµ¯Æ°¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:352
+#: crypt-gpgme.c:351
 #, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr "gpgme ¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥ÈºîÀ®¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:411 crypt-gpgme.c:428 crypt-gpgme.c:1245
+#: crypt-gpgme.c:410 crypt-gpgme.c:427 crypt-gpgme.c:1244
 #, c-format
 msgid "error allocating data object: %s\n"
 msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥È³ä¤êÅö¤Æ¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:445
+#: crypt-gpgme.c:444
 #, c-format
 msgid "error rewinding data object: %s\n"
 msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥È´¬¤­Ìᤷ¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:463 crypt-gpgme.c:505
+#: crypt-gpgme.c:462 crypt-gpgme.c:504
 #, c-format
 msgid "error reading data object: %s\n"
 msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥ÈÆɤ߽Ф·¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:561
+#: crypt-gpgme.c:560
 #, c-format
 msgid "error adding recipient `%s': %s\n"
 msgstr "¼õ¿®¼Ô %s ¤ÎÄɲäǥ¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:598
+#: crypt-gpgme.c:597
 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr "ÈëÌ©¸° %s ¤¬¸«ÉÕ¤«¤é¤Ê¤¤: %s\n"
 
-#: crypt-gpgme.c:607
+#: crypt-gpgme.c:606
 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
 msgstr "ÈëÌ©¸°¤Î»ØÄ꤬¤¢¤¤¤Þ¤¤: %s\n"
 
-#: crypt-gpgme.c:617
+#: crypt-gpgme.c:616
 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr "ÈëÌ©¸° %s ÀßÄêÃæ¤Ë¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:658
+#: crypt-gpgme.c:657
 #, c-format
 msgid "error encrypting data: %s\n"
 msgstr "¥Ç¡¼¥¿°Å¹æ²½¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:751
+#: crypt-gpgme.c:750
 #, c-format
 msgid "error signing data: %s\n"
 msgstr "¥Ç¡¼¥¿½ð̾¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:939
+#: crypt-gpgme.c:938
 msgid "Warning: One of the keys has been revoked\n"
 msgstr "·Ù¹ð: ÇÑ´þºÑ¤ß¤Î¸°¤¬¤¢¤ë\n"
 
-#: crypt-gpgme.c:947
+#: crypt-gpgme.c:946
 msgid "Warning: The key used to create the signature expired at: "
 msgstr "·Ù¹ð: ½ð̾¤òºîÀ®¤·¤¿¸°¤Ï´ü¸ÂÀÚ¤ì: ´ü¸Â¤Ï "
 
-#: crypt-gpgme.c:953
+#: crypt-gpgme.c:952
 msgid "Warning: At least one certification key has expired\n"
 msgstr "·Ù¹ð: ¾¯¤Ê¤¯¤È¤â°ì¤Ä¤Î¾ÚÌÀ½ñ¤Ç¸°¤¬´ü¸ÂÀÚ¤ì\n"
 
-#: crypt-gpgme.c:967
+#: crypt-gpgme.c:966
 msgid "Warning: The signature expired at: "
 msgstr "·Ù¹ð: ½ð̾¤¬´ü¸ÂÀÚ¤ì: ´ü¸Â¤Ï "
 
-#: crypt-gpgme.c:973
+#: crypt-gpgme.c:972
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr "¸°¤ä¾ÚÌÀ½ñ¤ÎÉÔ­¤Ë¤è¤ê¡¢¸¡¾Ú¤Ç¤­¤Ê¤¤\n"
 
-#: crypt-gpgme.c:977
+#: crypt-gpgme.c:976
 msgid "The CRL is not available\n"
 msgstr "CRL ¤¬ÍøÍѤǤ­¤Ê¤¤\n"
 
-#: crypt-gpgme.c:982
+#: crypt-gpgme.c:981
 msgid "Available CRL is too old\n"
 msgstr "ÍøÍѤǤ­¤ë CRL ¤Ï¸Å¤¹¤®¤ë\n"
 
-#: crypt-gpgme.c:987
+#: crypt-gpgme.c:986
 msgid "A policy requirement was not met\n"
 msgstr "¥Ý¥ê¥·¡¼¤Î¾ò·ï¤¬Ëþ¤¿¤µ¤ì¤Ê¤«¤Ã¤¿\n"
 
-#: crypt-gpgme.c:995
+#: crypt-gpgme.c:994
 msgid "A system error occurred"
 msgstr "¥·¥¹¥Æ¥à¥¨¥é¡¼¤¬È¯À¸"
 
-#: crypt-gpgme.c:1028 crypt-gpgme.c:2826
+#: crypt-gpgme.c:1027 crypt-gpgme.c:2824
 msgid "Fingerprint: "
 msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: "
 
-#: crypt-gpgme.c:1083
+#: crypt-gpgme.c:1082
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr "·Ù¹ð: ¤³¤Î¸°¤¬¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤«¤É¤¦¤«¤ò¼¨¤¹¾Úµò¤Ï°ìÀڤʤ¤\n"
 
-#: crypt-gpgme.c:1089
+#: crypt-gpgme.c:1088
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤Ç¤Ï¤Ê¤¤!\n"
 
-#: crypt-gpgme.c:1093
+#: crypt-gpgme.c:1092
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr "·Ù¹ð: ¤³¤Î¸°¤¬³Î¼Â¤Ë¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤À¤È¤Ï¸À¤¨¤Ê¤¤\n"
 
-#: crypt-gpgme.c:1161
+#: crypt-gpgme.c:1160
 msgid "Error getting key information: "
 msgstr "¸°¤Î¾ðÊó¼èÆÀ¥¨¥é¡¼: "
 
-#. We can't decide (yellow) but this is a PGP key with a good
-#. signature, so we display what a PGP user expects: The name,
-#. fingerprint and the key validity (which is neither fully or
-#. ultimate).
-#: crypt-gpgme.c:1167 crypt-gpgme.c:1197
+#: crypt-gpgme.c:1166 crypt-gpgme.c:1196
 msgid "Good signature from: "
 msgstr "Àµ¤·¤¤½ð̾: "
 
-#: crypt-gpgme.c:1176
+#: crypt-gpgme.c:1175
 msgid "                aka: "
 msgstr "¡¡¡¡¡¡ÊÌ̾: "
 
-#: crypt-gpgme.c:1180 crypt-gpgme.c:1200
+#: crypt-gpgme.c:1179 crypt-gpgme.c:1199
 msgid "            created: "
 msgstr "¡¡½ð̾ÆüÉÕ: "
 
-#: crypt-gpgme.c:1188
+#: crypt-gpgme.c:1187
 msgid "*BAD* signature claimed to be from: "
 msgstr "**ÉÔÀµ¤Ê½ð̾**¡¡¼çÄ¥: "
 
-#. can't decide (yellow)
-#: crypt-gpgme.c:1210
+#: crypt-gpgme.c:1209
 msgid "Error checking signature"
 msgstr "½ð̾¸¡¾Ú¥¨¥é¡¼"
 
-#. Note: We don't need a current time output because GPGME avoids
-#. such an attack by separating the meta information from the
-#. data.
-#: crypt-gpgme.c:1253 crypt-gpgme.c:1437 crypt-gpgme.c:1900
+#: crypt-gpgme.c:1252 crypt-gpgme.c:1436 crypt-gpgme.c:1900
 msgid "[-- Begin signature information --]\n"
 msgstr "[-- ½ð̾¾ðÊó³«»Ï --]\n"
 
-#: crypt-gpgme.c:1261
+#: crypt-gpgme.c:1260
 #, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "¥¨¥é¡¼: ¸¡¾Ú¤Ë¼ºÇÔ¤·¤¿: %s\n"
 
-#: crypt-gpgme.c:1318 crypt-gpgme.c:1448 crypt-gpgme.c:1913
+#: crypt-gpgme.c:1317 crypt-gpgme.c:1447 crypt-gpgme.c:1913
 msgid ""
 "[-- End signature information --]\n"
 "\n"
@@ -1110,7 +1071,7 @@ msgstr ""
 "[-- ½ð̾¾ðÊó½ªÎ» --]\n"
 "\n"
 
-#: crypt-gpgme.c:1407
+#: crypt-gpgme.c:1406
 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
@@ -1128,7 +1089,7 @@ msgstr "
 msgid "Error: copy data failed\n"
 msgstr "¥¨¥é¡¼: ¥Ç¡¼¥¿¤Î¥³¥Ô¡¼¤Ë¼ºÇÔ¤·¤¿\n"
 
-#: crypt-gpgme.c:1938 pgp.c:390
+#: crypt-gpgme.c:1938 pgp.c:408
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -1136,11 +1097,11 @@ msgstr ""
 "[-- PGP ¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
 "\n"
 
-#: crypt-gpgme.c:1940 pgp.c:392
+#: crypt-gpgme.c:1940 pgp.c:410
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯³«»Ï --]\n"
 
-#: crypt-gpgme.c:1942 pgp.c:394
+#: crypt-gpgme.c:1942 pgp.c:412
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -1148,19 +1109,19 @@ msgstr ""
 "[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
 "\n"
 
-#: crypt-gpgme.c:1965 pgp.c:417
+#: crypt-gpgme.c:1965 pgp.c:435
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- PGP¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
 
-#: crypt-gpgme.c:1967 pgp.c:421
+#: crypt-gpgme.c:1967 pgp.c:442
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯½ªÎ» --]\n"
 
-#: crypt-gpgme.c:1969 pgp.c:423
+#: crypt-gpgme.c:1969 pgp.c:444
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
 
-#: crypt-gpgme.c:1987 pgp.c:451
+#: crypt-gpgme.c:1987 pgp.c:472
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -1168,7 +1129,7 @@ msgstr ""
 "[-- ¥¨¥é¡¼: PGP ¥á¥Ã¥»¡¼¥¸¤Î³«»ÏÅÀ¤òȯ¸«¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2016 pgp.c:857
+#: crypt-gpgme.c:2016 pgp.c:878
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -1176,7 +1137,7 @@ msgstr ""
 "[-- ¥¨¥é¡¼: ÉÔÀµ¤Ê·Á¼°¤Î PGP/MIME ¥á¥Ã¥»¡¼¥¸! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2027 crypt-gpgme.c:2090 pgp.c:871
+#: crypt-gpgme.c:2027 crypt-gpgme.c:2090 pgp.c:892
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 
@@ -1188,7 +1149,7 @@ msgstr ""
 "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç½ð̾¤ª¤è¤Ó°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
 "\n"
 
-#: crypt-gpgme.c:2040 pgp.c:882
+#: crypt-gpgme.c:2040 pgp.c:903
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -1200,7 +1161,7 @@ msgstr ""
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- PGP/MIME ½ð̾¤ª¤è¤Ó°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
 
-#: crypt-gpgme.c:2063 pgp.c:902
+#: crypt-gpgme.c:2063 pgp.c:923
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
 
@@ -1228,567 +1189,559 @@ msgstr "[-- S/MIME 
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr "[-- S/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
 
-#: crypt-gpgme.c:2679
+#: crypt-gpgme.c:2677
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (ʸ»ú¥³¡¼¥É¤¬ÉÔÌÀ)]"
 
-#: crypt-gpgme.c:2681
+#: crypt-gpgme.c:2679
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (ʸ»ú¥³¡¼¥É¤¬ÉÔÀµ)]"
 
-#: crypt-gpgme.c:2686
+#: crypt-gpgme.c:2684
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (DN ¤¬ÉÔÀµ)]"
 
 # "¥·¥ê¥¢¥ëÈÖ¹æ" == Á´³Ñ 6 ʸ»ú
 # "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È" == Á´³Ñ 9 ʸ»ú
-#: crypt-gpgme.c:2758
+#: crypt-gpgme.c:2756
 msgid " aka ......: "
 msgstr " ÊÌ̾ ............: "
 
-#: crypt-gpgme.c:2758
+#: crypt-gpgme.c:2756
 msgid "Name ......: "
 msgstr "̾Á° .............: "
 
-#: crypt-gpgme.c:2761 crypt-gpgme.c:2882
+#: crypt-gpgme.c:2759 crypt-gpgme.c:2880
 msgid "[Invalid]"
 msgstr "[ÉÔÀµ]"
 
-#: crypt-gpgme.c:2780 crypt-gpgme.c:2903
+#: crypt-gpgme.c:2778 crypt-gpgme.c:2901
 #, c-format
 msgid "Valid From : %s\n"
 msgstr "ȯ¸ú´üÆü .........: %s\n"
 
-#: crypt-gpgme.c:2792 crypt-gpgme.c:2915
+#: crypt-gpgme.c:2790 crypt-gpgme.c:2913
 #, c-format
 msgid "Valid To ..: %s\n"
 msgstr "Í­¸ú´ü¸Â .........: %s\n"
 
-#: crypt-gpgme.c:2805 crypt-gpgme.c:2928
+#: crypt-gpgme.c:2803 crypt-gpgme.c:2926
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr "¸°¼ïÊÌ ...........: %s, %lu ¥Ó¥Ã¥È %s\n"
 
-#: crypt-gpgme.c:2807 crypt-gpgme.c:2930
+#: crypt-gpgme.c:2805 crypt-gpgme.c:2928
 #, c-format
 msgid "Key Usage .: "
 msgstr "¸°Ç½ÎÏ ...........: "
 
-#: crypt-gpgme.c:2811 crypt-gpgme.c:2934
+#: crypt-gpgme.c:2809 crypt-gpgme.c:2932
 msgid "encryption"
 msgstr "°Å¹æ²½"
 
-#: crypt-gpgme.c:2812 crypt-gpgme.c:2816 crypt-gpgme.c:2820 crypt-gpgme.c:2935
-#: crypt-gpgme.c:2939 crypt-gpgme.c:2943
+#: crypt-gpgme.c:2810 crypt-gpgme.c:2814 crypt-gpgme.c:2818 crypt-gpgme.c:2933
+#: crypt-gpgme.c:2937 crypt-gpgme.c:2941
 msgid ", "
 msgstr "¡¢"
 
-#: crypt-gpgme.c:2815 crypt-gpgme.c:2938
+#: crypt-gpgme.c:2813 crypt-gpgme.c:2936
 msgid "signing"
 msgstr "½ð̾"
 
-#: crypt-gpgme.c:2819 crypt-gpgme.c:2942
+#: crypt-gpgme.c:2817 crypt-gpgme.c:2940
 msgid "certification"
 msgstr "¾ÚÌÀ"
 
-#: crypt-gpgme.c:2853
+#: crypt-gpgme.c:2851
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr "¥·¥ê¥¢¥ëÈÖ¹æ .....: 0x%s\n"
 
-#: crypt-gpgme.c:2859
+#: crypt-gpgme.c:2857
 #, c-format
 msgid "Issued By .: "
 msgstr "ȯ¹Ô¼Ô ...........: "
 
-#. display only the short keyID
-#: crypt-gpgme.c:2875
+#: crypt-gpgme.c:2873
 #, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Éû¸° .............: 0x%s"
 
-#: crypt-gpgme.c:2878
+#: crypt-gpgme.c:2876
 msgid "[Revoked]"
 msgstr "[ÇÑ´þºÑ¤ß]"
 
-#: crypt-gpgme.c:2886
+#: crypt-gpgme.c:2884
 msgid "[Expired]"
 msgstr "[´ü¸ÂÀÚ¤ì]"
 
-#: crypt-gpgme.c:2890
+#: crypt-gpgme.c:2888
 msgid "[Disabled]"
 msgstr "[»ÈÍÑÉÔ²Ä]"
 
-#: crypt-gpgme.c:2967 pgpkey.c:531 pgpkey.c:710
+#: crypt-gpgme.c:2965 pgpkey.c:532 pgpkey.c:711
 msgid "Can't create temporary file"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
-#: crypt-gpgme.c:2971
+#: crypt-gpgme.c:2969
 msgid "Collecting data..."
 msgstr "¥Ç¡¼¥¿¼ý½¸Ãæ..."
 
-#: crypt-gpgme.c:2994
+#: crypt-gpgme.c:2992
 #, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "ȯ¹Ô¼Ô¸°¤Î¼èÆÀ¥¨¥é¡¼: %s\n"
 
-#: crypt-gpgme.c:3002
+#: crypt-gpgme.c:3000
 msgid "Error: certification chain to long - stopping here\n"
 msgstr "¥¨¥é¡¼: ¾ÚÌÀ½ñ¤ÎÏ¢º¿¤¬Ä¹¤¹¤®¤ë - ¤³¤³¤Ç¤ä¤á¤Æ¤ª¤¯\n"
 
-#: crypt-gpgme.c:3012 pgpkey.c:556
+#: crypt-gpgme.c:3010 pgpkey.c:557
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "¸° ID: 0x%s"
 
-#: crypt-gpgme.c:3088
+#: crypt-gpgme.c:3086
 #, c-format
 msgid "gpgme_new failed: %s"
 msgstr "gpgme_new ¼ºÇÔ: %s"
 
-#: crypt-gpgme.c:3123 crypt-gpgme.c:3179
+#: crypt-gpgme.c:3121 crypt-gpgme.c:3177
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr "gpgme_op_keylist_start ¼ºÇÔ: %s"
 
-#: crypt-gpgme.c:3168 crypt-gpgme.c:3204
+#: crypt-gpgme.c:3166 crypt-gpgme.c:3202
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr "gpgme_op_keylist_next ¼ºÇÔ: %s"
 
-#: crypt-gpgme.c:3270
+#: crypt-gpgme.c:3268
 msgid "All matching keys are marked expired/revoked."
 msgstr "°ìÃפ·¤¿¸°¤Ï¤¹¤Ù¤Æ´ü¸ÂÀڤ줫ÇÑ´þºÑ¤ß¡£"
 
-#: crypt-gpgme.c:3299 mutt_ssl.c:637 mutt_ssl_gnutls.c:743 pgpkey.c:488
-#: smime.c:422
+#: crypt-gpgme.c:3297 mutt_ssl.c:638 mutt_ssl_gnutls.c:746 pgpkey.c:489
+#: smime.c:423
 msgid "Exit  "
 msgstr "½ªÎ»  "
 
-#. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3301 pgpkey.c:490 smime.c:424
+#: crypt-gpgme.c:3299 pgpkey.c:491 smime.c:425
 msgid "Select  "
 msgstr "ÁªÂò  "
 
-#. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3304 pgpkey.c:493
+#: crypt-gpgme.c:3302 pgpkey.c:494
 msgid "Check key  "
 msgstr "¸°¸¡ºº  "
 
-#: crypt-gpgme.c:3321
+#: crypt-gpgme.c:3319
 msgid "PGP and S/MIME keys matching"
 msgstr "°ìÃפ¹¤ë PGP ¤ª¤è¤Ó S/MIME ¸°"
 
-#: crypt-gpgme.c:3323
+#: crypt-gpgme.c:3321
 msgid "PGP keys matching"
 msgstr "°ìÃפ¹¤ë PGP ¸°"
 
-#: crypt-gpgme.c:3325
+#: crypt-gpgme.c:3323
 msgid "S/MIME keys matching"
 msgstr "°ìÃפ¹¤ë S/MIME ¸°"
 
-#: crypt-gpgme.c:3327
+#: crypt-gpgme.c:3325
 msgid "keys matching"
 msgstr "°ìÃפ¹¤ë¸°"
 
 # "<hoge@example.org> ¤Ë°ìÃפ¹¤ë S/MIME ¸°¡£"
-#: crypt-gpgme.c:3330
+#: crypt-gpgme.c:3328
 #, c-format
 msgid "%s <%s>."
 msgstr "<%2$s> ¤Ë%1$s¡£"
 
-#: crypt-gpgme.c:3332
+#: crypt-gpgme.c:3330
 #, c-format
 msgid "%s \"%s\"."
 msgstr "¡Ö%2$s¡×¤Ë%1$s¡£"
 
-#: crypt-gpgme.c:3355 pgpkey.c:576
+#: crypt-gpgme.c:3353 pgpkey.c:577
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¤Î¤¿¤á¡¢»È¤¨¤Ê¤¤¡£"
 
-#: crypt-gpgme.c:3368 pgpkey.c:588
+#: crypt-gpgme.c:3366 pgpkey.c:589
 msgid "ID is expired/disabled/revoked."
 msgstr "ID ¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¡£"
 
-#: crypt-gpgme.c:3385 pgpkey.c:592
+#: crypt-gpgme.c:3383 pgpkey.c:593
 msgid "ID has undefined validity."
 msgstr "ID ¤Ï¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¡£"
 
-#: crypt-gpgme.c:3388 pgpkey.c:595
+#: crypt-gpgme.c:3386 pgpkey.c:596
 msgid "ID is not valid."
 msgstr "ID ¤Ï¿®ÍѤµ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: crypt-gpgme.c:3391 pgpkey.c:598
+#: crypt-gpgme.c:3389 pgpkey.c:599
 msgid "ID is only marginally valid."
 msgstr "ID ¤Ï¤«¤í¤¦¤¸¤Æ¿®ÍѤµ¤ì¤Æ¤¤¤ë¡£"
 
-#: crypt-gpgme.c:3399 pgpkey.c:603
+#: crypt-gpgme.c:3397 pgpkey.c:604
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s ËÜÅö¤Ë¤³¤Î¸°¤ò»ÈÍÑ?"
 
-#: crypt-gpgme.c:3454 crypt-gpgme.c:3556 pgpkey.c:810 pgpkey.c:915
+#: crypt-gpgme.c:3452 crypt-gpgme.c:3554 pgpkey.c:811 pgpkey.c:916
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "\"%s\" ¤Ë°ìÃפ¹¤ë¸°¤ò¸¡º÷Ãæ..."
 
-#: crypt-gpgme.c:3712 pgp.c:1105
+#: crypt-gpgme.c:3710 pgp.c:1126
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "¸° ID = \"%s\" ¤ò %s ¤Ë»È¤¦?"
 
-#: crypt-gpgme.c:3743 pgp.c:1138 smime.c:644 smime.c:764
+#: crypt-gpgme.c:3741 pgp.c:1159 smime.c:645 smime.c:765
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "%s ¤Î¸° ID ÆþÎÏ: "
 
-#: crypt-gpgme.c:3833
+#: crypt-gpgme.c:3831
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "S/MIME e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, p:PGP, c:¤Ê¤· "
 
-#: crypt-gpgme.c:3834
+#: crypt-gpgme.c:3832
 msgid "esabpfc"
 msgstr "esabpfc"
 
-#: crypt-gpgme.c:3838
+#: crypt-gpgme.c:3836
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, m:S/MIME, c:¤Ê¤· "
 
-#: crypt-gpgme.c:3839
+#: crypt-gpgme.c:3837
 msgid "esabmfc"
 msgstr "esabmfc"
 
-#. sign (a)s
-#. unset_option(OPTCRYPTCHECKTRUST);
-#. sign (a)s
-#: crypt-gpgme.c:3854 pgp.c:1498 smime.c:1923
+#: crypt-gpgme.c:3852 pgp.c:1519 smime.c:1961
 msgid "Sign as: "
 msgstr "½ð̾¤Ë»È¤¦¸°: "
 
-#: curs_lib.c:188
+#: curs_lib.c:176
 msgid "yes"
 msgstr "yes"
 
-#: curs_lib.c:189
+#: curs_lib.c:177
 msgid "no"
 msgstr "no"
 
-#. restore blocking operation
-#: curs_lib.c:278
+#: curs_lib.c:266
 #, fuzzy
 msgid "Exit Mutt-ng?"
 msgstr "Mutt ¤òÈ´¤±¤ë?"
 
-#: curs_lib.c:369 mutt_socket.c:491 mutt_ssl.c:313
+#: curs_lib.c:387 mutt_socket.c:491 mutt_ssl.c:314
 msgid "unknown error"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼"
 
-#: curs_lib.c:389
+#: curs_lib.c:407
 msgid "Press any key to continue..."
 msgstr "³¤±¤ë¤Ë¤Ï²¿¤«¥­¡¼¤ò..."
 
-#: curs_lib.c:431
+#: curs_lib.c:449
 msgid " ('?' for list): "
 msgstr "('?' ¤Ç°ìÍ÷): "
 
-#: curs_main.c:57 curs_main.c:619 curs_main.c:647 imap/command.c:174
+#: curs_main.c:62 curs_main.c:626 curs_main.c:654 imap/command.c:178
 msgid "No mailbox is open."
 msgstr "³«¤¤¤Æ¤¤¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:58 curs_main.c:2166
+#: curs_main.c:63 curs_main.c:2195
 msgid "There are no messages."
 msgstr "¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:59 mx.c:1011 pager.c:63 recvattach.c:42
+#: curs_main.c:64 mx.c:1018 pager.c:66 recvattach.c:43
 msgid "Mailbox is read-only."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÆɤ߽Ф·ÀìÍÑ¡£"
 
-#: curs_main.c:61 pager.c:65 recvattach.c:874
+#: curs_main.c:66 pager.c:68 recvattach.c:894
 msgid "Function not permitted in attach-message mode."
 msgstr "¤³¤Îµ¡Ç½¤Ï¥á¥Ã¥»¡¼¥¸ÅºÉե⡼¥É¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: curs_main.c:62
+#: curs_main.c:67
 msgid "No visible messages."
 msgstr "²Ä»ë¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:235
+#: curs_main.c:248
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Æɤ߽Ф·ÀìÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤ÏÊѹ¹¤Î½ñ¤­¹þ¤ß¤òÀÚÂؤǤ­¤Ê¤¤!"
 
-#: curs_main.c:242
+#: curs_main.c:255
 msgid "Changes to folder will be written on folder exit."
 msgstr "¥Õ¥©¥ë¥Àæ½Ð»þ¤Ë¥Õ¥©¥ë¥À¤Ø¤ÎÊѹ¹¤¬½ñ¤­¹þ¤Þ¤ì¤ë¡£"
 
-#: curs_main.c:246
+#: curs_main.c:259
 msgid "Changes to folder will not be written."
 msgstr "¥Õ¥©¥ë¥À¤Ø¤ÎÊѹ¹¤Ï½ñ¤­¹þ¤Þ¤ì¤Ê¤¤¡£"
 
-#: curs_main.c:373 curs_main.c:386
+#: curs_main.c:380 curs_main.c:393
 msgid "Quit"
 msgstr "̾ȧ"
 
-#: curs_main.c:376 curs_main.c:389 recvattach.c:54
+#: curs_main.c:383 curs_main.c:396 recvattach.c:57
 msgid "Save"
 msgstr "Êݸ"
 
-#: curs_main.c:377 query.c:43
+#: curs_main.c:384 query.c:44
 msgid "Mail"
 msgstr "¥á¡¼¥ë"
 
-#: curs_main.c:378 pager.c:1380
+#: curs_main.c:385 pager.c:1381
 msgid "Reply"
 msgstr "ÊÖ¿®"
 
-#: curs_main.c:379
+#: curs_main.c:386
 msgid "Group"
 msgstr "Á´°÷¤ËÊÖ¿®"
 
-#: curs_main.c:390 pager.c:1387
+#: curs_main.c:397 pager.c:1388
 msgid "Post"
 msgstr ""
 
-#: curs_main.c:391 pager.c:1388
+#: curs_main.c:398 pager.c:1389
 #, fuzzy
 msgid "Followup"
 msgstr "%s%s ¤Ø¤Î¥Õ¥©¥í¡¼¥¢¥Ã¥×?"
 
 # ¡ÖÉÔÀµ¤Ê²ÄǽÀ­¤¢¤ê¡×¤À¤È½ÅÂç¤Ê¤³¤È¤Î¤è¤¦¤Ë»×¤¨¤Æ¤·¤Þ¤¦¤Î¤ÇÊѹ¹¤·¤¿¡£
-#: curs_main.c:490
+#: curs_main.c:497
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬³°Éô¤«¤éÊѹ¹¤µ¤ì¤¿¡£¥Õ¥é¥°¤¬Àµ³Î¤Ç¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡£"
 
-#: curs_main.c:494
+#: curs_main.c:501
 msgid "New mail in this mailbox."
 msgstr "¤³¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¿·Ãå¥á¡¼¥ë¡£"
 
-#: curs_main.c:500
+#: curs_main.c:507
 msgid "Mailbox was externally modified."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬³°Éô¤«¤éÊѹ¹¤µ¤ì¤¿¡£"
 
-#: curs_main.c:625
+#: curs_main.c:632
 msgid "No tagged messages."
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:660 menu.c:872
+#: curs_main.c:667 menu.c:858
 msgid "Nothing to do."
 msgstr "²¿¤â¤·¤Ê¤¤¡£"
 
-#: curs_main.c:751
+#: curs_main.c:758
 #, fuzzy
-msgid "Enter Message-Id: "
+msgid "Enter Message-ID: "
 msgstr "¸°IDÆþÎÏ: "
 
-#: curs_main.c:759
+#: curs_main.c:766
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: curs_main.c:779
+#: curs_main.c:786
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "¿Æ¥á¥Ã¥»¡¼¥¸¤Ï¤³¤ÎÀ©¸Â¤µ¤ì¤¿É½¼¨ÈϰϤǤÏÉԲĻ롣"
 
-#: curs_main.c:789
+#: curs_main.c:796
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: curs_main.c:802
-msgid "No Message-Id. Unable to perform operation"
+#: curs_main.c:809
+msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: curs_main.c:822
+#: curs_main.c:829
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¸¡½ÐÃæ..."
 
-#: curs_main.c:853
+#: curs_main.c:860
 msgid "Jump to message: "
 msgstr "¥á¥Ã¥»¡¼¥¸ÈÖ¹æ¤ò»ØÄê: "
 
-#: curs_main.c:858
+#: curs_main.c:865
 msgid "Argument must be a message number."
 msgstr "°ú¿ô¤Ï¥á¥Ã¥»¡¼¥¸ÈÖ¹æ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£"
 
-#: curs_main.c:886
+#: curs_main.c:893
 msgid "That message is not visible."
 msgstr "¤½¤Î¥á¥Ã¥»¡¼¥¸¤Ï²Ä»ë¤Ç¤Ï¤Ê¤¤¡£"
 
-#: curs_main.c:889
+#: curs_main.c:896
 msgid "Invalid message number."
 msgstr "ÉÔÀµ¤Ê¥á¥Ã¥»¡¼¥¸Èֹ档"
 
-#: curs_main.c:903 curs_main.c:1905 curs_main.c:1945 pager.c:2124 pager.c:2143
+#: curs_main.c:910 curs_main.c:1918 curs_main.c:1958 pager.c:2137 pager.c:2156
 #, fuzzy
 msgid "Deletion"
 msgstr "ºï½ü"
 
-#: curs_main.c:906
+#: curs_main.c:913
 msgid "Delete messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:928
+#: curs_main.c:935
 msgid "No limit pattern is in effect."
 msgstr "¸½ºßÍ­¸ú¤ÊÀ©¸Â¥Ñ¥¿¡¼¥ó¤Ï¤Ê¤¤¡£"
 
-#. i18n: ask for a limit to apply
-#: curs_main.c:934
+#: curs_main.c:941
 #, c-format
 msgid "Limit: %s"
 msgstr "À©¸Â¥Ñ¥¿¡¼¥ó: %s"
 
-#: curs_main.c:965
+#: curs_main.c:972
 msgid "Limit to messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Îɽ¼¨¤òÀ©¸Â¤¹¤ë¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:995
+#: curs_main.c:993
+msgid "To view all messages, limit to \"all\"."
+msgstr ""
+
+#: curs_main.c:1004
 #, fuzzy
 msgid "Quit Mutt-ng?"
 msgstr "Mutt ¤òÃæ»ß?"
 
-#: curs_main.c:1071
+#: curs_main.c:1080
 msgid "Tag messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:1081 curs_main.c:2242 curs_main.c:2269 pager.c:2491
-#: pager.c:2507
+#: curs_main.c:1090 curs_main.c:2271 curs_main.c:2298 pager.c:2504
+#: pager.c:2520
 #, fuzzy
 msgid "Undeletion"
 msgstr "ºï½ü¤ò²ò½ü"
 
-#: curs_main.c:1083
+#: curs_main.c:1092
 msgid "Undelete messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Îºï½ü¤ò²ò½ü¤¹¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:1092
+#: curs_main.c:1101
 msgid "Untag messages matching: "
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥¿¥°¤ò³°¤¹¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
 
-#: curs_main.c:1175
+#: curs_main.c:1184
 msgid "Open mailbox in read-only mode"
 msgstr "Æɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: curs_main.c:1177
+#: curs_main.c:1186
 msgid "Open mailbox"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: curs_main.c:1187
+#: curs_main.c:1196
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Æɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
 
-#: curs_main.c:1189
+#: curs_main.c:1198
 msgid "Open newsgroup"
 msgstr ""
 
-#: curs_main.c:1221 mx.c:416 mx.c:556
+#: curs_main.c:1234 mx.c:415 mx.c:555
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤¡£"
 
-#: curs_main.c:1325
+#: curs_main.c:1338
 #, fuzzy
 msgid "Exit Mutt-ng without saving?"
 msgstr "Êݸ¤·¤Ê¤¤¤Ç Mutt ¤òÈ´¤±¤ë?"
 
-#: curs_main.c:1357 curs_main.c:1387 curs_main.c:1795 curs_main.c:1825
-#: flags.c:293 thread.c:931 thread.c:978 thread.c:1033
+#: curs_main.c:1370 curs_main.c:1400 curs_main.c:1808 curs_main.c:1838
+#: flags.c:294 thread.c:932 thread.c:979 thread.c:1034
 msgid "Threading is not enabled."
 msgstr "¥¹¥ì¥Ã¥Éɽ¼¨¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¡£"
 
-#: curs_main.c:1369
+#: curs_main.c:1382
 msgid "Thread broken"
 msgstr "¥¹¥ì¥Ã¥É¤¬³°¤µ¤ì¤¿"
 
-#: curs_main.c:1390
+#: curs_main.c:1403
 msgid "No Message-ID: header available to link thread"
 msgstr "Message-ID ¥Ø¥Ã¥À¤¬ÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¥¹¥ì¥Ã¥É¤ò¤Ä¤Ê¤²¤é¤ì¤Ê¤¤"
 
-#: curs_main.c:1393
+#: curs_main.c:1406
 msgid "First, please tag a message to be linked here"
 msgstr "¤½¤ÎÁ°¤Ë¡¢¤³¤³¤Ø¤Ä¤Ê¤²¤¿¤¤¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤Æ¤ª¤¯¤³¤È"
 
-#: curs_main.c:1404
+#: curs_main.c:1417
 msgid "Threads linked"
 msgstr "¥¹¥ì¥Ã¥É¤¬¤Ä¤Ê¤¬¤Ã¤¿"
 
-#: curs_main.c:1407
+#: curs_main.c:1420
 msgid "No thread linked"
 msgstr "¥¹¥ì¥Ã¥É¤Ï¤Ä¤Ê¤¬¤é¤Ê¤«¤Ã¤¿"
 
-#: curs_main.c:1424 curs_main.c:1447
+#: curs_main.c:1437 curs_main.c:1460
 msgid "You are on the last message."
 msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥á¥Ã¥»¡¼¥¸¡£"
 
-#: curs_main.c:1431 curs_main.c:1472
+#: curs_main.c:1444 curs_main.c:1485
 msgid "No undeleted messages."
 msgstr "̤ºï½ü¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:1465 curs_main.c:1488
+#: curs_main.c:1478 curs_main.c:1501
 msgid "You are on the first message."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥á¥Ã¥»¡¼¥¸¡£"
 
-#: curs_main.c:1561 pattern.c:1304
+#: curs_main.c:1574 pattern.c:1369
 msgid "Search wrapped to top."
 msgstr "¸¡º÷¤Ï°ìÈÖ¾å¤ËÌá¤Ã¤¿¡£"
 
-#: curs_main.c:1569 pattern.c:1315
+#: curs_main.c:1582 pattern.c:1380
 msgid "Search wrapped to bottom."
 msgstr "¸¡º÷¤Ï°ìÈÖ²¼¤ËÌá¤Ã¤¿¡£"
 
-#: curs_main.c:1614
+#: curs_main.c:1627
 msgid "No new messages"
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤"
 
-#: curs_main.c:1615
+#: curs_main.c:1628
 msgid "No unread messages"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤"
 
 # ÆüËܸì¤Ç¤Ï¸ì½ç¤¬°ã¤¦¤Î¤Ç¤¹ (T_T
-#: curs_main.c:1616
+#: curs_main.c:1629
 msgid " in this limited view"
 msgstr " (¤³¤ÎÀ©¸Âɽ¼¨¾õÂ֤ǤÏ)"
 
-#: curs_main.c:1632 pager.c:2255
+#: curs_main.c:1645 pager.c:2268
 msgid "Flagging"
 msgstr ""
 
-#: curs_main.c:1665 pager.c:2472
+#: curs_main.c:1678 pager.c:2485
 msgid "Toggling"
 msgstr ""
 
-#: curs_main.c:1736
+#: curs_main.c:1749
 msgid "No more threads."
 msgstr "¤â¤¦¥¹¥ì¥Ã¥É¤¬¤Ê¤¤¡£"
 
-#: curs_main.c:1739
+#: curs_main.c:1752
 msgid "You are on the first thread."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¹¥ì¥Ã¥É¡£"
 
-#: curs_main.c:1811
+#: curs_main.c:1824
 msgid "Thread contains unread messages."
 msgstr "¥¹¥ì¥Ã¥ÉÃæ¤Ë̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ë¡£"
 
-#: curs_main.c:1996
+#: curs_main.c:2009
 msgid "Editing"
 msgstr ""
 
-#: curs_main.c:2116
+#: curs_main.c:2145
 msgid "Marking as read"
 msgstr ""
 
-#: curs_main.c:2172 pager.c:2334 recvattach.c:1185
+#: curs_main.c:2201 pager.c:2347 recvattach.c:1205
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: curs_main.c:2178 pager.c:2297 pager.c:2311 pager.c:2339
+#: curs_main.c:2207 pager.c:2310 pager.c:2324 pager.c:2352
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#.
-#. * SLcurses_waddnstr() can't take a "const char *", so this is only
-#. * declared "static" (sigh)
-#.
-#: edit.c:38
+#: edit.c:39
 msgid ""
 "~~\t\tinsert a line begining with a single ~\n"
 "~b users\tadd users to the Bcc: field\n"
@@ -1828,166 +1781,166 @@ msgstr ""
 "~?\t\t¤³¤Î¥á¥Ã¥»¡¼¥¸\n"
 ".\t\t¤³¤Îʸ»ú¤Î¤ß¤Î¹Ô¤ÇÆþÎϤò½ªÎ»\n"
 
-#: edit.c:177
+#: edit.c:178
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d ¤ÏÉÔÀµ¤Ê¥á¥Ã¥»¡¼¥¸Èֹ档\n"
 
-#: edit.c:307
+#: edit.c:308
 msgid "(End message with a . on a line by itself)\n"
 msgstr "(¥á¥Ã¥»¡¼¥¸¤Î½ªÎ»¤Ï . ¤Î¤ß¤Î¹Ô¤òÆþÎÏ)\n"
 
-#: edit.c:361
+#: edit.c:362
 msgid "No mailbox.\n"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î»ØÄ꤬¤Ê¤¤¡£\n"
 
-#: edit.c:365
+#: edit.c:366
 msgid "Message contains:\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ÆâÍÆ:\n"
 
 # ¥á¥Ã¥»¡¼¥¸ÆâÍƤÎɽ¼¨½ªÎ»¸å¤Ë½Ð¤ë¤Î¤ÇÌ¿Îá¤À¤È»×¤¦¡£
-#: edit.c:369 edit.c:423
+#: edit.c:370 edit.c:424
 msgid "(continue)\n"
 msgstr "(·Ñ³¤»¤è)\n"
 
-#: edit.c:381
+#: edit.c:382
 msgid "missing filename.\n"
 msgstr "¥Õ¥¡¥¤¥ë̾¤Î»ØÄ꤬¤Ê¤¤¡£\n"
 
-#: edit.c:400
+#: edit.c:401
 msgid "No lines in message.\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ËÆâÍƤ¬°ì¹Ô¤â¤Ê¤¤¡£\n"
 
-#: edit.c:416
+#: edit.c:417
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr "%s Ãæ¤ËÉÔÀµ¤Ê IDN: '%s'\n"
 
-#: edit.c:434
+#: edit.c:435
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¨¥Ç¥£¥¿¥³¥Þ¥ó¥É (~? ¤Ç¥Ø¥ë¥×)\n"
 
-#: editmsg.c:68
+#: editmsg.c:69
 #, c-format
 msgid "could not create temporary folder: %s"
 msgstr "°ì»þ¥Õ¥©¥ë¥À¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿: %s"
 
-#: editmsg.c:80
+#: editmsg.c:81
 #, c-format
 msgid "could not write temporary mail folder: %s"
 msgstr "°ì»þ¥á¡¼¥ë¥Õ¥©¥ë¥À¤Ë½ñ¤­¹þ¤á¤Ê¤«¤Ã¤¿: %s"
 
-#: editmsg.c:99
+#: editmsg.c:100
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
 msgstr "°ì»þ¥á¡¼¥ë¥Õ¥©¥ë¥À¤ÎºÇ¸å¤Î¹Ô¤ò¾Ã¤»¤Ê¤«¤Ã¤¿: %s"
 
-#: editmsg.c:112
+#: editmsg.c:113
 msgid "Message file is empty!"
 msgstr "¥á¥Ã¥»¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¶õ!"
 
-#: editmsg.c:118
+#: editmsg.c:119
 msgid "Message not modified!"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤!"
 
-#: editmsg.c:125
+#: editmsg.c:126
 #, c-format
 msgid "Can't open message file: %s"
 msgstr "¥á¥Ã¥»¡¼¥¸¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤: %s"
 
 # %s ¤Ï strerror(errno) ¤Î¤è¤¦¤Ç¤¢¤ë¡£
-#: editmsg.c:131 editmsg.c:159
+#: editmsg.c:132 editmsg.c:160
 #, c-format
 msgid "Can't append to folder: %s"
 msgstr "¥Õ¥©¥ë¥À¤ËÄɲäǤ­¤Ê¤¤: %s"
 
-#: editmsg.c:191
+#: editmsg.c:192
 #, c-format
 msgid "Error. Preserving temporary file: %s"
 msgstr "¥¨¥é¡¼¡£°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÏÊÝ´É"
 
-#: flags.c:335
+#: flags.c:336
 msgid "Set flag"
 msgstr "¥Õ¥é¥°ÀßÄê"
 
-#: flags.c:335
+#: flags.c:336
 msgid "Clear flag"
 msgstr "¥Õ¥é¥°²ò½ü"
 
-#: handler.c:1094
+#: handler.c:925
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- ¥¨¥é¡¼: ¤É¤Î Multipart/Alternative ¥Ñ¡¼¥È¤âɽ¼¨¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 
-#: handler.c:1208
+#: handler.c:1039
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- źÉÕ¥Õ¥¡¥¤¥ë #%d"
 
-#: handler.c:1219
+#: handler.c:1050
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ¥¿¥¤¥×: %s/%s, ¥¨¥ó¥³¡¼¥ÉË¡: %s, ¥µ¥¤¥º: %s --]\n"
 
-#: handler.c:1283
+#: handler.c:1114
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- %s ¤ò»È¤Ã¤¿¼«Æ°É½¼¨ --]\n"
 
-#: handler.c:1284
+#: handler.c:1115
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "¼«Æ°É½¼¨¥³¥Þ¥ó¥É %s µ¯Æ°"
 
-#: handler.c:1312
+#: handler.c:1143
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s ¤ò¼Â¹Ô¤Ç¤­¤Ê¤¤¡£ --]\n"
 
-#: handler.c:1327 handler.c:1344
+#: handler.c:1158 handler.c:1175
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- %s ¤Îɸ½à¥¨¥é¡¼½ÐÎϤò¼«Æ°É½¼¨ --]\n"
 
 # ¡Ö»ØÄê¡×¤Ã¤ÆɬÍס©¤Ï¤ß¤Ç¤½¤¦¤Ê¤ó¤Ç¤¹¤±¤É
-#: handler.c:1379
+#: handler.c:1210
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- ¥¨¥é¡¼: message/external-body ¤Ë access-type ¥Ñ¥é¥á¡¼¥¿¤Î»ØÄ꤬¤Ê¤¤ --]\n"
 
-#: handler.c:1396
+#: handler.c:1227
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- ¤³¤Î %s/%s ·Á¼°ÅºÉÕ¥Õ¥¡¥¤¥ë"
 
 # °ì¹Ô¤Ë¤ª¤µ¤Þ¤é¤Ê¤¤¤Èµ¤»ý¤Á°­¤¤¤Î¤Ç¡Ö¥µ¥¤¥º¡×¤ò¤±¤º¤Ã¤¿¤ê¤·¤¿
-#: handler.c:1402
+#: handler.c:1233
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s ¥Ð¥¤¥È)"
 
-#: handler.c:1404
+#: handler.c:1235
 msgid "has been deleted --]\n"
 msgstr "¤Ïºï½üºÑ¤ß --]\n"
 
 # ËÜÅö¤Ï¡Ö¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡Á·î¡ÁÆü¤Ëºï½üºÑ¤ß¡×¤È¤·¤¿¤¤¤Î¤À¤¬¡£
-#: handler.c:1408
+#: handler.c:1239
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- (%s ¤Ëºï½ü) --]\n"
 
-#: handler.c:1412
+#: handler.c:1243
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ̾Á°: %s --]\n"
 
-#: handler.c:1423 handler.c:1437
+#: handler.c:1254 handler.c:1268
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- ¤³¤Î %s/%s ·Á¼°ÅºÉÕ¥Õ¥¡¥¤¥ë¤Ï´Þ¤Þ¤ì¤Æ¤ª¤é¤º¡¢ --]\n"
 
 # °ì¹Ô¤Ë¤·¤Æ¤âÂç¾æÉפÀ¤È»×¤¦¤Î¤À¤¬¤Ê¤¡¡Ä¡Ä
-#: handler.c:1425
+#: handler.c:1256
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1995,51 +1948,51 @@ msgstr ""
 "[-- ¤«¤Ä¡¢»ØÄꤵ¤ì¤¿³°Éô¤Î¥½¡¼¥¹¤Ï´ü¸Â¤¬ --]\n"
 "[-- Ëþλ¤·¤Æ¤¤¤ë¡£ --]\n"
 
-#: handler.c:1442
+#: handler.c:1273
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- ¤«¤Ä¡¢»ØÄꤵ¤ì¤¿ access-type %s ¤Ï̤¥µ¥Ý¡¼¥È --]\n"
 
-#: handler.c:1556
+#: handler.c:1395
 msgid "Error: multipart/signed has no protocol."
 msgstr "¥¨¥é¡¼: multipart/signed ¤Ë¥×¥í¥È¥³¥ë¤¬¤Ê¤¤¡£"
 
-#: handler.c:1567
+#: handler.c:1406
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "¥¨¥é¡¼: multipart/encrypted ¤Ë¥×¥í¥È¥³¥ë¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤!"
 
-#: handler.c:1601
+#: handler.c:1440
 msgid "Unable to open temporary file!"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
 
-#: handler.c:1659
+#: handler.c:1498
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ·Á¼°¤Ï̤¥µ¥Ý¡¼¥È "
 
-#: handler.c:1664
+#: handler.c:1503
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(¤³¤Î¥Ñ¡¼¥È¤òɽ¼¨¤¹¤ë¤Ë¤Ï '%s' ¤ò»ÈÍÑ)"
 
-#: handler.c:1666
+#: handler.c:1505
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(¥­¡¼¤Ë 'view-attachments' ¤ò³ä¤êÅö¤Æ¤ëɬÍפ¬¤¢¤ë!)"
 
-#: headers.c:160
+#: headers.c:161
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤"
 
-#: help.c:253
+#: help.c:254
 msgid "ERROR: please report this bug"
 msgstr "¥¨¥é¡¼: ¤³¤Î¥Ð¥°¤ò¥ì¥Ý¡¼¥È¤»¤è"
 
-#: help.c:293
+#: help.c:294
 msgid "<UNKNOWN>"
 msgstr "<ÉÔÌÀ>"
 
-#: help.c:303
+#: help.c:304
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -2049,7 +2002,7 @@ msgstr ""
 "°ìÈÌŪ¤Ê¥­¡¼¥Ð¥¤¥ó¥É:\n"
 "\n"
 
-#: help.c:307
+#: help.c:308
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -2059,31 +2012,31 @@ msgstr ""
 "̤¥Ð¥¤¥ó¥É¤Îµ¡Ç½:\n"
 "\n"
 
-#: help.c:315
+#: help.c:316
 #, c-format
 msgid "Help for %s"
 msgstr "%s ¤Î¥Ø¥ë¥×"
 
-#: hook.c:97
+#: hook.c:100
 msgid "bad formatted command string"
 msgstr ""
 
-#: hook.c:247
+#: hook.c:250
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: ¥Õ¥Ã¥¯Æ⤫¤é¤Ï unhook * ¤Ç¤­¤Ê¤¤"
 
-#: hook.c:257
+#: hook.c:260
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: %s ¤ÏÉÔÌÀ¤Ê¥Õ¥Ã¥¯¥¿¥¤¥×"
 
-#: hook.c:262
+#: hook.c:265
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook: %s ¤ò %s Æ⤫¤éºï½ü¤Ç¤­¤Ê¤¤¡£"
 
-#: imap/auth.c:98 pop/pop_auth.c:391
+#: imap/auth.c:99 pop/pop_auth.c:385
 msgid "No authenticators available"
 msgstr "ÍøÍѤǤ­¤ëǧ¾Ú½èÍý¤¬¤Ê¤¤"
 
@@ -2103,7 +2056,6 @@ msgstr "ǧ
 msgid "CRAM-MD5 authentication failed."
 msgstr "CRAM-MD5 ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£"
 
-#. now begin login
 #: imap/auth_gss.c:98
 msgid "Authenticating (GSSAPI)..."
 msgstr "ǧ¾ÚÃæ (GSSAPI)..."
@@ -2116,105 +2068,101 @@ msgstr "GSSAPI ǧ
 msgid "LOGIN disabled on this server."
 msgstr "LOGIN ¤Ï¤³¤Î¥µ¡¼¥Ð¤Ç¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë"
 
-#: imap/auth_login.c:41 nntp/nntp.c:56 pop/pop_auth.c:238
+#: imap/auth_login.c:41 nntp/nntp.c:100 pop/pop_auth.c:228
 msgid "Logging in..."
 msgstr "¥í¥°¥¤¥óÃæ..."
 
-#: imap/auth_login.c:61 nntp/nntp.c:79 nntp/nntp.c:151 pop/pop_auth.c:276
+#: imap/auth_login.c:52 nntp/nntp.c:123 nntp/nntp.c:195 pop/pop_auth.c:270
 msgid "Login failed."
 msgstr "¥í¥°¥¤¥ó¤Ë¼ºÇÔ¤·¤¿¡£"
 
-#: imap/auth_sasl.c:109
+#: imap/auth_sasl.c:90
 #, c-format
 msgid "Authenticating (%s)..."
 msgstr "ǧ¾ÚÃæ (%s)..."
 
-#: imap/auth_sasl.c:199 pop/pop_auth.c:165
+#: imap/auth_sasl.c:170 pop/pop_auth.c:152
 msgid "SASL authentication failed."
 msgstr "SASL ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£"
 
-#: imap/browse.c:69 imap/imap.c:544
+#: imap/browse.c:70 imap/imap.c:544
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s ¤ÏÉÔÀµ¤Ê IMAP ¥Ñ¥¹"
 
-#: imap/browse.c:86
+#: imap/browse.c:87
 msgid "Getting namespaces..."
 msgstr "¥Í¡¼¥à¥¹¥Ú¡¼¥¹¼èÆÀÃæ..."
 
-#: imap/browse.c:96
+#: imap/browse.c:97
 msgid "Getting folder list..."
 msgstr "¥Õ¥©¥ë¥À¥ê¥¹¥È¼èÆÀÃæ..."
 
-#: imap/browse.c:212
+#: imap/browse.c:213
 msgid "No such folder"
 msgstr "¤½¤Î¤è¤¦¤Ê¥Õ¥©¥ë¥À¤Ï¤Ê¤¤"
 
-#: imap/browse.c:271
+#: imap/browse.c:272
 msgid "Create mailbox: "
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºîÀ®: "
 
-#: imap/browse.c:275 imap/browse.c:318
+#: imap/browse.c:276 imap/browse.c:319
 msgid "Mailbox must have a name."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï̾Á°¤¬É¬Íס£"
 
-#: imap/browse.c:283
+#: imap/browse.c:284
 msgid "Mailbox created."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ºîÀ®¤µ¤ì¤¿¡£"
 
 # Ť¤¤«¤é¡Ö¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¡×¤òºï¤Ã¤Æ¤â¤¤¤¤¤«¤â
-#: imap/browse.c:312
+#: imap/browse.c:313
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ %s ¤Î¥ê¥Í¡¼¥à(°ÜÆ°)Àè: "
 
-#: imap/browse.c:324
+#: imap/browse.c:325
 #, c-format
 msgid "Rename failed: %s"
 msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) ¼ºÇÔ: %s"
 
-#: imap/browse.c:329
+#: imap/browse.c:330
 msgid "Mailbox renamed."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¥ê¥Í¡¼¥à (°ÜÆ°) ¤µ¤ì¤¿¡£"
 
-#. mx_fastclose_mailbox (idata->ctx);
-#: imap/command.c:286
+#: imap/command.c:290
 msgid "Mailbox closed"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òÊĤ¸¤¿"
 
-#. something is wrong because the server reported fewer messages
-#. * than we previously saw
-#.
-#: imap/command.c:327
+#: imap/command.c:331
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Ã×̿Ū¥¨¥é¡¼¡£¥á¥Ã¥»¡¼¥¸¿ô¤¬Æ±´ü¤·¤Æ¤¤¤Ê¤¤!"
 
-#: imap/imap.c:172 nntp/nntp.c:1045
+#: imap/imap.c:172 nntp/nntp.c:1096
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»Ãæ..."
 
-#: imap/imap.c:321
+#: imap/imap.c:323
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "¤³¤Î IMAP ¥µ¡¼¥Ð¤Ï¸Å¤¤¡£¤³¤ì¤Ç¤Ï Mutt ¤Ï¤¦¤Þ¤¯µ¡Ç½¤·¤Ê¤¤¡£"
 
-#: imap/imap.c:394
+#: imap/imap.c:396
 msgid "Checking mailbox subscriptions"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¹ØÆɾõ¶·¤ò³ÎǧÃæ"
 
-#: imap/imap.c:430 pop/pop_lib.c:271
+#: imap/imap.c:432 pop/pop_lib.c:271
 msgid "Secure connection with TLS?"
 msgstr "TLS ¤ò»È¤Ã¤¿°ÂÁ´¤ÊÀܳ?"
 
-#: imap/imap.c:442 pop/pop_lib.c:293
+#: imap/imap.c:442 pop/pop_lib.c:291
 msgid "Could not negotiate TLS connection"
 msgstr "TLS Àܳ¤ò³ÎΩ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: imap/imap.c:456 pop/pop_lib.c:311
+#: imap/imap.c:456 pop/pop_lib.c:309
 msgid "Encrypted connection unavailable"
 msgstr "°Å¹æ²½¤µ¤ì¤¿Àܳ¤¬ÍøÍѤǤ­¤Ê¤¤"
 
-#: imap/imap.c:575 nntp/nntp.c:826
+#: imap/imap.c:575 nntp/nntp.c:877
 #, c-format
 msgid "Selecting %s..."
 msgstr "%s ¤òÁªÂòÃæ..."
@@ -2223,299 +2171,325 @@ msgstr "%s 
 msgid "Error opening mailbox"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¥ª¡¼¥×¥ó»þ¥¨¥é¡¼"
 
-#: imap/imap.c:747 imap/message.c:695 muttlib.c:1229
+#: imap/imap.c:747 imap/message.c:708 muttlib.c:1224
 #, c-format
 msgid "Create %s?"
 msgstr "%s ¤òºîÀ®?"
 
-#: imap/imap.c:988 pop/pop.c:438
+#: imap/imap.c:987 pop/pop.c:447
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d ¸Ä¤Î¥á¥Ã¥»¡¼¥¸¤Ëºï½ü¤ò¥Þ¡¼¥¯Ãæ..."
 
-#: imap/imap.c:996
+#: imap/imap.c:995
 msgid "Expunge failed"
 msgstr "ºï½ü¤Ë¼ºÇÔ¤·¤¿"
 
-#: imap/imap.c:1008
+#: imap/imap.c:1007
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "¥á¥Ã¥»¡¼¥¸¥¹¥Æ¡¼¥¿¥¹¥Õ¥é¥°¤òÊݸÃæ... [%d/%d]"
 
-#: imap/imap.c:1037
+#: imap/imap.c:1036
 msgid "Expunging messages from server..."
 msgstr "¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½üÃæ..."
 
-#: imap/imap.c:1042
+#: imap/imap.c:1041
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: ºï½ü¤Ë¼ºÇÔ¤·¤¿"
 
-#: imap/imap.c:1050 imap/imap.c:1081
+#: imap/imap.c:1049 imap/imap.c:1080
 msgid "CLOSE failed"
 msgstr "¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤¿"
 
-#: imap/imap.c:1314
+#: imap/imap.c:1304
+#, c-format
+msgid "Header search without header name: %s"
+msgstr ""
+
+#: imap/imap.c:1448
 msgid "Bad mailbox name"
 msgstr "ÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ì¾"
 
-#: imap/imap.c:1337
+#: imap/imap.c:1471
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "%s ¤Î¹ØÆɤò³«»ÏÃæ..."
 
-#: imap/imap.c:1339
+#: imap/imap.c:1473
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..."
 
-#: imap/imap.c:1518
+#: imap/imap.c:1652
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
 msgstr "Àܳ¤¬Àڤ줿¡£POP ¥µ¡¼¥Ð¤ËºÆÀܳ?"
 
-#. Unable to fetch headers for lower versions
-#: imap/message.c:95
+#: imap/message.c:96
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î IMAP ¥µ¡¼¥Ð¤«¤é¤Ï¤Ø¥Ã¥À¤ò¼èÆÀ¤Ç¤­¤Ê¤¤¡£"
 
-#: imap/message.c:105
+#: imap/message.c:106
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: imap/message.c:130
+#: imap/message.c:131
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "¥­¥ã¥Ã¥·¥åÆɤ߽Ф·Ãæ... [%d/%d]"
 
-#: imap/message.c:196 pop/pop.c:196
+#: imap/message.c:198 pop/pop.c:203
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À¼èÆÀÃæ... [%d/%d]"
 
-#: imap/message.c:351 nntp/nntp.c:889 pop/pop.c:324
+#: imap/message.c:354 imap/message.c:402 nntp/nntp.c:972 pop/pop.c:370
 msgid "Fetching message..."
 msgstr "¥á¥Ã¥»¡¼¥¸¼èÆÀÃæ..."
 
 # ¤³¤Î Try ¤¬Ì¿Îá¤Ç¤Ê¤±¤ì¤Ð¤è¤¤¤Î¤À¤¬¡£
-#: imap/message.c:389 pop/pop.c:357
+#: imap/message.c:392 pop/pop.c:364
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "¥á¥Ã¥»¡¼¥¸º÷°ú¤¬ÉÔÀµ¡£¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥ó¤ò»î¤ß¤ë¡£"
 
-#: imap/message.c:551
-msgid "Uploading message ..."
+#: imap/message.c:530
+#, fuzzy
+msgid "Uploading message..."
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥¢¥Ã¥×¥í¡¼¥ÉÃæ..."
 
-#: imap/message.c:663
+#: imap/message.c:676
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d ¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë¥³¥Ô¡¼Ãæ..."
 
-#: imap/message.c:666
+#: imap/message.c:679
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò %s ¤Ë¥³¥Ô¡¼Ãæ..."
 
-#: imap/util.c:178
+#: imap/util.c:179
 msgid "Continue?"
 msgstr "·Ñ³?"
 
-#: init.c:203
+#: init.c:228 init.c:1575 init.c:1713 init.c:1738
+#, fuzzy, c-format
+msgid "'%s' is invalid for $%s"
+msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
+
+#: init.c:404
+#, c-format
+msgid "%s: Unknown type."
+msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×"
+
+#: init.c:689
 #, c-format
 msgid "Bad regexp: %s"
 msgstr "ÉÔÀµ¤ÊÀµµ¬É½¸½: %s"
 
-#: init.c:384
+#: init.c:867
 #, fuzzy, c-format
 msgid "ifdef: too few arguments"
 msgstr "%s: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
 
-#: init.c:386
+#: init.c:869
 #, fuzzy, c-format
 msgid "ifndef: too few arguments"
 msgstr "mono: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
 
-#: init.c:498
+#: init.c:982
 msgid "spam: no matching pattern"
 msgstr "spam: °ìÃפ¹¤ë¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤"
 
-#: init.c:500
+#: init.c:984
 msgid "nospam: no matching pattern"
 msgstr "nospam: °ìÃפ¹¤ë¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤"
 
-#: init.c:691
+#: init.c:1235
+#, fuzzy
+msgid "attachments: no disposition"
+msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆÀâÌÀʸ¤òÊÔ½¸"
+
+#: init.c:1272
+#, fuzzy
+msgid "attachments: invalid disposition"
+msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆÀâÌÀʸ¤òÊÔ½¸"
+
+#: init.c:1285
+#, fuzzy
+msgid "unattachments: no disposition"
+msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆÀâÌÀʸ¤òÊÔ½¸"
+
+#: init.c:1308
+msgid "unattachments: invalid disposition"
+msgstr ""
+
+#: init.c:1416
 msgid "alias: no address"
 msgstr "alias (ÊÌ̾): ¥¢¥É¥ì¥¹¤¬¤Ê¤¤"
 
-#: init.c:732
+#: init.c:1457
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "·Ù¹ð: ÉÔÀµ¤Ê IDN '%s' ¤¬¥¨¥¤¥ê¥¢¥¹ '%s' Ãæ¤Ë¤¢¤ë¡£\n"
 
-#: init.c:802
+#: init.c:1528
 msgid "invalid header field"
 msgstr "ÉÔÀµ¤Ê¤Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É"
 
-#: init.c:849
+#: init.c:1684
 #, c-format
-msgid "%s: unknown sorting method"
-msgstr "%s ¤ÏÉÔÌÀ¤ÊÀ°ÎóÊýË¡"
+msgid ""
+"Invalid default setting for $%s found: \"%s\".\n"
+"Please report this error: \"%s\"\n"
+msgstr ""
 
-#: init.c:952
+#: init.c:1751 init.c:1765
 #, c-format
-msgid "mutt_restore_default(%s): error in regexp: %s\n"
-msgstr "mutt_restore_default(%s): Àµµ¬É½¸½¤Ç¥¨¥é¡¼: %s\n"
+msgid "'%d' is invalid for $%s"
+msgstr ""
 
-#: init.c:1014
+#: init.c:1820 init.c:1895 pager.c:65
+#, c-format
+msgid "Not available in this menu."
+msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤ÏÍøÍѤǤ­¤Ê¤¤¡£"
+
+#: init.c:1877
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s ¤ÏÉÔÌÀ¤ÊÊÑ¿ô"
 
-#: init.c:1021
+#: init.c:1884
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "reset ¤È¶¦¤Ë»È¤¦ÀÜƬ¼­¤¬ÉÔÀµ"
 
-#: init.c:1026
+#: init.c:1889
 #, c-format
 msgid "value is illegal with reset"
 msgstr "reset ¤È¶¦¤Ë»È¤¦Ãͤ¬ÉÔÀµ"
 
-#: init.c:1059
-#, c-format
-msgid "%s is set"
-msgstr "%s ¤ÏÀßÄꤵ¤ì¤Æ¤¤¤ë"
-
-#: init.c:1059
-#, c-format
-msgid "%s is unset"
-msgstr "%s ¤Ï²ò½ü¤µ¤ì¤Æ¤¤¤ë"
-
-#: init.c:1230
-#, c-format
-msgid "%s: invalid mailbox type"
-msgstr "%s ¤ÏÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°"
-
-#: init.c:1253 init.c:1292
-#, c-format
-msgid "%s: invalid value"
-msgstr "%s ¤ÏÉÔÀµ¤ÊÃÍ"
+#: init.c:1908 init.c:1969 init.c:1993
+#, fuzzy, c-format
+msgid "$%s is read-only"
+msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÆɤ߽Ф·ÀìÍÑ¡£"
 
-#: init.c:1329
-#, c-format
-msgid "%s: Unknown type."
-msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×"
+#: init.c:2026
+#, fuzzy, c-format
+msgid "'%s' is invalid for $%s\n"
+msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
 
-#: init.c:1357
+#: init.c:2042
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×"
 
-#: init.c:1416
+#: init.c:2101
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s Ãæ¤Î %d ¹ÔÌܤǥ¨¥é¡¼: %s"
 
-#: init.c:1438
+#: init.c:2123
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: %s Ãæ¤Ç¥¨¥é¡¼"
 
-#: init.c:1439
+#: init.c:2124
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: %s Ãæ¤Ë¥¨¥é¡¼¤¬Â¿¤¹¤®¤ë¤Î¤ÇÆɤ߽Ф·Ãæ»ß"
 
-#: init.c:1456
+#: init.c:2141
 #, c-format
 msgid "source: error at %s"
 msgstr "source: %s ¤Ç¥¨¥é¡¼"
 
-#: init.c:1508
+#: init.c:2195
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É"
 
-#: init.c:1879
+#: init.c:2561
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n"
 
-#: init.c:1925
+#: init.c:2621
 msgid "unable to determine home directory"
 msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ò¼±Ê̤Ǥ­¤Ê¤¤"
 
-#: init.c:1932
+#: init.c:2628
 msgid "unable to determine username"
 msgstr "¥æ¡¼¥¶Ì¾¤ò¼±Ê̤Ǥ­¤Ê¤¤"
 
-#: init.c:2150
+#: init.c:2847
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: init.c:2157
+#: init.c:2858
 #, c-format
-msgid "Warning: Synonym variables are scheduled for removal.\n"
+msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: keymap.c:431
+#: keymap.c:434
 msgid "Macro loop detected."
 msgstr "¥Þ¥¯¥í¤Î¥ë¡¼¥×¤¬¸¡½Ð¤µ¤ì¤¿¡£"
 
-#: keymap.c:637 keymap.c:645
+#: keymap.c:640 keymap.c:648
 msgid "Key is not bound."
 msgstr "¥­¡¼¤Ï¥Ð¥¤¥ó¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: keymap.c:650
+#: keymap.c:653
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "¥­¡¼¤Ï¥Ð¥¤¥ó¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¡£'%s' ¤ò²¡¤¹¤È¥Ø¥ë¥×"
 
-#: keymap.c:661
+#: keymap.c:664
 msgid "push: too many arguments"
 msgstr "push: °ú¿ô¤¬Â¿¤¹¤®¤ë"
 
-#: keymap.c:689
+#: keymap.c:692
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s ¤È¤¤¤¦¥á¥Ë¥å¡¼¤Ï¤Ê¤¤"
 
-#: keymap.c:703
+#: keymap.c:706
 msgid "null key sequence"
 msgstr "¥­¡¼¥·¡¼¥±¥ó¥¹¤¬¤Ê¤¤"
 
-#: keymap.c:788
+#: keymap.c:791
 msgid "bind: too many arguments"
 msgstr "bind: °ú¿ô¤¬Â¿¤¹¤®¤ë"
 
-#: keymap.c:805
+#: keymap.c:808
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s ¤È¤¤¤¦µ¡Ç½¤Ï¥Þ¥Ã¥×Ãæ¤Ë¤Ê¤¤"
 
-#: keymap.c:833
+#: keymap.c:836
 msgid "macro: empty key sequence"
 msgstr "macro: ¥­¡¼¥·¡¼¥±¥ó¥¹¤¬¤Ê¤¤"
 
-#: keymap.c:841
+#: keymap.c:844
 msgid "macro: too many arguments"
 msgstr "macro: °ú¿ô¤¬Â¿¤¹¤®¤ë"
 
-#: keymap.c:873
+#: keymap.c:876
 msgid "exec: no arguments"
 msgstr "exec: °ú¿ô¤¬¤Ê¤¤"
 
-#: keymap.c:891
+#: keymap.c:894
 #, c-format
 msgid "%s: no such function"
 msgstr "%s ¤È¤¤¤¦µ¡Ç½¤Ï¤Ê¤¤"
 
-#: keymap.c:912
+#: keymap.c:915
 msgid "Enter keys (^G to abort): "
 msgstr "¥­¡¼¤ò²¡¤¹¤È³«»Ï (½ªÎ»¤Ï ^G): "
 
-#: keymap.c:916
+#: keymap.c:919
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "ʸ»ú = %s, 8¿Ê = %o, 10¿Ê = %d"
@@ -2998,451 +2972,455 @@ msgid "delete messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤òºï½ü"
 
 #: keymap_alldefs.h:121
+msgid "rebuild header caching databases"
+msgstr ""
+
+#: keymap_alldefs.h:122
 #, fuzzy
 msgid "reconstruct thread containing current message"
 msgstr "¥¹¥ì¥Ã¥ÉÃæ¤Ë̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ë¡£"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:123
 msgid "force retrieval of mail from IMAP server"
 msgstr "IMAP ¥µ¡¼¥Ð¤«¤é¥á¡¼¥ë¤ò¼èÆÀ"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:124
 msgid "retrieve mail from POP server"
 msgstr "POP ¥µ¡¼¥Ð¤«¤é¥á¡¼¥ë¤ò¼èÆÀ"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:125
 msgid "move to the first message"
 msgstr "ºÇ½é¤Î¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:126
 msgid "move to the last message"
 msgstr "ºÇ¸å¤Î¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:127
 msgid "show only messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤À¤±É½¼¨"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:128
 msgid "link tagged message to the current one"
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò¸½ºß°ÌÃ֤ˤĤʤ°"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:129
 msgid "jump to the next new message"
 msgstr "¼¡¤Î¿·Ãå¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:130
 msgid "jump to the next new or unread message"
 msgstr "¼¡¤Î¿·Ãå¤Þ¤¿¤Ï̤ÆɤΥá¥Ã¥»¡¼¥¸¤Ø°ÜÆ°"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:131
 msgid "jump to the next subthread"
 msgstr "¼¡¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:132
 msgid "jump to the next thread"
 msgstr "¼¡¤Î¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:133
 msgid "move to the next undeleted message"
 msgstr "¼¡¤Î̤ºï½ü¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:134
 msgid "jump to the next unread message"
 msgstr "¼¡¤Î̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ø°ÜÆ°"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:135
 msgid "jump to parent message in thread"
 msgstr "¥¹¥ì¥Ã¥É¤Î¿Æ¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:136
 msgid "jump to previous thread"
 msgstr "Á°¤Î¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:137
 msgid "jump to previous subthread"
 msgstr "Á°¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:138
 msgid "move to the previous undeleted message"
 msgstr "Á°¤Î̤ºï½ü¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:139
 msgid "jump to the previous new message"
 msgstr "Á°¤Î¿·Ãå¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:140
 msgid "jump to the previous new or unread message"
 msgstr "Á°¤Î¿·Ãå¤Þ¤¿¤Ï̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:141
 msgid "jump to the previous unread message"
 msgstr "Á°¤Î̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:142
 msgid "mark the current thread as read"
 msgstr "¸½ºß¤Î¥¹¥ì¥Ã¥É¤ò´ûÆɤˤ¹¤ë"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:143
 msgid "mark the current subthread as read"
 msgstr "¸½ºß¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤ò´ûÆɤˤ¹¤ë"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:144
 msgid "set a status flag on a message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¥¹¥Æ¡¼¥¿¥¹¥Õ¥é¥°¤òÀßÄê"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:145
 msgid "save changes to mailbox"
 msgstr "Êѹ¹¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊݸ"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:146
 msgid "tag messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤ë"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:147
 msgid "undelete messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Îºï½ü¾õÂÖ¤ò²ò½ü"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:148
 msgid "untag messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Î¥¿¥°¤ò¤Ï¤º¤¹"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:149
 msgid "move to the middle of the page"
 msgstr "¥Ú¡¼¥¸¤ÎÃæ±û¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:150
 msgid "move to the next entry"
 msgstr "¼¡¤Î¥¨¥ó¥È¥ê¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:151
 msgid "scroll down one line"
 msgstr "°ì¹Ô²¼¤Ë¥¹¥¯¥í¡¼¥ë"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:152
 msgid "move to the next page"
 msgstr "¼¡¥Ú¡¼¥¸¤Ø°ÜÆ°"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:153
 msgid "jump to the bottom of the message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈÖ²¼¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:154
 msgid "toggle display of quoted text"
 msgstr "°úÍÑʸ¤Îɽ¼¨¤ò¤¹¤ë¤«¤É¤¦¤«ÀÚÂØ"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:155
 msgid "skip beyond quoted text"
 msgstr "°úÍÑʸ¤ò¥¹¥­¥Ã¥×¤¹¤ë"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:156
 msgid "jump to the top of the message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈÖ¾å¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:157
 msgid "pipe message/attachment to a shell command"
 msgstr "¥á¥Ã¥»¡¼¥¸/źÉÕ¥Õ¥¡¥¤¥ë¤ò¥³¥Þ¥ó¥É¤Ë¥Ñ¥¤¥×"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:158
 #, fuzzy
 msgid "post message to newsgroup"
 msgstr "%s ¤Ø¥á¥Ã¥»¡¼¥¸ºÆÁ÷"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:159
 msgid "move to the previous entry"
 msgstr "Á°¤Î¥¨¥ó¥È¥ê¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:160
 msgid "scroll up one line"
 msgstr "°ì¹Ô¾å¤Ë¥¹¥¯¥í¡¼¥ë"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:161
 msgid "move to the previous page"
 msgstr "Á°¤Î¥Ú¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:162
 msgid "print the current entry"
 msgstr "¸½ºß¤Î¥¨¥ó¥È¥ê¤ò°õºþ"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:163
 msgid "really delete the current entry, bypassing the trash folder"
 msgstr ""
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:164
 msgid "query external program for addresses"
 msgstr "³°Éô¥×¥í¥°¥é¥à¤Ë¥¢¥É¥ì¥¹¤òÌ䤤¹ç¤ï¤»"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:165
 msgid "append new query results to current results"
 msgstr "¿·¤¿¤ÊÌ䤤¹ç¤ï¤»·ë²Ì¤ò¸½ºß¤Î·ë²Ì¤ËÄɲÃ"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:166
 msgid "save changes to mailbox and quit"
 msgstr "Êѹ¹¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊݸ¸å½ªÎ»"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:167
 msgid "recall a postponed message"
 msgstr "½ñ¤­¤«¤±¤Î¥á¥Ã¥»¡¼¥¸¤ò¸Æ¤Ó½Ð¤¹"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:168
 msgid "clear and redraw the screen"
 msgstr "²èÌ̤ò¥¯¥ê¥¢¤·ºÆÉÁ²è"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:169
 msgid "{internal}"
 msgstr "{ÆâÉô}"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:170
 msgid "rename the current mailbox (IMAP only)"
 msgstr "¸½ºß¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ê¥Í¡¼¥à(IMAP¤Î¤ß)"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:171
 msgid "reply to a message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ËÊÖ¿®"
 
 # ¤³¤ì¤Ç¥®¥ê¥®¥ê°ì¹Ô¤Ë¤ª¤µ¤Þ¤ë¥Ï¥º
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:172
 msgid "use the current message as a template for a new one"
 msgstr "¸½ºß¤Î¥á¥Ã¥»¡¼¥¸¤ò¿·¤·¤¤¤â¤Î¤Î¸¶·Á¤È¤·¤ÆÍøÍÑ"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:173
 msgid "save message/attachment to a file"
 msgstr "¥á¥Ã¥»¡¼¥¸/źÉÕ¥Õ¥¡¥¤¥ë¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:174
 msgid "search for a regular expression"
 msgstr "Àµµ¬É½¸½¸¡º÷"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:175
 msgid "search backwards for a regular expression"
 msgstr "µÕ½ç¤ÎÀµµ¬É½¸½¸¡º÷"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:176
 msgid "search for next match"
 msgstr "¼¡¤Ë°ìÃפ¹¤ë¤â¤Î¤ò¸¡º÷"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:177
 msgid "search for next match in opposite direction"
 msgstr "µÕ½ç¤Ç°ìÃפ¹¤ë¤â¤Î¤ò¸¡º÷"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:178
 msgid "toggle search pattern coloring"
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤òÃ忧¤¹¤ë¤«¤É¤¦¤«ÀÚÂØ"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:179
 msgid "invoke a command in a subshell"
 msgstr "¥µ¥Ö¥·¥§¥ë¤Ç¥³¥Þ¥ó¥É¤òµ¯Æ°"
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:180
 msgid "sort messages"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÀ°Îó"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:181
 msgid "sort messages in reverse order"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òµÕ½ç¤ÇÀ°Îó"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:182
 #, fuzzy
 msgid "subscribe to newsgroups matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Î¥¿¥°¤ò¤Ï¤º¤¹"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:183
 msgid "tag the current entry"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°ÉÕ¤±"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:184
 msgid "apply next function to tagged messages"
 msgstr "¼¡¤ËÆþÎϤ¹¤ëµ¡Ç½¤ò¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ËŬÍÑ"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:185
 msgid "apply next function ONLY to tagged messages"
 msgstr "¼¡¤ËÆþÎϤ¹¤ëµ¡Ç½¤ò¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤Ë¤Î¤ßŬÍÑ"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:186
 msgid "tag the current subthread"
 msgstr "¸½ºß¤Î¥µ¥Ö¥¹¥ì¥Ã¥É¤Ë¥¿¥°¤òÉÕ¤±¤ë"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:187
 msgid "tag the current thread"
 msgstr "¸½ºß¤Î¥¹¥ì¥Ã¥É¤Ë¥¿¥°¤òÉÕ¤±¤ë"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:188
 msgid "toggle a message's 'new' flag"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î¡Ö¿·Ãå¡×¥Õ¥é¥°¤òÀÚÂØ"
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:189
 #, fuzzy
 msgid "toggle view of read messages"
 msgstr "Á°¤Î¿·Ãå¤Þ¤¿¤Ï̤ÆÉ¥á¥Ã¥»¡¼¥¸¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:190
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊѹ¹¤ò½ñ¤­¹þ¤à¤«¤É¤¦¤«¤òÀÚÂØ"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:191
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "±ÜÍ÷Ë¡¤ò¡Ö¥á¡¼¥ë¥Ü¥Ã¥¯¥¹/Á´¥Õ¥¡¥¤¥ë¡×´Ö¤ÇÀÚÂØ"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:192
 msgid "move to the top of the page"
 msgstr "¥Ú¡¼¥¸¤Î°ìÈÖ¾å¤Ë°ÜÆ°"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:193
 msgid "mark all articles in newsgroup as unread"
 msgstr ""
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:194
 msgid "undelete the current entry"
 msgstr "¥¨¥ó¥È¥ê¤Îºï½ü¾õÂÖ¤ò²ò½ü"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:195
 msgid "undelete all messages in thread"
 msgstr "¥¹¥ì¥Ã¥É¤Î¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤Îºï½ü¾õÂÖ¤ò²ò½ü"
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:196
 msgid "undelete all messages in subthread"
 msgstr "¥µ¥Ö¥¹¥ì¥Ã¥É¤Î¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤Îºï½ü¤ò²ò½ü"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:197
 #, fuzzy
 msgid "unsubscribe from newsgroups matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤Î¥¿¥°¤ò¤Ï¤º¤¹"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:198
 msgid "show the Mutt version number and date"
 msgstr "Mutt ¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎÈÖ¹æ¤ÈÆüÉÕ¤òɽ¼¨"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:199
 msgid "view attachment using mailcap entry if necessary"
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë±ÜÍ÷(ɬÍפʤémailcap¥¨¥ó¥È¥ê»ÈÍÑ)"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:200
 msgid "show MIME attachments"
 msgstr "MIME źÉÕ¥Õ¥¡¥¤¥ë¤òɽ¼¨"
 
-#: keymap_alldefs.h:200
+#: keymap_alldefs.h:201
 msgid "display the keycode for a key press"
 msgstr "¼¡¤Ë²¡¤¹¥­¡¼¤Î¥³¡¼¥É¤òɽ¼¨"
 
-#: keymap_alldefs.h:201
+#: keymap_alldefs.h:202
 msgid "show currently active limit pattern"
 msgstr "¸½ºßÍ­¸ú¤ÊÀ©¸Â¥Ñ¥¿¡¼¥ó¤ÎÃͤòɽ¼¨"
 
-#: keymap_alldefs.h:202
+#: keymap_alldefs.h:203
 msgid "collapse/uncollapse current thread"
 msgstr "¸½ºß¤Î¥¹¥ì¥Ã¥É¤òŸ³«/È󟳫"
 
-#: keymap_alldefs.h:203
+#: keymap_alldefs.h:204
 msgid "collapse/uncollapse all threads"
 msgstr "¤¹¤Ù¤Æ¤Î¥¹¥ì¥Ã¥É¤òŸ³«/È󟳫"
 
-#: keymap_alldefs.h:204
+#: keymap_alldefs.h:205
 #, fuzzy
 msgid "scroll the mailbox pane up 1 page"
 msgstr "Ⱦ¥Ú¡¼¥¸¾å¤Ë¥¹¥¯¥í¡¼¥ë"
 
-#: keymap_alldefs.h:205
+#: keymap_alldefs.h:206
 #, fuzzy
 msgid "scroll the mailbox pane down 1 page"
 msgstr "Ⱦ¥Ú¡¼¥¸²¼¤Ë¥¹¥¯¥í¡¼¥ë"
 
-#: keymap_alldefs.h:206
+#: keymap_alldefs.h:207
 msgid "go down to next mailbox"
 msgstr ""
 
-#: keymap_alldefs.h:207
+#: keymap_alldefs.h:208
 #, fuzzy
 msgid "go down to next mailbox with new mail"
 msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£"
 
-#: keymap_alldefs.h:208
+#: keymap_alldefs.h:209
 #, fuzzy
 msgid "go to previous mailbox"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¥ª¡¼¥×¥ó»þ¥¨¥é¡¼"
 
-#: keymap_alldefs.h:209
+#: keymap_alldefs.h:210
 #, fuzzy
 msgid "go to previous mailbox with new mail"
 msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£"
 
-#: keymap_alldefs.h:210
+#: keymap_alldefs.h:211
 #, fuzzy
 msgid "open hilighted mailbox"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥óÃæ..."
 
-#: keymap_alldefs.h:211
+#: keymap_alldefs.h:212
 msgid "attach a PGP public key"
 msgstr "PGP ¸ø³«¸°¤òźÉÕ"
 
-#: keymap_alldefs.h:212
+#: keymap_alldefs.h:213
 msgid "show PGP options"
 msgstr "PGP ¥ª¥×¥·¥ç¥ó¤òɽ¼¨"
 
-#: keymap_alldefs.h:213
+#: keymap_alldefs.h:214
 msgid "mail a PGP public key"
 msgstr "PGP ¸ø³«¸°¤ò¥á¡¼¥ëÁ÷¿®"
 
-#: keymap_alldefs.h:214
+#: keymap_alldefs.h:215
 msgid "verify a PGP public key"
 msgstr "PGP ¸ø³«¸°¤ò¸¡¾Ú"
 
-#: keymap_alldefs.h:215
+#: keymap_alldefs.h:216
 msgid "view the key's user id"
 msgstr "¸°¤Î¥æ¡¼¥¶ ID ¤òɽ¼¨"
 
-#: keymap_alldefs.h:216
+#: keymap_alldefs.h:217
 msgid "check for classic pgp"
 msgstr "µì·Á¼°¤Î PGP ¤ò¥Á¥§¥Ã¥¯"
 
 # ¡Ö¤¹¤Ù¤Æ¤Î¡×¤Ã¤ÆɬÍס©
-#: keymap_alldefs.h:217
+#: keymap_alldefs.h:218
 msgid "Accept the chain constructed"
 msgstr "¹½ÃÛ¤µ¤ì¤¿Á´¤Æ¤Î¥Á¥§¡¼¥ó¤ò¼õÍÆ"
 
-#: keymap_alldefs.h:218
+#: keymap_alldefs.h:219
 msgid "Append a remailer to the chain"
 msgstr "¥Á¥§¡¼¥ó¤Ë remailer ¤òÄɲÃ"
 
-#: keymap_alldefs.h:219
+#: keymap_alldefs.h:220
 msgid "Insert a remailer into the chain"
 msgstr "¥Á¥§¡¼¥ó¤Ë remailer ¤òÁÞÆþ"
 
-#: keymap_alldefs.h:220
+#: keymap_alldefs.h:221
 msgid "Delete a remailer from the chain"
 msgstr "¥Á¥§¡¼¥ó¤«¤é remailer ¤òºï½ü"
 
-#: keymap_alldefs.h:221
+#: keymap_alldefs.h:222
 msgid "Select the previous element of the chain"
 msgstr "Á°¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò"
 
-#: keymap_alldefs.h:222
+#: keymap_alldefs.h:223
 msgid "Select the next element of the chain"
 msgstr "¼¡¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò"
 
-#: keymap_alldefs.h:223
+#: keymap_alldefs.h:224
 msgid "send the message through a mixmaster remailer chain"
 msgstr "mixmaster remailer ¥Á¥§¡¼¥ó¤ò»È¤Ã¤ÆÁ÷¿®"
 
-#: keymap_alldefs.h:224
+#: keymap_alldefs.h:225
 msgid "make decrypted copy and delete"
 msgstr "Éü¹æ²½¤·¤¿¥³¥Ô¡¼¤òºî¤Ã¤Æ¤«¤éºï½ü"
 
-#: keymap_alldefs.h:225
+#: keymap_alldefs.h:226
 msgid "make decrypted copy"
 msgstr "Éü¹æ²½¤·¤¿¥³¥Ô¡¼¤òºîÀ®"
 
-#: keymap_alldefs.h:226
+#: keymap_alldefs.h:227
 msgid "wipe passphrase(s) from memory"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò¤¹¤Ù¤Æ¥á¥â¥ê¤«¤é¾Ãµî"
 
-#: keymap_alldefs.h:227
+#: keymap_alldefs.h:228
 msgid "extract supported public keys"
 msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¸ø³«¸°¤òÃê½Ð"
 
-#: keymap_alldefs.h:228
+#: keymap_alldefs.h:229
 msgid "show S/MIME options"
 msgstr "S/MIME ¥ª¥×¥·¥ç¥ó¤òɽ¼¨"
 
-#: main.c:55
+#: main.c:85
 #, fuzzy
 msgid ""
 "To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n"
@@ -3453,7 +3431,7 @@ msgstr ""
 "¥Ð¥°¤ò¥ì¥Ý¡¼¥È¤¹¤ë¤Ë¤Ï flea (1) ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ»¤è¡£\n"
 "ÆüËܸìÈǤΥХ°¥ì¥Ý¡¼¥È¤ª¤è¤ÓÏ¢Íí¤Ï mutt-j-users ML ¤Ø¡£\n"
 
-#: main.c:60
+#: main.c:90
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins and others.\n"
 "Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n"
@@ -3461,7 +3439,7 @@ msgid ""
 "under certain conditions; type `muttng -vv' for details.\n"
 msgstr ""
 
-#: main.c:66
+#: main.c:96
 msgid ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3470,7 +3448,10 @@ msgid ""
 "Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
-"\n"
+msgstr ""
+
+#: main.c:105
+msgid ""
 "Copyright (C) 2005:\n"
 "  Parts were written/modified by:\n"
 "     Andreas Krennmair <ak@synflood.at>\n"
@@ -3478,25 +3459,35 @@ msgid ""
 "     Rocco Rutte <pdmef@cs.tu-berlin.de>\n"
 "\n"
 "Lots of others not mentioned here contributed lots of code,\n"
-"fixes, and suggestions.\n"
+"fixes, and suggestions."
+msgstr ""
+
+#: main.c:115
+msgid ""
 "\n"
 "    This program is free software; you can redistribute it and/or modify\n"
 "    it under the terms of the GNU General Public License as published by\n"
 "    the Free Software Foundation; either version 2 of the License, or\n"
 "    (at your option) any later version.\n"
-"\n"
+msgstr ""
+
+#: main.c:122
+msgid ""
 "    This program is distributed in the hope that it will be useful,\n"
 "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "    GNU General Public License for more details.\n"
-"\n"
+msgstr ""
+
+#: main.c:128
+msgid ""
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.\n"
+"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
+"1301, USA.\n"
 msgstr ""
 
-#: main.c:110
-#, fuzzy
+#: main.c:145
 msgid ""
 "usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -3504,7 +3495,13 @@ msgid ""
 "[...]\n"
 "       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
-"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
+msgstr ""
+
+#: main.c:150
+#, fuzzy
+msgid ""
+"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n"
 "       muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
 "       muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
@@ -3514,8 +3511,7 @@ msgid ""
 "  -A <alias>\texpand the given alias\n"
 "  -a <file>\tattach a file to the message\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
-"  -c <address>\tspecify a carbon-copy (CC) address\n"
-"  -D\t\tprint the value of all variables to stdout"
+"  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
 "»ÈÍÑË¡: mutt [-nRyzZ] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] [-m <¥¿¥¤¥×>] \n"
 "             [-f <¥Õ¥¡¥¤¥ë>]\n"
@@ -3537,28 +3533,37 @@ msgstr ""
 "  -c <¥¢¥É¥ì¥¹>\tcarbon-copy (CC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
 "  -D\t\tÊÑ¿ô¤ò¤¹¤Ù¤Æɸ½à¥¨¥é¡¼½ÐÎϤØɽ¼¨"
 
-#: main.c:125
+#: main.c:162
 #, fuzzy
 msgid "  -d <level>\tlog debugging output to ~/.muttngdebug0"
 msgstr "  -d <¥ì¥Ù¥ë>\t¥Ç¥Ð¥°½ÐÎϤò ~/.muttdebug0 ¤Ëµ­Ï¿"
 
-#: main.c:127
-#, fuzzy
+#: main.c:164
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
-"  -F <file>\tspecify an alternate muttrc file\n"
+"  -F <file>\tspecify an alternate muttrngc file\n"
 "  -g <server>\tspecify a newsserver (if compiled with NNTP)\n"
 "  -G\t\tselect a newsgroup (if compiled with NNTP)\n"
 "  -H <file>\tspecify a draft file to read header and body from\n"
-"  -i <file>\tspecify a file which Mutt-ng should include in the body\n"
+"  -i <file>\tspecify a file which Mutt-ng should include in the body"
+msgstr ""
+
+#: main.c:172
+msgid ""
 "  -d <level>\t specify debugging level of Mutt-ng\n"
 "  -m <type>\tspecify a default mailbox type\n"
 "  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n"
 "  -p\t\trecall a postponed message\n"
 "  -Q <variable>\tquery a configuration variable\n"
 "  -R\t\topen mailbox in read-only mode\n"
-"  -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n"
+"  -s <subj>\tspecify a subject (must be in quotes if it has spaces)"
+msgstr ""
+
+#: main.c:180
+msgid ""
+"  -t\t\tprint the value of all variables to stdout\n"
+"  -T\t\tprint the value of all changed variables to stdout\n"
 "  -v\t\tshow version and compile-time definitions\n"
 "  -x\t\tsimulate the mailx send mode\n"
 "  -y\t\tselect a mailbox specified in your `mailboxes' list\n"
@@ -3566,308 +3571,258 @@ msgid ""
 "  -Z\t\topen the first folder with new message, exit immediately if none\n"
 "  -h\t\tthis help message"
 msgstr ""
-"  -e <¥³¥Þ¥ó¥É>\t½é´ü²½¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Î»ØÄê\n"
-"  -f <¥Õ¥¡¥¤¥ë>\tÆɤ߽Ф·¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î»ØÄê\n"
-"  -F <¥Õ¥¡¥¤¥ë>\tÂåÂØ muttrc ¥Õ¥¡¥¤¥ë¤Î»ØÄê\n"
-"  -H <¥Õ¥¡¥¤¥ë>\t¤Ø¥Ã¥À¤òÆɤि¤á¤Ë²¼½ñ¥Õ¥¡¥¤¥ë¤ò»ØÄê\n"
-"  -i <¥Õ¥¡¥¤¥ë>\tÊÖ¿®»þ¤Ë Mutt ¤¬ÁÞÆþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î»ØÄê\n"
-"  -m <¥¿¥¤¥×>\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°¤Î»ØÄê\n"
-"  -n\t\t¥·¥¹¥Æ¥à´ûÄê¤Î Muttrc ¤òÆɤޤʤ¤¤³¤È¤Î»ØÄê\n"
-"  -p\t\tÊݸ¤µ¤ì¤Æ¤¤¤ë (½ñ¤­¤«¤±) ¥á¥Ã¥»¡¼¥¸¤ÎºÆÆɤ߽Ф·¤Î»ØÄê\n"
-"  -Q <variable>\tÀßÄêÊÑ¿ô¤ÎÌ䤤¹ç¤ï¤»\n"
-"  -R\t\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òÆɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤Î»ØÄê\n"
-"  -s <Âê̾>\tÂê̾¤Î»ØÄê (¶õÇò¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï°úÍÑÉä¤Ç¤¯¤¯¤ë¤³¤È)\n"
-"  -v\t\t¥Ð¡¼¥¸¥ç¥ó¤È¥³¥ó¥Ñ¥¤¥ë»þ»ØÄê¤Îɽ¼¨\n"
-"  -x\t\tmailx Á÷¿®¥â¡¼¥É¤Î¥·¥ß¥å¥ì¡¼¥È\n"
-"  -y\t\t»ØÄꤵ¤ì¤¿ `mailboxes' ¥ê¥¹¥È¤ÎÃ椫¤é¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÁªÂò\n"
-"  -z\t\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ãæ¤Ë¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n"
-"  -Z\t\t¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n"
-"  -h\t\t¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸"
-
-#: main.c:187
-msgid ""
-"\n"
-"Compile options:"
+
+#: main.c:259
+#, fuzzy
+msgid "Compile Options:"
 msgstr ""
 "\n"
 "¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó:"
 
-#: main.c:446
-msgid "Mutt-ng is based on the following patches written for mutt:\n"
-msgstr ""
-
-#: main.c:466
-msgid "Error initializing terminal."
-msgstr "üËö½é´ü²½¥¨¥é¡¼"
-
-#: main.c:589
-#, c-format
-msgid "Debugging at level %d.\n"
-msgstr "¥ì¥Ù¥ë %d ¤Ç¥Ç¥Ð¥Ã¥°Ãæ¡£\n"
-
-#: main.c:591
-#, c-format
-msgid "Please specify a valid debugging level ("
-msgstr ""
-
-#: main.c:592
-#, c-format
-msgid "-"
+#: main.c:486
+msgid "Built-In Defaults:"
 msgstr ""
 
-#: main.c:592
-#, c-format
-msgid ").\n"
+#: main.c:514
+msgid "MadMutt is based on Mutt-ng wich was based on Mutt before\n"
 msgstr ""
 
-#: main.c:596
-msgid "DEBUG was not defined during compilation.  Ignored.\n"
-msgstr "DEBUG ¤¬¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¡£Ìµ»ë¤¹¤ë¡£\n"
+#: main.c:533
+msgid "Error initializing terminal."
+msgstr "üËö½é´ü²½¥¨¥é¡¼"
 
-#: main.c:757
+#: main.c:826
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ¤¬Â¸ºß¤·¤Ê¤¤¡£ºîÀ®?"
 
-#: main.c:761
+#: main.c:830
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s ¤¬ %s ¤Î¤¿¤á¤ËºîÀ®¤Ç¤­¤Ê¤¤¡£"
 
-#: main.c:801
+#: main.c:870
 msgid "No recipients specified.\n"
 msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£\n"
 
-#: main.c:877
+#: main.c:946
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤¡£\n"
 
-#: main.c:894
+#: main.c:963
 msgid "No mailbox with new mail."
 msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£"
 
-#: main.c:913
+#: main.c:982
 msgid "No incoming mailboxes defined."
 msgstr "ÅþÃåÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤¬Ì¤ÄêµÁ¡£"
 
-#: main.c:948
+#: main.c:1017
 msgid "Mailbox is empty."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¶õ¡£"
 
-#: mbox.c:135 mbox.c:284
+#: mbox.c:136 mbox.c:285
 #, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "Æɤ߽Ф·Ãæ %s... %d (%d%%)"
 
-#: mbox.c:156 mbox.c:210
+#: mbox.c:157 mbox.c:211
 msgid "Mailbox is corrupt!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤³¤ï¤ì¤Æ¤¤¤ë!"
 
-#: mbox.c:577 mbox.c:814
+#: mbox.c:578 mbox.c:815
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼! ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºÆ¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿!"
 
-#: mbox.c:628
+#: mbox.c:629
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬Êѹ¹¤µ¤ì¤¿¤¬¡¢Êѹ¹¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤(¤³¤Î¥Ð¥°¤òÊó¹ð¤»¤è)!"
 
-#: mbox.c:665
+#: mbox.c:666
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "¥á¥Ã¥»¡¼¥¸½ñ¤­¹þ¤ßÃæ... %d (%d%%)"
 
-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:768
+#: mbox.c:769
 msgid "Committing changes..."
 msgstr "Êѹ¹·ë²Ì¤òÈ¿±ÇÃæ..."
 
-#: mbox.c:799
+#: mbox.c:800
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "½ñ¤­¹þ¤ß¼ºÇÔ! ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÃÇÊÒ¤ò %s ¤ËÊݸ¤·¤¿"
 
-#: mbox.c:857
+#: mbox.c:858
 msgid "Could not reopen mailbox!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºÆ¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿!"
 
-#: mbox.c:912
+#: mbox.c:913
 msgid "Reopening mailbox..."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥óÃæ..."
 
-#: mbox.c:1126
+#: mbox.c:1127
 msgid "Can't write message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹þ¤á¤Ê¤¤"
 
-#: menu.c:411
+#: menu.c:417
 msgid "Jump to: "
 msgstr "°ÜÆ°À襤¥ó¥Ç¥Ã¥¯¥¹ÈÖ¹æ¤ò»ØÄê: "
 
-#: menu.c:418
+#: menu.c:424
 msgid "Invalid index number."
 msgstr "ÉÔÀµ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹Èֹ档"
 
-#: menu.c:422 menu.c:443 menu.c:477 menu.c:516 menu.c:531 menu.c:541
-#: menu.c:551 menu.c:588 menu.c:598 menu.c:610 menu.c:622 menu.c:1004
+#: menu.c:428 menu.c:449 menu.c:507 menu.c:542 menu.c:556 menu.c:565
+#: menu.c:574 menu.c:584 menu.c:596 menu.c:608 menu.c:990
 msgid "No entries."
 msgstr "¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£"
 
-#: menu.c:440
+#: menu.c:446
 msgid "You cannot scroll down farther."
 msgstr "¤³¤ì¤è¤ê²¼¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Ê¤¤¡£"
 
-#: menu.c:457
+#: menu.c:463
 msgid "You cannot scroll up farther."
 msgstr "¤³¤ì¤è¤ê¾å¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Ê¤¤¡£"
 
-#: menu.c:474
-msgid "You are on the last page."
-msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥Ú¡¼¥¸¡£"
-
-#: menu.c:496
+#: menu.c:500
 msgid "You are on the first page."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥Ú¡¼¥¸¡£"
 
-#: menu.c:568
-msgid "First entry is shown."
-msgstr "ºÇ½é¤Î¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¡£"
-
-#: menu.c:585
-msgid "Last entry is shown."
-msgstr "ºÇ¸å¤Î¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¡£"
+#: menu.c:501
+msgid "You are on the last page."
+msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥Ú¡¼¥¸¡£"
 
-#: menu.c:632
+#: menu.c:618
 msgid "You are on the last entry."
 msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥¨¥ó¥È¥ê¡£"
 
-#: menu.c:642
+#: menu.c:628
 msgid "You are on the first entry."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¨¥ó¥È¥ê¡£"
 
-#: menu.c:700 pattern.c:1253
+#: menu.c:686 pattern.c:1314
 msgid "Search for: "
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó: "
 
-#: menu.c:701 pattern.c:1254
+#: menu.c:687 pattern.c:1315
 msgid "Reverse search for: "
 msgstr "µÕ½ç¸¡º÷¥Ñ¥¿¡¼¥ó: "
 
-#: menu.c:709 pattern.c:1285
+#: menu.c:695 pattern.c:1346
 msgid "No search pattern."
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¡£"
 
-#: menu.c:739 pager.c:1853 pager.c:1867 pager.c:1969 pattern.c:1349
+#: menu.c:725 pager.c:1866 pager.c:1880 pager.c:1982 pattern.c:1414
 msgid "Not found."
 msgstr "¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¡£"
 
-#: menu.c:859
+#: menu.c:845
 msgid "No tagged entries."
 msgstr "¥¿¥°ÉÕ¤­¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£"
 
-#: menu.c:964
+#: menu.c:950
 msgid "Search is not implemented for this menu."
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤Ï¸¡º÷µ¡Ç½¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: menu.c:969
+#: menu.c:955
 msgid "Jumping is not implemented for dialogs."
 msgstr "¥¸¥ã¥ó¥×µ¡Ç½¤Ï¥À¥¤¥¢¥í¥°¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: menu.c:1007
+#: menu.c:993
 msgid "Tagging is not supported."
 msgstr "¥¿¥°ÉÕ¤±µ¡Ç½¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: mh.c:637 mh.c:874
+#: mh.c:638 mh.c:880
 #, c-format
 msgid "Reading %s... %d"
 msgstr "%s ¤«¤éÆɤ߽Ф·Ãæ... %d"
 
-#: mh.c:1146
+#: mh.c:1152
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): ¥Õ¥¡¥¤¥ë¤Ë»þ¹ï¤òÀßÄê¤Ç¤­¤Ê¤¤"
 
 # »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
-#: muttlib.c:824
+#: muttlib.c:828
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ? (y:¤¹¤ë, n:¤·¤Ê¤¤, a:¤¹¤Ù¤ÆÊݸ)"
 
-#: muttlib.c:825
+#: muttlib.c:829
 msgid "yna"
 msgstr "yna"
 
 # »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
-#: muttlib.c:842
+#: muttlib.c:846
 msgid "File is a directory, save under it?"
 msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ?"
 
-#: muttlib.c:848
+#: muttlib.c:852
 msgid "File under directory: "
 msgstr "¥Ç¥£¥ì¥¯¥È¥êÇÛ²¼¤Î¥Õ¥¡¥¤¥ë: "
 
-#: muttlib.c:859
+#: muttlib.c:863
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¡£o:¾å½ñ¤­, a:ÄɲÃ, c:Ãæ»ß"
 
-#: muttlib.c:859
+#: muttlib.c:863
 msgid "oac"
 msgstr "oac"
 
-#: muttlib.c:1187
+#: muttlib.c:1182
 msgid "Can't save message to POP mailbox."
 msgstr "POP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤òÊݸ¤Ç¤­¤Ê¤¤"
 
-#: muttlib.c:1195
+#: muttlib.c:1190
 #, fuzzy
 msgid "Can't save message to newsserver."
 msgstr "POP ¥µ¡¼¥Ð¾å¤Ç¤Ï¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸¤Ç¤­¤Ê¤¤¡£"
 
-#. if we're appending to the trash, there's no point in asking
-#: muttlib.c:1205
+#: muttlib.c:1200
 #, c-format
 msgid "Append messages to %s?"
 msgstr "%s ¤Ë¥á¥Ã¥»¡¼¥¸¤òÄɲÃ?"
 
-#: muttlib.c:1215
+#: muttlib.c:1210
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤!"
 
-#: mutt_socket.c:85 mutt_socket.c:134
+#: mutt_socket.c:86 mutt_socket.c:135
 #, c-format
 msgid "Connection to %s closed"
 msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»¤·¤¿"
 
-#: mutt_socket.c:248
+#: mutt_socket.c:247
 msgid "SSL is unavailable."
 msgstr "SSL ¤¬ÍøÍѤǤ­¤Ê¤¤¡£"
 
-#: mutt_socket.c:277
+#: mutt_socket.c:276
 msgid "Preconnect command failed."
 msgstr "»öÁ°Àܳ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¡£"
 
-#: mutt_socket.c:345 mutt_socket.c:358
+#: mutt_socket.c:344 mutt_socket.c:357
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "%s ¤Ø¤Î¸ò¿®¥¨¥é¡¼ (%s)¡£"
 
-#: mutt_socket.c:396 mutt_socket.c:449
+#: mutt_socket.c:395 mutt_socket.c:448
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "ÉÔÀµ¤Ê IDN \"%s\"."
 
-#: mutt_socket.c:403 mutt_socket.c:456
+#: mutt_socket.c:402 mutt_socket.c:455
 #, c-format
 msgid "Looking up %s..."
 msgstr "%s ¸¡º÷Ãæ..."
 
-#: mutt_socket.c:413 mutt_socket.c:462
+#: mutt_socket.c:412 mutt_socket.c:461
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "¥Û¥¹¥È \"%s\" ¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿"
 
-#: mutt_socket.c:418 mutt_socket.c:471
+#: mutt_socket.c:417 mutt_socket.c:470
 #, c-format
 msgid "Connecting to %s..."
 msgstr "%s ¤ËÀܳÃæ..."
@@ -3877,644 +3832,671 @@ msgstr "%s 
 msgid "Could not connect to %s (%s)."
 msgstr "%s ¤ËÀܳ¤Ç¤­¤Ê¤«¤Ã¤¿ (%s)¡£"
 
-#: mutt_ssl.c:165
+#: mutt_ssl.c:166
 msgid "Failed to find enough entropy on your system"
 msgstr "¼Â¹ÔÃæ¤Î¥·¥¹¥Æ¥à¤Ë¤Ï½½Ê¬¤ÊÍ𻨤µ¤ò¸«¤Ä¤±¤é¤ì¤Ê¤«¤Ã¤¿"
 
-#: mutt_ssl.c:190
+#: mutt_ssl.c:191
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr "Í𻨤µ¥×¡¼¥ë¤ò½¼Å¶Ãæ: %s...\n"
 
-#: mutt_ssl.c:196
+#: mutt_ssl.c:197
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s ¤ËÀȼå¤Ê¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤¬¤¢¤ë!"
 
-#: mutt_ssl.c:216
+#: mutt_ssl.c:217
 msgid "SSL disabled due the lack of entropy"
 msgstr "Í𻨤µÉÔ­¤Î¤¿¤á SSL ¤Ï̵¸ú¤Ë¤Ê¤Ã¤¿"
 
-#: mutt_ssl.c:307
+#: mutt_ssl.c:308
 msgid "I/O error"
 msgstr "I/O ¥¨¥é¡¼"
 
-#: mutt_ssl.c:316
+#: mutt_ssl.c:317
 #, c-format
 msgid "SSL failed: %s"
 msgstr "SSL ¤Ï %s ¤Ç¼ºÇÔ¡£"
 
-#: mutt_ssl.c:324 mutt_ssl_gnutls.c:467 mutt_ssl_gnutls.c:475
-#: mutt_ssl_gnutls.c:501
+#: mutt_ssl.c:325 mutt_ssl_gnutls.c:470 mutt_ssl_gnutls.c:478
+#: mutt_ssl_gnutls.c:504
 msgid "Unable to get certificate from peer"
 msgstr "ÀܳÀ褫¤é¾ÚÌÀ½ñ¤òÆÀ¤é¤ì¤Ê¤«¤Ã¤¿"
 
-#: mutt_ssl.c:332
+#: mutt_ssl.c:333
 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr "%s ¤ò»È¤Ã¤¿ SSL Àܳ (%s)"
 
-#: mutt_ssl.c:414
+#: mutt_ssl.c:415
 msgid "Unknown"
 msgstr "ÉÔÌÀ"
 
-#: mutt_ssl.c:437 mutt_ssl_gnutls.c:359
+#: mutt_ssl.c:438 mutt_ssl_gnutls.c:362
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[·×»»ÉÔǽ]"
 
-#: mutt_ssl.c:454 mutt_ssl_gnutls.c:381
+#: mutt_ssl.c:455 mutt_ssl_gnutls.c:384
 msgid "[invalid date]"
 msgstr "[ÉÔÀµ¤ÊÆüÉÕ]"
 
-#: mutt_ssl.c:525
+#: mutt_ssl.c:526
 msgid "Server certificate is not yet valid"
 msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
 
-#: mutt_ssl.c:531
+#: mutt_ssl.c:532
 msgid "Server certificate has expired"
 msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
 
-#: mutt_ssl.c:590 mutt_ssl_gnutls.c:591
+#: mutt_ssl.c:591 mutt_ssl_gnutls.c:594
 msgid "This certificate belongs to:"
 msgstr "¤³¤Î¾ÚÌÀ½ñ¤Î½ê°Àè:"
 
-#: mutt_ssl.c:601 mutt_ssl_gnutls.c:636
+#: mutt_ssl.c:602 mutt_ssl_gnutls.c:639
 msgid "This certificate was issued by:"
 msgstr "¤³¤Î¾ÚÌÀ½ñ¤Îȯ¹Ô¸µ:"
 
-#: mutt_ssl.c:613 mutt_ssl_gnutls.c:682
+#: mutt_ssl.c:614 mutt_ssl_gnutls.c:685
 #, c-format
 msgid "This certificate is valid"
 msgstr "¤³¤Î¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´Ö¤Ï"
 
-#: mutt_ssl.c:614 mutt_ssl_gnutls.c:685
+#: mutt_ssl.c:615 mutt_ssl_gnutls.c:688
 #, c-format
 msgid "   from %s"
 msgstr "   %s ¤«¤é"
 
-#: mutt_ssl.c:616 mutt_ssl_gnutls.c:689
+#: mutt_ssl.c:617 mutt_ssl_gnutls.c:692
 #, c-format
 msgid "     to %s"
 msgstr "   %s ¤Þ¤Ç"
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:623
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
 
-#: mutt_ssl.c:624
+#: mutt_ssl.c:625
 msgid "SSL Certificate check"
 msgstr "SSL ¾ÚÌÀ½ñ¸¡ºº"
 
-#: mutt_ssl.c:628 mutt_ssl_gnutls.c:734
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:737
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "r:µñÈÝ, o:º£²ó¤Î¤ß¾µÇ§, a:¾ï¤Ë¾µÇ§"
 
-#: mutt_ssl.c:629 mutt_ssl_gnutls.c:735
+#: mutt_ssl.c:630 mutt_ssl_gnutls.c:738
 msgid "roa"
 msgstr "roa"
 
-#: mutt_ssl.c:632 mutt_ssl_gnutls.c:738
+#: mutt_ssl.c:633 mutt_ssl_gnutls.c:741
 msgid "(r)eject, accept (o)nce"
 msgstr "r:µñÈÝ, o:º£²ó¤Î¤ß¾µÇ§"
 
-#: mutt_ssl.c:633 mutt_ssl_gnutls.c:739
+#: mutt_ssl.c:634 mutt_ssl_gnutls.c:742
 msgid "ro"
 msgstr "ro"
 
-#: mutt_ssl.c:660 mutt_ssl_gnutls.c:780
+#: mutt_ssl.c:661 mutt_ssl_gnutls.c:783
 msgid "Warning: Couldn't save certificate"
 msgstr "·Ù¹ð: ¾ÚÌÀ½ñ¤òÊݸ¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: mutt_ssl.c:664 mutt_ssl_gnutls.c:784
+#: mutt_ssl.c:665 mutt_ssl_gnutls.c:787
 msgid "Certificate saved"
 msgstr "¾ÚÌÀ½ñ¤òÊݸ¤·¤¿"
 
-#: mutt_ssl_gnutls.c:59
+#: mutt_ssl_gnutls.c:62
 #, c-format
 msgid "gnutls_global_init: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:87 mutt_ssl_gnutls.c:107
+#: mutt_ssl_gnutls.c:90 mutt_ssl_gnutls.c:110
 msgid "Error: no TLS socket open"
 msgstr "¥¨¥é¡¼: TLS ¥½¥±¥Ã¥È¤¬³«¤¤¤Æ¤¤¤Ê¤¤"
 
-#: mutt_ssl_gnutls.c:94
+#: mutt_ssl_gnutls.c:97
 #, c-format
 msgid "tls_socket_read (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:114
+#: mutt_ssl_gnutls.c:117
 #, c-format
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:163
+#: mutt_ssl_gnutls.c:166
 #, c-format
 msgid "gnutls_certificate_allocate_credentials: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:190
+#: mutt_ssl_gnutls.c:193
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr "TLS/SSL Àܳ¤ËÍøÍѲÄǽ¤Ê¥×¥í¥È¥³¥ë¤¬¤¹¤Ù¤Æ̵¸ú"
 
-#: mutt_ssl_gnutls.c:228
+#: mutt_ssl_gnutls.c:231
 #, c-format
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:232
+#: mutt_ssl_gnutls.c:235
 #, c-format
 msgid "gnutls_handshake: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:246
+#: mutt_ssl_gnutls.c:249
 #, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "%s ¤ò»È¤Ã¤¿ SSL/TLS Àܳ (%s/%s/%s)"
 
-#: mutt_ssl_gnutls.c:480
+#: mutt_ssl_gnutls.c:483
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr "¾ÚÌÀ½ñ¤Î¸¡¾Ú¥¨¥é¡¼ (%s)"
 
-#: mutt_ssl_gnutls.c:488
+#: mutt_ssl_gnutls.c:491
 msgid "Certificate is not X.509"
 msgstr "¾ÚÌÀ½ñ¤¬ X.509 ¤Ç¤Ê¤¤"
 
-#: mutt_ssl_gnutls.c:494
+#: mutt_ssl_gnutls.c:497
 msgid "Error initialising gnutls certificate data"
 msgstr "gnutls ¾ÚÌÀ½ñ¥Ç¡¼¥¿½é´ü²½¥¨¥é¡¼"
 
-#: mutt_ssl_gnutls.c:508
+#: mutt_ssl_gnutls.c:511
 msgid "Error processing certificate data"
 msgstr "¾ÚÌÀ½ñ¥Ç¡¼¥¿½èÍý¥¨¥é¡¼"
 
-#: mutt_ssl_gnutls.c:694
+#: mutt_ssl_gnutls.c:697
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "SHA1 ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
 
-#: mutt_ssl_gnutls.c:698
+#: mutt_ssl_gnutls.c:701
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "MD5 ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
 
-#: mutt_ssl_gnutls.c:704
+#: mutt_ssl_gnutls.c:707
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
 
-#: mutt_ssl_gnutls.c:708
+#: mutt_ssl_gnutls.c:711
 msgid "WARNING: Server certificate has expired"
 msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
 
-#: mutt_ssl_gnutls.c:714
+#: mutt_ssl_gnutls.c:717
 msgid "WARNING: Server certificate has been revoked"
 msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬ÇÑ´þºÑ¤ß"
 
-#: mutt_ssl_gnutls.c:719
+#: mutt_ssl_gnutls.c:722
 msgid "WARNING: Server hostname does not match certificate"
 msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤¬¾ÚÌÀ½ñ¤È°ìÃפ·¤Ê¤¤"
 
-#: mutt_ssl_gnutls.c:725
+#: mutt_ssl_gnutls.c:728
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï½ð̾¼Ô¤¬ CA ¤Ç¤Ê¤¤"
 
-#: mutt_ssl_gnutls.c:729
+#: mutt_ssl_gnutls.c:732
 msgid "TLS/SSL Certificate check"
 msgstr "TLS/SSL ¾ÚÌÀ½ñ¸¡ºº"
 
-#: mutt_tunnel.c:65
+#: mutt_tunnel.c:66
 #, c-format
 msgid "Connecting with \"%s\"..."
 msgstr "\"%s\" ¤ÇÀܳÃæ..."
 
-#: mutt_tunnel.c:127
+#: mutt_tunnel.c:128
 #, c-format
 msgid "Tunnel to %s returned error %d (%s)"
 msgstr "%s ¤Ø¤Î¥È¥ó¥Í¥ë¤¬¥¨¥é¡¼ %d (%s) ¤òÊÖ¤·¤¿"
 
-#: mutt_tunnel.c:143 mutt_tunnel.c:159
+#: mutt_tunnel.c:144 mutt_tunnel.c:160
 #, c-format
 msgid "Tunnel error talking to %s: %s"
 msgstr "%s ¤Ø¤Î¥È¥ó¥Í¥ë¸ò¿®¥¨¥é¡¼: %s"
 
-#: mx.c:132
+#: mx.c:130
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "¥í¥Ã¥¯²ó¿ô¤¬Ëþλ¡¢%s ¤Î¥í¥Ã¥¯¤ò¤Ï¤º¤¹¤«?"
 
-#: mx.c:141
+#: mx.c:139
 #, c-format
 msgid "Can't dotlock %s.\n"
 msgstr "%s ¤Î¥É¥Ã¥È¥í¥Ã¥¯¤¬¤Ç¤­¤Ê¤¤¡£\n"
 
-#: mx.c:223
+#: mx.c:222
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "fcntl ¥í¥Ã¥¯Ãæ¤Ë¥¿¥¤¥à¥¢¥¦¥ÈȯÀ¸!"
 
-#: mx.c:230
+#: mx.c:229
 #, c-format
 msgid "Waiting for fcntl lock... %d"
 msgstr "fcntl ¥í¥Ã¥¯ÂÔ¤Á... %d"
 
-#: mx.c:257
+#: mx.c:256
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "flock ¥í¥Ã¥¯Ãæ¤Ë¥¿¥¤¥à¥¢¥¦¥ÈȯÀ¸!"
 
-#: mx.c:265
+#: mx.c:264
 #, c-format
 msgid "Waiting for flock attempt... %d"
 msgstr "flock ¥í¥Ã¥¯ÂÔ¤Á... %d"
 
-#: mx.c:487
+#: mx.c:486
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "%s ¤ò¥í¥Ã¥¯¤Ç¤­¤Ê¤«¤Ã¤¿\n"
 
-#: mx.c:576
+#: mx.c:575
 #, c-format
 msgid "Reading %s..."
 msgstr "%s Æɤ߽Ф·Ãæ..."
 
-#: mx.c:638
+#: mx.c:637
 #, c-format
 msgid "Writing %s..."
 msgstr "%s ½ñ¤­¹þ¤ßÃæ..."
 
-#: mx.c:669
+#: mx.c:668
 #, fuzzy
 msgid "message(s) not deleted"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
 
 # %s ¤Ï strerror(errno) ¤Î¤è¤¦¤Ç¤¢¤ë¡£
-#: mx.c:690
+#: mx.c:689
 #, fuzzy
 msgid "Can't open trash folder"
 msgstr "¥Õ¥©¥ë¥À¤ËÄɲäǤ­¤Ê¤¤: %s"
 
-#: mx.c:757
+#: mx.c:756
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "%s ¤Ë´ûÆÉ¥á¥Ã¥»¡¼¥¸¤ò°ÜÆ°?"
 
-#: mx.c:771 mx.c:1026
+#: mx.c:770 mx.c:1033
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "ºï½ü¤µ¤ì¤¿ %d ¥á¥Ã¥»¡¼¥¸¤òÇÑ´þ?"
 
-#: mx.c:772 mx.c:1027
+#: mx.c:771 mx.c:1034
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "ºï½ü¤µ¤ì¤¿ %d ¥á¥Ã¥»¡¼¥¸¤òÇÑ´þ?"
 
-#: mx.c:791
+#: mx.c:790
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "%s ¤Ë´ûÆÉ¥á¥Ã¥»¡¼¥¸¤ò°ÜÆ°Ãæ..."
 
-#: mx.c:844 mx.c:1017
+#: mx.c:843 mx.c:1024
 msgid "Mailbox is unchanged."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÊѹ¹¤µ¤ì¤Ê¤«¤Ã¤¿"
 
-#: mx.c:883
+#: mx.c:882
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d ÊÝ»ý¡¢%d °ÜÆ°¡¢%d ÇÑ´þ"
 
-#: mx.c:886 mx.c:1070
+#: mx.c:885 mx.c:1077
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d ÊÝ»ý¡¢%d ÇÑ´þ"
 
-#: mx.c:1002
+#: mx.c:1009
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " '%s' ¤ò²¡¤¹¤ÈÊѹ¹¤ò½ñ¤­¹þ¤à¤«¤É¤¦¤«¤òÀÚÂØ"
 
-#: mx.c:1004
+#: mx.c:1011
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "'toggle-write' ¤ò»È¤Ã¤Æ½ñ¤­¹þ¤ß¤òÍ­¸ú¤Ë¤»¤è!"
 
-#: mx.c:1007
+#: mx.c:1014
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï½ñ¤­¹þ¤ßÉÔǽ¤Ë¥Þ¡¼¥¯¤µ¤ì¤¿¡£%s"
 
-#: mx.c:1066
+#: mx.c:1073
 msgid "Mailbox checkpointed."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤òºÎ¼è¤·¤¿¡£"
 
-#: mx.c:1295
+#: mx.c:1305
 msgid "Integer overflow -- can't allocate memory."
 msgstr "·å¤¢¤Õ¤ì -- ¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Ê¤¤¡£"
 
-#: nntp/newsrc.c:189
+#: mx.c:1451
+msgid "Support for header caching was not build in."
+msgstr ""
+
+#: mx.c:1459
+#, fuzzy
+msgid "No mailboxes defined."
+msgstr "ÅþÃåÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤¬Ì¤ÄêµÁ¡£"
+
+#: nntp/newsrc.c:190
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
 msgstr "%s ¤¬Â¸ºß¤·¤Ê¤¤¡£ºîÀ®?"
 
-#: nntp/newsrc.c:193
+#: nntp/newsrc.c:194
 msgid "Cache directory not created!"
 msgstr ""
 
-#: nntp/newsrc.c:341
+#: nntp/newsrc.c:342
 msgid "No newsserver defined!"
 msgstr ""
 
-#: nntp/newsrc.c:355
+#: nntp/newsrc.c:356
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
 
-#: nntp/nntp.c:92 pop/pop.c:648 pop/pop_lib.c:351
+#: nntp/newsrc.c:645
+#, fuzzy, c-format
+msgid "Unable to open %s for reading"
+msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
+
+#: nntp/newsrc.c:650
+#, fuzzy, c-format
+msgid "Unable to lock %s"
+msgstr "%s ¤ÏźÉդǤ­¤Ê¤¤!"
+
+#: nntp/newsrc.c:664
+#, fuzzy, c-format
+msgid "Unable to open %s for writing"
+msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
+
+#: nntp/newsrc.c:729
+#, fuzzy, c-format
+msgid "Can't write %s"
+msgstr "%s ¤òºîÀ®¤Ç¤­¤Ê¤¤¡£"
+
+#: nntp/newsrc.c:738
+#, fuzzy, c-format
+msgid "Can't rename %s to %s"
+msgstr "%s ¤¬ %s ¤Î¤¿¤á¤ËºîÀ®¤Ç¤­¤Ê¤¤¡£"
+
+#: nntp/nntp.c:136 pop/pop.c:657 pop/pop_lib.c:349
 msgid "Server closed connection!"
 msgstr "¥µ¡¼¥Ð¤¬Àܳ¤òÀڤä¿!"
 
-#: nntp/nntp.c:113
+#: nntp/nntp.c:157
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "%s ¤ËÀܳÃæ..."
 
-#: nntp/nntp.c:115
+#: nntp/nntp.c:159
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp/nntp.c:222
+#: nntp/nntp.c:268
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»¤·¤¿"
 
-#: nntp/nntp.c:330
+#: nntp/nntp.c:381
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: nntp/nntp.c:643
+#: nntp/nntp.c:695
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À¼èÆÀÃæ... [%d/%d]"
 
-#. fetch list of articles
-#: nntp/nntp.c:657
+#: nntp/nntp.c:696
+#, fuzzy
+msgid "Fetching headers from cache..."
+msgstr "¥á¥Ã¥»¡¼¥¸¼èÆÀÃæ..."
+
+#: nntp/nntp.c:710
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "¥á¥Ã¥»¡¼¥¸¥ê¥¹¥È¤ò¼èÆÀÃæ..."
 
-#: nntp/nntp.c:667
+#: nntp/nntp.c:721
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: nntp/nntp.c:682
-#, fuzzy, c-format
-msgid "GROUP command failed: %s"
-msgstr "»öÁ°Àܳ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¡£"
-
-#: nntp/nntp.c:696
-#, fuzzy
-msgid "Fetching headers from cache..."
-msgstr "¥á¥Ã¥»¡¼¥¸¼èÆÀÃæ..."
-
-#: nntp/nntp.c:743
+#: nntp/nntp.c:792
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n"
 
-#: nntp/nntp.c:803
+#: nntp/nntp.c:854
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
 
-#: nntp/nntp.c:847
+#: nntp/nntp.c:898
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: nntp/nntp.c:926
+#: nntp/nntp.c:979
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: nntp/nntp.c:977
+#: nntp/nntp.c:1030
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "POP ¥µ¡¼¥Ð¤Ø¤ÎÀܳ½ªÎ»Ãæ..."
 
-#: nntp/nntp.c:984
+#: nntp/nntp.c:1037
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp/nntp.c:990 nntp/nntp.c:1020
+#: nntp/nntp.c:1043 nntp/nntp.c:1073
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»¤·¤¿"
 
 # system call ¤Î stat() ¤ò¡Ö°À­Ä´ºº¡×¤ÈÌõ¤·¤Æ¤¤¤ë
-#: nntp/nntp.c:995 nntp/nntp.c:1025
+#: nntp/nntp.c:1048 nntp/nntp.c:1078
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "%s ¤ò°À­Ä´ºº¤Ç¤­¤Ê¤¤: %s"
 
-#: nntp/nntp.c:1116
+#: nntp/nntp.c:1167
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "¥Í¡¼¥à¥¹¥Ú¡¼¥¹¼èÆÀÃæ..."
 
-#: nntp/nntp.c:1123
+#: nntp/nntp.c:1174
 msgid "Mark all articles read?"
 msgstr ""
 
-#: nntp/nntp.c:1276 pop/pop.c:485 pop/pop.c:548
+#: nntp/nntp.c:1328 pop/pop.c:494 pop/pop.c:557
 msgid "Checking for new messages..."
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¸¡½ÐÃæ..."
 
-#: nntp/nntp.c:1287
+#: nntp/nntp.c:1340
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¸¡½ÐÃæ..."
 
-#: nntp/nntp.c:1301
+#: nntp/nntp.c:1354
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: nntp/nntp.c:1309 nntp/nntp.c:1380
+#: nntp/nntp.c:1362 nntp/nntp.c:1433
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "¥í¥°¥¤¥óÃæ..."
 
-#: nntp/nntp.c:1340
+#: nntp/nntp.c:1393
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp/nntp.c:1366
+#: nntp/nntp.c:1419
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
 
-#: nntp/nntp.c:1415
+#: nntp/nntp.c:1468
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½üÃæ..."
 
-#: nntp/nntp.c:1467
+#: nntp/nntp.c:1520
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: pager.c:62
-msgid "Not available in this menu."
-msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤ÏÍøÍѤǤ­¤Ê¤¤¡£"
-
-#: pager.c:1373
+#: pager.c:1374
 msgid "PrevPg"
 msgstr "Á°ÊÇ"
 
-#: pager.c:1374
+#: pager.c:1375
 msgid "NextPg"
 msgstr "¼¡ÊÇ"
 
-#: pager.c:1378
+#: pager.c:1379
 msgid "View Attachm."
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë"
 
-#: pager.c:1381 pager.c:1390
+#: pager.c:1382 pager.c:1391
 msgid "Next"
 msgstr "¼¡"
 
-#. emulate "less -q" and don't go on to the next message.
-#: pager.c:1770 pager.c:1798 pager.c:1828 pager.c:2062
+#: pager.c:1783 pager.c:1811 pager.c:1841 pager.c:2075
 msgid "Bottom of message is shown."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈÖ²¼¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë"
 
-#: pager.c:1785 pager.c:1805 pager.c:1812 pager.c:1819
+#: pager.c:1798 pager.c:1818 pager.c:1825 pager.c:1832
 msgid "Top of message is shown."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈ־夬ɽ¼¨¤µ¤ì¤Æ¤¤¤ë"
 
-#: pager.c:1880
+#: pager.c:1893
 msgid "Reverse search: "
 msgstr "µÕ½ç¤Î¸¡º÷: "
 
-#: pager.c:1881
+#: pager.c:1894
 msgid "Search: "
 msgstr "¸¡º÷: "
 
-#: pager.c:1993
+#: pager.c:2006
 msgid "Help is currently being shown."
 msgstr "¸½ºß¥Ø¥ë¥×¤òɽ¼¨Ãæ"
 
-#: pager.c:2023
+#: pager.c:2036
 msgid "No more quoted text."
 msgstr "¤³¤ì°Ê¾å¤Î°úÍÑʸ¤Ï¤Ê¤¤¡£"
 
-#: pager.c:2040
+#: pager.c:2053
 msgid "No more unquoted text after quoted text."
 msgstr "°úÍÑʸ¤Î¸å¤Ë¤Ï¤â¤¦Èó°úÍÑʸ¤¬¤Ê¤¤¡£"
 
-#: parse.c:584
+#: parse.c:587
 msgid "multipart message has no boundary parameter!"
 msgstr "¥Þ¥ë¥Á¥Ñ¡¼¥È¤Î¥á¥Ã¥»¡¼¥¸¤À¤¬ boundary ¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤!"
 
-#: pattern.c:233
+#: pattern.c:253
 #, c-format
 msgid "Error in expression: %s"
 msgstr "±¦µ­¤Î¼°Ãæ¤Ë¥¨¥é¡¼: %s"
 
-#: pattern.c:332
+#: pattern.c:258
+#, fuzzy, c-format
+msgid "Empty expression"
+msgstr "¼°Ãæ¤Ë¥¨¥é¡¼"
+
+#: pattern.c:374
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "%s ¤ÏÉÔÀµ¤ÊÆüÉÕ"
 
-#: pattern.c:344
+#: pattern.c:386
 #, c-format
 msgid "Invalid month: %s"
 msgstr "%s ¤ÏÉÔÀµ¤Ê·î"
 
-#. getDate has its own error message, don't overwrite it here
-#: pattern.c:487
+#: pattern.c:529
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "%s ¤ÏÉÔÀµ¤ÊÁêÂзîÆü"
 
-#: pattern.c:500
+#: pattern.c:542
 msgid "error in expression"
 msgstr "¼°Ãæ¤Ë¥¨¥é¡¼"
 
-#: pattern.c:690 pattern.c:792
+#: pattern.c:733 pattern.c:838
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
 
-#: pattern.c:736
+#: pattern.c:782
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c ¤ÏÉÔÀµ¤Ê¥³¥Þ¥ó¥É"
 
-#: pattern.c:741
+#: pattern.c:787
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c ¤Ï¤³¤Î¥â¡¼¥É¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤"
 
-#: pattern.c:753
+#: pattern.c:799
 #, c-format
 msgid "missing parameter"
 msgstr "¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤"
 
-#: pattern.c:767
+#: pattern.c:813
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "Âбþ¤¹¤ë³ç¸Ì¤¬¤Ê¤¤: %s"
 
-#: pattern.c:798
+#: pattern.c:844
 msgid "empty pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤¬¶õ"
 
-#: pattern.c:1076
+#: pattern.c:1144
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "¥¨¥é¡¼: ÉÔÌÀ¤Ê op %d (¤³¤Î¥¨¥é¡¼¤òÊó¹ð¤»¤è)¡£"
 
-#: pattern.c:1148 pattern.c:1271
+#: pattern.c:1210 pattern.c:1332
 msgid "Compiling search pattern..."
 msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤ò¥³¥ó¥Ñ¥¤¥ëÃæ..."
 
-#: pattern.c:1161
+#: pattern.c:1228
 msgid "Executing command on matching messages..."
 msgstr "¥á¥Ã¥»¡¼¥¸¥Ñ¥¿¡¼¥ó¸¡º÷¤Î¤¿¤á¤Ë¥³¥Þ¥ó¥É¼Â¹ÔÃæ..."
 
-#: pattern.c:1219
+#: pattern.c:1287
 msgid "No messages matched criteria."
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ¹¤ë¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤«¤Ã¤¿¡£"
 
-#: pattern.c:1307
+#: pattern.c:1372
 msgid "Search hit bottom without finding match"
 msgstr "°ìÈÖ²¼¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£"
 
-#: pattern.c:1318
+#: pattern.c:1383
 msgid "Search hit top without finding match"
 msgstr "°ìÈÖ¾å¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£"
 
-#: pattern.c:1340
+#: pattern.c:1405
 msgid "Search interrupted."
 msgstr "¸¡º÷¤¬ÃæÃǤµ¤ì¤¿¡£"
 
-#: pgp.c:89
+#: pgp.c:90
 msgid "Enter PGP passphrase:"
 msgstr "PGP ¥Ñ¥¹¥Õ¥ì¡¼¥ºÆþÎÏ:"
 
-#: pgp.c:103
+#: pgp.c:104
 msgid "PGP passphrase forgotten."
 msgstr "PGP ¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¥á¥â¥ê¤«¤é¾Ãµî¤µ¤ì¤¿¡£"
 
-#: pgp.c:331
+#: pgp.c:340
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ¥¨¥é¡¼: PGP »Ò¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 
-#: pgp.c:367 pgp.c:589 pgp.c:780
+#: pgp.c:376 pgp.c:610 pgp.c:801
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -4522,20 +4504,24 @@ msgstr ""
 "[-- PGP ½ÐÎϽªÎ» --]\n"
 "\n"
 
-#: pgp.c:374 pgp.c:909
+#: pgp.c:393 pgp.c:930
 msgid "Could not decrypt PGP message"
 msgstr "PGP ¥á¥Ã¥»¡¼¥¸¤òÉü¹æ²½¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#. clear 'Invoking...' message, since there's no error
-#: pgp.c:418 pgp.c:907
+#: pgp.c:437
+#, fuzzy
+msgid "Could not decrypt PGP message."
+msgstr "PGP ¥á¥Ã¥»¡¼¥¸¤òÉü¹æ²½¤Ç¤­¤Ê¤«¤Ã¤¿"
+
+#: pgp.c:439 pgp.c:928
 msgid "PGP message successfully decrypted."
 msgstr "PGP ¥á¥Ã¥»¡¼¥¸¤ÎÉü¹æ²½¤ËÀ®¸ù¤·¤¿¡£"
 
-#: pgp.c:687
+#: pgp.c:708
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "ÆâÉô¥¨¥é¡¼¡£<roessler@does-not-exist.org> ¤ËÊó¹ð¤»¤è¡£"
 
-#: pgp.c:746
+#: pgp.c:767
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -4543,138 +4529,140 @@ msgstr ""
 "[-- ¥¨¥é¡¼: PGP »Ò¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 "\n"
 
-#: pgp.c:788 postpone.c:555
+#: pgp.c:809 postpone.c:556
 msgid "Decryption failed."
 msgstr "Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿¡£"
 
-#: pgp.c:957
+#: pgp.c:978
 msgid "Can't open PGP subprocess!"
 msgstr "PGP »Ò¥×¥í¥»¥¹¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
 
-#: pgp.c:1379
+#: pgp.c:1400
 msgid "Can't invoke PGP"
 msgstr "PGP µ¯Æ°¤Ç¤­¤Ê¤¤"
 
-#: pgp.c:1480
+#: pgp.c:1501
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, %s, c:¤Ê¤· "
 
-#: pgp.c:1481
+#: pgp.c:1502
 msgid "PGP/M(i)ME"
 msgstr "i:PGP/MIME"
 
-#: pgp.c:1481
+#: pgp.c:1502
 msgid "(i)nline"
 msgstr "i:¥¤¥ó¥é¥¤¥ó"
 
-#: pgp.c:1483
+#: pgp.c:1504
 msgid "esabifc"
 msgstr "esabifc"
 
-#: pgpinvoke.c:298
+#: pgpinvoke.c:299
 msgid "Fetching PGP key..."
 msgstr "PGP ¸°¤ò¼èÆÀÃæ..."
 
-#: pgpkey.c:464
+#: pgpkey.c:465
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "°ìÃפ·¤¿¸°¤Ï¤¹¤Ù¤Æ´ü¸ÂÀڤ줫ÇÑ´þºÑ¤ß¡¢¤Þ¤¿¤Ï»ÈÍѶػߡ£"
 
-#: pgpkey.c:507
+#: pgpkey.c:508
 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr "PGP ¸°¤Ï <%s> ¤Ë°ìÃס£"
 
-#: pgpkey.c:509
+#: pgpkey.c:510
 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr "PGP ¸°¤Ï \"%s\" ¤Ë°ìÃס£"
 
-#. __FOPEN_CHECKED__
-#: pgpkey.c:525 pgpkey.c:716
+#: pgpkey.c:526 pgpkey.c:717
 msgid "Can't open /dev/null"
 msgstr "/dev/null ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤"
 
-#: pgpkey.c:696
+#: pgpkey.c:697
 msgid "Please enter the key ID: "
 msgstr "¸° ID ¤òÆþÎÏ: "
 
-#: pgpkey.c:724
+#: pgpkey.c:725
 msgid "Invoking pgp..."
 msgstr "PGP µ¯Æ°Ãæ..."
 
-#: pgpkey.c:749
+#: pgpkey.c:750
 #, c-format
 msgid "PGP Key %s."
 msgstr "PGP ¸° %s"
 
-#: pop/pop.c:82 pop/pop_lib.c:192
+#: pop/pop.c:84 pop/pop_lib.c:192
 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "¥³¥Þ¥ó¥É TOP ¤ò¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£"
 
-#: pop/pop.c:107
+#: pop/pop.c:109
 msgid "Can't write header to temporary file!"
 msgstr "¥Ø¥Ã¥À¤ò°ì»þ¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Ê¤¤!"
 
-#: pop/pop.c:186 pop/pop_lib.c:194
+#: pop/pop.c:115
+msgid "Can't fetch header: Not connected!"
+msgstr ""
+
+#: pop/pop.c:193 pop/pop_lib.c:194
 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "¥³¥Þ¥ó¥É UIDL ¤ò¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£"
 
-#: pop/pop.c:231 pop/pop.c:529
+#: pop/pop.c:238 pop/pop.c:538
 #, c-format
 msgid "%s is an invalid POP path"
 msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
 
-#: pop/pop.c:261
+#: pop/pop.c:268
 msgid "Fetching list of messages..."
 msgstr "¥á¥Ã¥»¡¼¥¸¥ê¥¹¥È¤ò¼èÆÀÃæ..."
 
-#: pop/pop.c:388
+#: pop/pop.c:397
 msgid "Can't write message to temporary file!"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò°ì»þ¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Ê¤¤!"
 
-#: pop/pop.c:514
+#: pop/pop.c:523
 msgid "POP host is not defined."
 msgstr "POP ¥Û¥¹¥È¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: pop/pop.c:573
+#: pop/pop.c:582
 msgid "No new mail in POP mailbox."
 msgstr "POP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¿·Ãå¥á¡¼¥ë¤Ï¤Ê¤¤¡£"
 
-#: pop/pop.c:582
+#: pop/pop.c:591
 msgid "Delete messages from server?"
 msgstr "¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü?"
 
-#: pop/pop.c:584
+#: pop/pop.c:593
 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸Æɤ߽Ф·Ãæ (%d ¥Ð¥¤¥È)..."
 
-#. this is -3 when ret != 0, because it will keep the value from before *gna*
-#: pop/pop.c:620
+#: pop/pop.c:629
 msgid "Error while writing mailbox!"
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼!"
 
-#: pop/pop.c:625
+#: pop/pop.c:634
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d / %d ¥á¥Ã¥»¡¼¥¸Æɤ߽Ф·]"
 
-#: pop/pop_auth.c:88
+#: pop/pop_auth.c:78
 msgid "Authenticating (SASL)..."
 msgstr "ǧ¾ÚÃæ (SASL)..."
 
-#: pop/pop_auth.c:198
+#: pop/pop_auth.c:185
 msgid "Authenticating (APOP)..."
 msgstr "ǧ¾ÚÃæ (APOP)..."
 
-#: pop/pop_auth.c:222
+#: pop/pop_auth.c:213
 msgid "APOP authentication failed."
 msgstr "APOP ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£"
 
-#: pop/pop_auth.c:255
+#: pop/pop_auth.c:245
 #, c-format
 msgid "Command USER is not supported by server."
 msgstr "¥³¥Þ¥ó¥É USER ¤Ï¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£"
@@ -4688,272 +4676,271 @@ msgstr "
 msgid "Error connecting to server: %s"
 msgstr "¥µ¡¼¥Ð %s ¤Ø¤ÎÀܳ¥¨¥é¡¼¡£"
 
-#: pop/pop_lib.c:365
+#: pop/pop_lib.c:363
 msgid "Closing connection to POP server..."
 msgstr "POP ¥µ¡¼¥Ð¤Ø¤ÎÀܳ½ªÎ»Ãæ..."
 
-#: pop/pop_lib.c:521
+#: pop/pop_lib.c:523
 msgid "Verifying message indexes..."
 msgstr "¥á¥Ã¥»¡¼¥¸º÷°ú¸¡¾ÚÃæ..."
 
-#: pop/pop_lib.c:544
+#: pop/pop_lib.c:545
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "Àܳ¤¬Àڤ줿¡£POP ¥µ¡¼¥Ð¤ËºÆÀܳ?"
 
-#: postpone.c:169
+#: postpone.c:170
 msgid "Postponed Messages"
 msgstr "½ñ¤­¤«¤±¤Î¥á¥Ã¥»¡¼¥¸"
 
-#: postpone.c:247 postpone.c:256
+#: postpone.c:248 postpone.c:257
 msgid "No postponed messages."
 msgstr "½ñ¤­¤«¤±¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
 
-#: postpone.c:430 postpone.c:449 postpone.c:484
+#: postpone.c:431 postpone.c:450 postpone.c:485
 msgid "Illegal PGP header"
 msgstr "ÉÔÀµ¤Ê PGP ¥Ø¥Ã¥À"
 
-#: postpone.c:469
+#: postpone.c:470
 msgid "Illegal S/MIME header"
 msgstr "ÉÔÀµ¤Ê S/MIME ¥Ø¥Ã¥À"
 
-#: postpone.c:544
+#: postpone.c:545
 msgid "Decrypting message..."
 msgstr "¥á¥Ã¥»¡¼¥¸Éü¹æ²½Ãæ..."
 
-#: query.c:44
+#: query.c:45
 msgid "New Query"
 msgstr "¿·µ¬Ì䤤¹ç¤ï¤»"
 
-#: query.c:45
+#: query.c:46
 msgid "Make Alias"
 msgstr "ÊÌ̾ºîÀ®"
 
-#: query.c:46
+#: query.c:47
 msgid "Search"
 msgstr "¸¡º÷"
 
-#: query.c:93
+#: query.c:94
 msgid "Waiting for response..."
 msgstr "±þÅúÂÔ¤Á..."
 
-#: query.c:213 query.c:239
+#: query.c:214 query.c:240
 msgid "Query command not defined."
 msgstr "Ì䤤¹ç¤ï¤»¥³¥Þ¥ó¥É¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: query.c:265
+#: query.c:266
 #, c-format
 msgid "Query"
 msgstr "Ì䤤¹ç¤ï¤»"
 
-#. Prompt for Query
-#: query.c:278 query.c:300
+#: query.c:279 query.c:300
 msgid "Query: "
 msgstr "Ì䤤¹ç¤ï¤»: "
 
-#: query.c:284 query.c:307
+#: query.c:285 query.c:307
 #, c-format
 msgid "Query '%s'"
 msgstr "Ì䤤¹ç¤ï¤» '%s'"
 
-#: recvattach.c:55
+#: recvattach.c:58
 msgid "Pipe"
 msgstr "¥Ñ¥¤¥×"
 
-#: recvattach.c:56
+#: recvattach.c:59
 msgid "Print"
 msgstr "°õºþ"
 
-#: recvattach.c:404
+#: recvattach.c:424
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: recvattach.c:459
+#: recvattach.c:479
 msgid "Saving..."
 msgstr "ÊݸÃæ..."
 
-#: recvattach.c:464 recvattach.c:544
+#: recvattach.c:484 recvattach.c:564
 msgid "Attachment saved."
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¡£"
 
-#: recvattach.c:555
+#: recvattach.c:575
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "·Ù¹ð! %s ¤ò¾å½ñ¤­¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¡£·Ñ³?"
 
-#: recvattach.c:571
+#: recvattach.c:591
 msgid "Attachment filtered."
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤Ï¥³¥Þ¥ó¥É¤òÄ̤·¤Æ¤¢¤ë¡£"
 
-#: recvattach.c:632
+#: recvattach.c:652
 msgid "Filter through: "
 msgstr "ɽ¼¨¤Î¤¿¤á¤ËÄ̲ᤵ¤»¤ë¥³¥Þ¥ó¥É: "
 
-#: recvattach.c:632
+#: recvattach.c:652
 msgid "Pipe to: "
 msgstr "¥Ñ¥¤¥×¤¹¤ë¥³¥Þ¥ó¥É: "
 
-#: recvattach.c:661
+#: recvattach.c:681
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "¤É¤Î¤è¤¦¤ËźÉÕ¥Õ¥¡¥¤¥ë %s ¤ò°õºþ¤¹¤ë¤«ÉÔÌÀ!"
 
-#: recvattach.c:726
+#: recvattach.c:746
 msgid "Print tagged attachment(s)?"
 msgstr "¥¿¥°ÉÕ¤­ÅºÉÕ¥Õ¥¡¥¤¥ë¤ò°õºþ?"
 
-#: recvattach.c:726
+#: recvattach.c:746
 msgid "Print attachment?"
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ò°õºþ?"
 
-#: recvattach.c:954
+#: recvattach.c:974
 msgid "Can't decrypt encrypted message!"
 msgstr "°Å¹æ²½¥á¥Ã¥»¡¼¥¸¤òÉü¹æ²½¤Ç¤­¤Ê¤¤!"
 
-#: recvattach.c:967
+#: recvattach.c:987
 msgid "Attachments"
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë"
 
-#: recvattach.c:1003
+#: recvattach.c:1023
 msgid "There are no subparts to show!"
 msgstr "ɽ¼¨¤¹¤Ù¤­Éû¥Ñ¡¼¥È¤¬¤Ê¤¤!"
 
-#: recvattach.c:1069
+#: recvattach.c:1089
 msgid "Can't delete attachment from POP server."
 msgstr "POP ¥µ¡¼¥Ð¤«¤éźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Ê¤¤¡£"
 
-#: recvattach.c:1078
+#: recvattach.c:1098
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "POP ¥µ¡¼¥Ð¤«¤éźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Ê¤¤¡£"
 
-#: recvattach.c:1087
+#: recvattach.c:1107
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "°Å¹æ²½¥á¥Ã¥»¡¼¥¸¤«¤é¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤Îºï½ü¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: recvattach.c:1102 recvattach.c:1115
+#: recvattach.c:1122 recvattach.c:1135
 msgid "Only deletion of multipart attachments is supported."
 msgstr "¥Þ¥ë¥Á¥Ñ¡¼¥ÈźÉÕ¥Õ¥¡¥¤¥ë¤Îºï½ü¤Î¤ß¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¡£"
 
-#: recvcmd.c:41
+#: recvcmd.c:42
 msgid "You may only bounce message/rfc822 parts."
 msgstr "message/rfc822 ¥Ñ¡¼¥È¤Î¤ßºÆÁ÷¤·¤Æ¤â¤è¤¤¡£"
 
-#: recvcmd.c:203
+#: recvcmd.c:204
 msgid "Error bouncing message!"
 msgstr "¥á¥Ã¥»¡¼¥¸ºÆÁ÷¥¨¥é¡¼!"
 
-#: recvcmd.c:204
+#: recvcmd.c:205
 msgid "Error bouncing messages!"
 msgstr "¥á¥Ã¥»¡¼¥¸ºÆÁ÷¥¨¥é¡¼!"
 
-#: recvcmd.c:394
+#: recvcmd.c:395
 #, c-format
 msgid "Can't open temporary file %s."
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤¡£"
 
-#: recvcmd.c:423
+#: recvcmd.c:424
 msgid "Forward as attachments?"
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤È¤·¤ÆžÁ÷?"
 
-#: recvcmd.c:437
+#: recvcmd.c:438
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "¥¿¥°ÉÕ¤­ÅºÉÕ¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤ÎÉü¹æ²½¤Ï¼ºÇÔ¡£À®¸ùʬ¤À¤± MIME žÁ÷?"
 
-#: recvcmd.c:556
+#: recvcmd.c:557
 msgid "Forward MIME encapsulated?"
 msgstr "MIME ¥«¥×¥»¥ë²½¤·¤ÆžÁ÷?"
 
-#: recvcmd.c:562 recvcmd.c:813
+#: recvcmd.c:563 recvcmd.c:814
 #, c-format
 msgid "Can't create %s."
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ê¤¤¡£"
 
-#: recvcmd.c:681
+#: recvcmd.c:682
 msgid "Can't find any tagged messages."
 msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬°ì¤Ä¤â¸«¤Ä¤«¤é¤Ê¤¤¡£"
 
-#: recvcmd.c:710 send.c:765
+#: recvcmd.c:711 send.c:771
 msgid "No mailing lists found!"
 msgstr "¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿!"
 
-#: recvcmd.c:791
+#: recvcmd.c:792
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr "¥¿¥°ÉÕ¤­ÅºÉÕ¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤ÎÉü¹æ²½¤Ï¼ºÇÔ¡£À®¸ùʬ¤À¤± MIME ¥«¥×¥»¥ë²½?"
 
-#: remailer.c:455
+#: remailer.c:460
 msgid "Append"
 msgstr "ÄɲÃ"
 
-#: remailer.c:456
+#: remailer.c:461
 msgid "Insert"
 msgstr "ÁÞÆþ"
 
-#: remailer.c:457
+#: remailer.c:462
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: remailer.c:459
+#: remailer.c:464
 msgid "OK"
 msgstr "¾µÇ§(OK)"
 
-#: remailer.c:486
+#: remailer.c:491
 msgid "Can't get mixmaster's type2.list!"
 msgstr "mixmaster ¤Î type2.list ¼èÆÀ¤Ç¤­¤º!"
 
-#: remailer.c:512
+#: remailer.c:517
 msgid "Select a remailer chain."
 msgstr "remailer ¥Á¥§¡¼¥ó¤òÁªÂò¡£"
 
-#: remailer.c:568
+#: remailer.c:573
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr "¥¨¥é¡¼: %s ¤ÏºÇ¸å¤Î remailer ¥Á¥§¡¼¥ó¤Ë¤Ï»È¤¨¤Ê¤¤¡£"
 
-#: remailer.c:596
+#: remailer.c:601
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr "Mixmaster ¥Á¥§¡¼¥ó¤Ï %d ¥¨¥ì¥á¥ó¥È¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤ë¡£"
 
-#: remailer.c:617
+#: remailer.c:622
 msgid "The remailer chain is already empty."
 msgstr "remailer ¥Á¥§¡¼¥ó¤Ï¤¹¤Ç¤Ë¶õ¡£"
 
-#: remailer.c:627
+#: remailer.c:632
 msgid "You already have the first chain element selected."
 msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò¤·¤Æ¤¤¤ë¡£"
 
-#: remailer.c:637
+#: remailer.c:642
 msgid "You already have the last chain element selected."
 msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò¤·¤Æ¤¤¤ë¡£"
 
-#: remailer.c:673
+#: remailer.c:678
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr "Mixmaster ¤Ï Cc ¤Þ¤¿¤Ï Bcc ¥Ø¥Ã¥À¤ò¼õ¤±¤Ä¤±¤Ê¤¤¡£"
 
-#: remailer.c:696
+#: remailer.c:701
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr "mixmaster ¤ò»È¤¦»þ¤Ë¤Ï¡¢hostname ÊÑ¿ô¤ËŬÀÚ¤ÊÃͤòÀßÄꤻ¤è¡£"
 
-#: remailer.c:728
+#: remailer.c:733
 #, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡¢»Ò¥×¥í¥»¥¹¤¬ %d ¤Ç½ªÎ»¡£\n"
 
-#: remailer.c:731
+#: remailer.c:736
 msgid "Error sending message."
 msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡£"
 
-#: rfc1524.c:150
+#: rfc1524.c:151
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "%s ·Á¼°¤ËÉÔŬÀڤʥ¨¥ó¥È¥ê¤¬ \"%s\" ¤Î %d ¹ÔÌܤˤ¢¤ë"
 
-#: rfc1524.c:360
+#: rfc1524.c:361
 msgid "No mailcap path specified"
 msgstr "mailcap ¥Ñ¥¹¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤"
 
-#: rfc1524.c:387
+#: rfc1524.c:388
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "%s ·Á¼°ÍѤΠmailcap ¥¨¥ó¥È¥ê¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿"
@@ -4966,161 +4953,161 @@ msgstr "score: 
 msgid "score: too many arguments"
 msgstr "score: °ú¿ô¤¬Â¿¤¹¤®¤ë"
 
-#: send.c:282
+#: send.c:284
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: send.c:291
+#: send.c:293
 msgid "No subject, abort?"
 msgstr "Âê̾¤¬¤Ê¤¤¡£Ãæ»ß?"
 
-#: send.c:293
+#: send.c:295
 msgid "No subject, aborting."
 msgstr "̵Âê¤ÇÃæ»ß¤¹¤ë¡£"
 
-#: send.c:493
-msgid "Message came from a mailing list. Reply to author only?"
+#: send.c:494
+msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 # ¤³¤³¤Ç no ¤À¤È from ¤ËÊÖ¿®¤¹¤ë¡£
-#. There are quite a few mailing lists which set the Reply-To:
-#. * header field to the list address, which makes it quite impossible
-#. * to send a message to only the sender of the message.  This
-#. * provides a way to do that.
-#.
-#: send.c:532
+#: send.c:533
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "%s%s ¤Ø¤ÎÊÖ¿®?"
 
-#: send.c:563
+#: send.c:564
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "%s%s ¤Ø¤Î¥Õ¥©¥í¡¼¥¢¥Ã¥×?"
 
-#. This could happen if the user tagged some messages and then did
-#. * a limit such that none of the tagged message are visible.
-#.
-#: send.c:734
+#: send.c:740
 msgid "No tagged messages are visible!"
 msgstr "²Ä»ë¤Ê¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤!"
 
-#: send.c:792
+#: send.c:798
 msgid "Include message in reply?"
 msgstr "ÊÖ¿®¤Ë¥á¥Ã¥»¡¼¥¸¤ò´Þ¤á¤ë¤«?"
 
-#: send.c:796
+#: send.c:802
 msgid "Including quoted message..."
 msgstr "°úÍÑ¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê¹þ¤ßÃæ..."
 
-#: send.c:803
+#: send.c:809
 msgid "Could not include all requested messages!"
 msgstr "¤¹¤Ù¤Æ¤ÎÍ׵ᤵ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê¹þ¤á¤Ê¤«¤Ã¤¿!"
 
-#: send.c:819
+#: send.c:825
 msgid "Forward as attachment?"
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤È¤·¤ÆžÁ÷?"
 
-#: send.c:822
+#: send.c:828
 msgid "Preparing forwarded message..."
 msgstr "žÁ÷¥á¥Ã¥»¡¼¥¸¤ò½àÈ÷Ãæ..."
 
-#: send.c:1114
+#: send.c:1133
 msgid "Recall postponed message?"
 msgstr "½ñ¤­¤«¤±¤Î¥á¥Ã¥»¡¼¥¸¤ò¸Æ¤Ó½Ð¤¹?"
 
-#: send.c:1421
+#: send.c:1447
 msgid "Edit forwarded message?"
 msgstr "žÁ÷¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸?"
 
-#: send.c:1444
+#: send.c:1481
 msgid "Abort unmodified message?"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï̤Êѹ¹¡£Ãæ»ß?"
 
-#: send.c:1445
+#: send.c:1482
 msgid "Aborted unmodified message."
 msgstr "̤Êѹ¹¤Î¥á¥Ã¥»¡¼¥¸¤òÃæ»ß¤·¤¿¡£"
 
-#: send.c:1486
+#: send.c:1523
 #, fuzzy
 msgid "Article not posted."
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¡£"
 
-#: send.c:1520
+#: send.c:1557
 msgid "Message postponed."
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï½ñ¤­¤«¤±¤ÇÊÝᤵ¤ì¤¿¡£"
 
-#: send.c:1531
+#: send.c:1568
 msgid "No recipients are specified!"
 msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤!"
 
-#: send.c:1536
+#: send.c:1573
 msgid "No recipients were specified."
 msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¡£"
 
-#: send.c:1554
+#: send.c:1591
 msgid "No subject, abort sending?"
 msgstr "Âê̾¤¬¤Ê¤¤¡£Á÷¿®¤òÃæ»ß?"
 
-#: send.c:1557 send.c:1563
+#: send.c:1594 send.c:1600
 msgid "No subject specified."
 msgstr "Âê̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: send.c:1569
+#: send.c:1606
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Âê̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
-#: send.c:1630
+#: send.c:1618
+msgid "No attachments made but indicator found in text. Cancel sending?"
+msgstr ""
+
+#: send.c:1621
+msgid "No attachments made but indicator found in text. Abort sending."
+msgstr ""
+
+#: send.c:1681
 msgid "Sending message..."
 msgstr "Á÷¿®Ãæ..."
 
-#: send.c:1754
+#: send.c:1805
 msgid "Could not send the message."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
 
-#: send.c:1760
+#: send.c:1811
 msgid "Sending in background."
 msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÇÁ÷¿®¡£"
 
-#: send.c:1762
+#: send.c:1813
 msgid "Article posted."
 msgstr ""
 
-#: send.c:1763 send.c:1765
+#: send.c:1814 send.c:1816
 msgid "Mail sent."
 msgstr "¥á¡¼¥ë¤òÁ÷¿®¤·¤¿¡£"
 
-#: sendlib.c:393
+#: sendlib.c:394
 msgid "No boundary parameter found! [report this error]"
 msgstr "boundary ¥Ñ¥é¥á¡¼¥¿¤¬¤ß¤Ä¤«¤é¤Ê¤¤! [¤³¤Î¥¨¥é¡¼¤òÊó¹ð¤»¤è]"
 
-#: sendlib.c:421
+#: sendlib.c:422
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ¤Ï¤â¤Ï¤ä¸ºß¤·¤Ê¤¤!"
 
 # regular file ¤Ã¤Æ¡ÖÄ̾ï¥Õ¥¡¥¤¥ë¡×¤Ç¤¹¤«¡©
-#: sendlib.c:825
+#: sendlib.c:826
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ¤Ïɸ½à¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¡£"
 
-#: sendlib.c:989
+#: sendlib.c:993
 #, c-format
 msgid "Could not open %s"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿"
 
-#: sendlib.c:2047
+#: sendlib.c:2063
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡£»Ò¥×¥í¥»¥¹¤¬ %d (%s) ¤Ç½ªÎ»¤·¤¿¡£"
 
-#: sendlib.c:2053
+#: sendlib.c:2069
 msgid "Output of the delivery process"
 msgstr "ÇÛ¿®¥×¥í¥»¥¹¤Î½ÐÎÏ"
 
-#: sendlib.c:2274
+#: sendlib.c:2293
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "ÉÔÀµ¤Ê IDN %s ¤ò resent-from ¤Î½àÈ÷Ãæ¤Ëȯ¸«¡£"
@@ -5140,74 +5127,75 @@ msgstr "%s 
 msgid "Caught signal %d...  Exiting.\n"
 msgstr "¥·¥°¥Ê¥ë %d ¤ò¼õ¤±¼è¤Ã¤¿¡£½ªÎ»¡£\n"
 
-#: smime.c:109
-msgid "Enter SMIME passphrase:"
+#: smime.c:110
+#, fuzzy
+msgid "Enter S/MIME passphrase:"
 msgstr "S/MIME ¥Ñ¥¹¥Õ¥ì¡¼¥ºÆþÎÏ:"
 
-#: smime.c:310
+#: smime.c:311
 msgid "Trusted   "
 msgstr "¿®ÍÑºÑ¤ß  "
 
-#: smime.c:313
+#: smime.c:314
 msgid "Verified  "
 msgstr "¸¡¾ÚºÑ¤ß  "
 
-#: smime.c:316
+#: smime.c:317
 msgid "Unverified"
 msgstr "̤¸¡¾Ú    "
 
-#: smime.c:319
+#: smime.c:320
 msgid "Expired   "
 msgstr "´ü¸ÂÀÚ¤ì  "
 
-#: smime.c:322
+#: smime.c:323
 msgid "Revoked   "
 msgstr "ÇÑ´þºÑ¤ß  "
 
 # ÉÔÀµ¤è¤êÉÔ¿®¤«¡©
-#: smime.c:325
+#: smime.c:326
 msgid "Invalid   "
 msgstr "ÉÔÀµ      "
 
-#: smime.c:328
+#: smime.c:329
 msgid "Unknown   "
 msgstr "ÉÔÌÀ      "
 
-#: smime.c:360
+#: smime.c:361
 msgid "Enter keyID: "
 msgstr "¸°IDÆþÎÏ: "
 
-#: smime.c:382
+#: smime.c:383
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME ¾ÚÌÀ½ñ¤Ï \"%s\" ¤Ë°ìÃס£"
 
-#: smime.c:532 smime.c:593 smime.c:608
+#: smime.c:533 smime.c:594 smime.c:609
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr "ID %s ¤Ï̤¸¡¾Ú¡£%s ¤Ë»ÈÍÑ?"
 
-#: smime.c:536 smime.c:597
+#: smime.c:537 smime.c:598
 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "(̤¿®ÍѤÊ!) ID %s ¤ò %s ¤Ë»ÈÍÑ?"
 
-#: smime.c:539 smime.c:599
+#: smime.c:540 smime.c:600
 #, c-format
 msgid "Use ID %s for %s ?"
 msgstr "ID %s ¤ò %s ¤Ë»ÈÍÑ?"
 
-#: smime.c:616
+#: smime.c:617
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr "·Ù¹ð: ¤Þ¤À ID %s ¤ò¿®ÍѤ¹¤ë¤«·èÄꤷ¤Æ¤¤¤Ê¤¤¡£(²¿¤«¥­¡¼¤ò²¡¤»¤Ð³¤¯)"
 
-#: smime.c:768
+#: smime.c:769
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr "%s ¤Î (Àµ¤·¤¤) ¾ÚÌÀ½ñ¤¬¸«¤Ä¤«¤é¤Ê¤¤¡£"
 
-#: smime.c:820 smime.c:847 smime.c:910 smime.c:952 smime.c:1014 smime.c:1084
+#: smime.c:821 smime.c:848 smime.c:910 smime.c:952 smime.c:1014 smime.c:1084
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "¥¨¥é¡¼: OpenSSL »Ò¥×¥í¥»¥¹ºîÀ®ÉÔǽ!"
 
@@ -5281,45 +5269,67 @@ msgstr ""
 msgid "eswabfc"
 msgstr "eswabfc"
 
-#: smime.c:1887
-msgid ""
-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
-msgstr "1:DES, 2:Triple-DES, 3:RC2-40, 4:RC2-64, 5:RC2-128, f:Êѹ¹¤Ê¤· "
+#: smime.c:1892
+msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
+msgstr ""
+
+#: smime.c:1894
+msgid "drac"
+msgstr ""
 
-#: smime.c:1889
-msgid "12345f"
-msgstr "12345f"
+#: smime.c:1896
+msgid "1: DES, 2: Triple-DES "
+msgstr ""
+
+#: smime.c:1897
+msgid "dt"
+msgstr ""
 
-#: smime.c:1913
+#: smime.c:1908
+msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
+msgstr ""
+
+#: smime.c:1909
+msgid "468"
+msgstr ""
+
+#: smime.c:1923
+msgid "1: AES128, 2: AES192, 3: AES256 "
+msgstr ""
+
+#: smime.c:1924
+msgid "895"
+msgstr ""
+
+#: smime.c:1951
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "¸°¤¬Ì¤»ØÄê¤Î¤¿¤á½ð̾ÉÔǽ: ¡Ö½ð̾¸°ÁªÂò¡×¤ò¤»¤è¡£"
 
-#: sort.c:281
+#: sort.c:282
 msgid "Sorting mailbox..."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹À°ÎóÃæ..."
 
-#: sort.c:313
+#: sort.c:314
 msgid "Could not find sorting function! [report this bug]"
 msgstr "À°Îóµ¡Ç½¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿! [¤³¤Î¥Ð¥°¤òÊó¹ð¤»¤è]"
 
-#: status.c:96
+#: status.c:100
 #, fuzzy
 msgid "no mailbox"
 msgstr "(¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤Ê¤¤)"
 
-#: status.c:128
+#: status.c:132
 msgid "(no mailbox)"
 msgstr "(¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤Ê¤¤)"
 
-#: thread.c:988
+#: thread.c:989
 msgid "Parent message is not visible in this limited view."
 msgstr "¿Æ¥á¥Ã¥»¡¼¥¸¤Ï¤³¤ÎÀ©¸Â¤µ¤ì¤¿É½¼¨ÈϰϤǤÏÉԲĻ롣"
 
-#: thread.c:995
+#: thread.c:996
 msgid "Parent message is not available."
 msgstr "¿Æ¥á¥Ã¥»¡¼¥¸¤¬ÍøÍѤǤ­¤Ê¤¤¡£"
 
-#. mutt_endwin (NULL);
 #: lib/exit.c:15
 #, c-format
 msgid ""
@@ -5327,14 +5337,99 @@ msgid ""
 "(please report this error to <mutt-ng-devel@lists.berlios.de>\n"
 msgstr ""
 
-#: lib/mem.c:20
-msgid "Integer overflow -- can't allocate memory!"
-msgstr "·å¤¢¤Õ¤ì -- ¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Ê¤¤!"
+#, fuzzy
+#~ msgid ""
+#~ "  -e <command>\tspecify a command to be executed after initialization\n"
+#~ "  -f <file>\tspecify which mailbox to read\n"
+#~ "  -F <file>\tspecify an alternate muttrngc file\n"
+#~ "  -g <server>\tspecify a newsserver (if compiled with NNTP)\n"
+#~ "  -G\t\tselect a newsgroup (if compiled with NNTP)\n"
+#~ "  -H <file>\tspecify a draft file to read header and body from\n"
+#~ "  -i <file>\tspecify a file which Mutt-ng should include in the body\n"
+#~ "  -d <level>\t specify debugging level of Mutt-ng\n"
+#~ "  -m <type>\tspecify a default mailbox type\n"
+#~ "  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n"
+#~ "  -p\t\trecall a postponed message\n"
+#~ "  -Q <variable>\tquery a configuration variable\n"
+#~ "  -R\t\topen mailbox in read-only mode\n"
+#~ "  -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n"
+#~ "  -t\t\tprint the value of all variables to stdout\n"
+#~ "  -T\t\tprint the value of all changed variables to stdout\n"
+#~ "  -v\t\tshow version and compile-time definitions\n"
+#~ "  -x\t\tsimulate the mailx send mode\n"
+#~ "  -y\t\tselect a mailbox specified in your `mailboxes' list\n"
+#~ "  -z\t\texit immediately if there are no messages in the mailbox\n"
+#~ "  -Z\t\topen the first folder with new message, exit immediately if none\n"
+#~ "  -h\t\tthis help message"
+#~ msgstr ""
+#~ "  -e <¥³¥Þ¥ó¥É>\t½é´ü²½¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Î»ØÄê\n"
+#~ "  -f <¥Õ¥¡¥¤¥ë>\tÆɤ߽Ф·¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î»ØÄê\n"
+#~ "  -F <¥Õ¥¡¥¤¥ë>\tÂåÂØ muttrc ¥Õ¥¡¥¤¥ë¤Î»ØÄê\n"
+#~ "  -H <¥Õ¥¡¥¤¥ë>\t¤Ø¥Ã¥À¤òÆɤि¤á¤Ë²¼½ñ¥Õ¥¡¥¤¥ë¤ò»ØÄê\n"
+#~ "  -i <¥Õ¥¡¥¤¥ë>\tÊÖ¿®»þ¤Ë Mutt ¤¬ÁÞÆþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î»ØÄê\n"
+#~ "  -m <¥¿¥¤¥×>\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°¤Î»ØÄê\n"
+#~ "  -n\t\t¥·¥¹¥Æ¥à´ûÄê¤Î Muttrc ¤òÆɤޤʤ¤¤³¤È¤Î»ØÄê\n"
+#~ "  -p\t\tÊݸ¤µ¤ì¤Æ¤¤¤ë (½ñ¤­¤«¤±) ¥á¥Ã¥»¡¼¥¸¤ÎºÆÆɤ߽Ф·¤Î»ØÄê\n"
+#~ "  -Q <variable>\tÀßÄêÊÑ¿ô¤ÎÌ䤤¹ç¤ï¤»\n"
+#~ "  -R\t\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òÆɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤Î»ØÄê\n"
+#~ "  -s <Âê̾>\tÂê̾¤Î»ØÄê (¶õÇò¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï°úÍÑÉä¤Ç¤¯¤¯¤ë¤³¤È)\n"
+#~ "  -v\t\t¥Ð¡¼¥¸¥ç¥ó¤È¥³¥ó¥Ñ¥¤¥ë»þ»ØÄê¤Îɽ¼¨\n"
+#~ "  -x\t\tmailx Á÷¿®¥â¡¼¥É¤Î¥·¥ß¥å¥ì¡¼¥È\n"
+#~ "  -y\t\t»ØÄꤵ¤ì¤¿ `mailboxes' ¥ê¥¹¥È¤ÎÃ椫¤é¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÁªÂò\n"
+#~ "  -z\t\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ãæ¤Ë¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n"
+#~ "  -Z\t\t¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n"
+#~ "  -h\t\t¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸"
+
+#~ msgid "DEBUG was not defined during compilation.  Ignored.\n"
+#~ msgstr "DEBUG ¤¬¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¡£Ìµ»ë¤¹¤ë¡£\n"
+
+#~ msgid ""
+#~ "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
+#~ msgstr "1:DES, 2:Triple-DES, 3:RC2-40, 4:RC2-64, 5:RC2-128, f:Êѹ¹¤Ê¤· "
+
+#~ msgid "12345f"
+#~ msgstr "12345f"
 
-#. __MEM_CHECKED__
-#: lib/mem.c:26 lib/mem.c:38 lib/mem.c:64
-msgid "Out of memory!"
-msgstr "¥á¥â¥êÉÔ­!"
+#~ msgid "Integer overflow -- can't allocate memory!"
+#~ msgstr "·å¤¢¤Õ¤ì -- ¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Ê¤¤!"
+
+#~ msgid "Out of memory!"
+#~ msgstr "¥á¥â¥êÉÔ­!"
+
+#, fuzzy
+#~ msgid "Unable to create backup file"
+#~ msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤"
+
+#~ msgid "%s: unknown sorting method"
+#~ msgstr "%s ¤ÏÉÔÌÀ¤ÊÀ°ÎóÊýË¡"
+
+#~ msgid "mutt_restore_default(%s): error in regexp: %s\n"
+#~ msgstr "mutt_restore_default(%s): Àµµ¬É½¸½¤Ç¥¨¥é¡¼: %s\n"
+
+#~ msgid "%s is set"
+#~ msgstr "%s ¤ÏÀßÄꤵ¤ì¤Æ¤¤¤ë"
+
+#~ msgid "%s is unset"
+#~ msgstr "%s ¤Ï²ò½ü¤µ¤ì¤Æ¤¤¤ë"
+
+#~ msgid "%s: invalid mailbox type"
+#~ msgstr "%s ¤ÏÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°"
+
+#~ msgid "%s: invalid value"
+#~ msgstr "%s ¤ÏÉÔÀµ¤ÊÃÍ"
+
+#~ msgid "Debugging at level %d.\n"
+#~ msgstr "¥ì¥Ù¥ë %d ¤Ç¥Ç¥Ð¥Ã¥°Ãæ¡£\n"
+
+#~ msgid "First entry is shown."
+#~ msgstr "ºÇ½é¤Î¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¡£"
+
+#~ msgid "Last entry is shown."
+#~ msgstr "ºÇ¸å¤Î¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¡£"
+
+#, fuzzy
+#~ msgid "GROUP command failed: %s"
+#~ msgstr "»öÁ°Àܳ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¡£"
 
 #~ msgid "*** Begin Notation (signature by: %s) ***\n"
 #~ msgstr "*** Ãð¼á³«»Ï (%s ¤Î½ð̾¤Ë´Ø¤·¤Æ) ***\n"