update

diff --git a/po/ja.po b/po/ja.po
index 90b54b7674254e6c7213cff3e7bf8fd706e71ddd..290a30b6724bc5ce577726eff582dab595a8bbec 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,17 +1,17 @@
 # Japanese messages for Mutt.
-# Copyright (C) 2002-2004 mutt-j ML members.
+# Copyright (C) 2002, 2003, 2004, 2005 mutt-j ML members.
 # FIRST AUTHOR Kikutani Makoto <kikutani@Galaxy.net>, 1999.
 # 2nd AUTHOR OOTA,Toshiya <oota@mspd.mt.nec.co.jp>, 2002.
-#  (with TAKAHASHI Tamotsu <tamo@momonga-linux.org>, 2003, 2004)
+#  (with TAKAHASHI Tamotsu <tamo@momonga-linux.org>, 2003, 2004, 2005)
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.5.6\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: 1.5.9\n"
+"Report-Msgid-Bugs-To: mutt-po, mutt-dev, mutt-j-users, or tamo\n"
 "POT-Creation-Date: 2005-08-11 23:50+0200\n"
-"PO-Revision-Date: 2004-08-30 14:00+0900\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@ribbon.or.jp>\n"
+"Language-Team: mutt-j <mutt-j-users@lists.sourceforge.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -208,9 +208,8 @@ msgid "Create is only supported for IMAP mailboxes"
 msgstr "ºîÀ®µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
 #: browser.c:881
-#, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "ºîÀ®µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
+msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
 
 #: browser.c:902
 msgid "Delete is only supported for IMAP mailboxes"
@@ -719,128 +718,124 @@ msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
 
 #: crypt-gpgme.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "gpgme ¥³¥ó¥Æ¥¯¥¹¥ÈºîÀ®¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:345
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
-msgstr ""
+msgstr "CMS ¥×¥í¥È¥³¥ëµ¯Æ°¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "error creating gpgme data object: %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "gpgme ¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥ÈºîÀ®¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
-#, fuzzy, c-format
+#, c-format
 msgid "error allocating data object: %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥È³ä¤êÅö¤Æ¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:467
-#, fuzzy, c-format
+#, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥È´¬¤­Ìᤷ¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:489 crypt-gpgme.c:536
-#, fuzzy, c-format
+#, c-format
 msgid "error reading data object: %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥ÈÆɤ߽Ф·¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:597
-#, fuzzy, c-format
+#, c-format
 msgid "error adding recipient `%s': %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "¼õ¿®¼Ô %s ¤ÎÄɲäǥ¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:635
 #, c-format
 msgid "secret key `%s' not found: %s\n"
-msgstr ""
+msgstr "ÈëÌ©¸° %s ¤¬¸«ÉÕ¤«¤é¤Ê¤¤: %s\n"
 
 #: crypt-gpgme.c:645
 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
-msgstr ""
+msgstr "ÈëÌ©¸°¤Î»ØÄ꤬¤¢¤¤¤Þ¤¤: %s\n"
 
 #: crypt-gpgme.c:657
 #, c-format
 msgid "error setting secret key `%s': %s\n"
-msgstr ""
+msgstr "ÈëÌ©¸° %s ÀßÄêÃæ¤Ë¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:701
-#, fuzzy, c-format
+#, c-format
 msgid "error encrypting data: %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "¥Ç¡¼¥¿°Å¹æ²½¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:798
-#, fuzzy, c-format
+#, c-format
 msgid "error signing data: %s\n"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "¥Ç¡¼¥¿½ð̾¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:993
-#, fuzzy
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤Î°ìÉô¤Ï½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "·Ù¹ð: ÇÑ´þºÑ¤ß¤Î¸°¤¬¤¢¤ë\n"
 
 #: crypt-gpgme.c:1002
 msgid "Warning: The key used to create the signature expired at: "
-msgstr ""
+msgstr "·Ù¹ð: ½ð̾¤òºîÀ®¤·¤¿¸°¤Ï´ü¸ÂÀÚ¤ì: ´ü¸Â¤Ï "
 
 #: crypt-gpgme.c:1008
-#, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
+msgstr "·Ù¹ð: ¾¯¤Ê¤¯¤È¤â°ì¤Ä¤Î¾ÚÌÀ½ñ¤Ç¸°¤¬´ü¸ÂÀÚ¤ì\n"
 
 #: crypt-gpgme.c:1024
 msgid "Warning: The signature expired at: "
-msgstr ""
+msgstr "·Ù¹ð: ½ð̾¤¬´ü¸ÂÀÚ¤ì: ´ü¸Â¤Ï "
 
 #: crypt-gpgme.c:1030
 msgid "Can't verify due to a missing key or certificate\n"
-msgstr ""
+msgstr "¸°¤ä¾ÚÌÀ½ñ¤ÎÉÔ­¤Ë¤è¤ê¡¢¸¡¾Ú¤Ç¤­¤Ê¤¤\n"
 
 #: crypt-gpgme.c:1035
-#, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL ¤¬ÍøÍѤǤ­¤Ê¤¤¡£"
+msgstr "CRL ¤¬ÍøÍѤǤ­¤Ê¤¤\n"
 
 #: crypt-gpgme.c:1041
 msgid "Available CRL is too old\n"
-msgstr ""
+msgstr "ÍøÍѤǤ­¤ë CRL ¤Ï¸Å¤¹¤®¤ë\n"
 
 #: crypt-gpgme.c:1046
 msgid "A policy requirement was not met\n"
-msgstr ""
+msgstr "¥Ý¥ê¥·¡¼¤Î¾ò·ï¤¬Ëþ¤¿¤µ¤ì¤Ê¤«¤Ã¤¿\n"
 
 #: crypt-gpgme.c:1055
 msgid "A system error occurred"
-msgstr ""
+msgstr "¥·¥¹¥Æ¥à¥¨¥é¡¼¤¬È¯À¸"
 
 #: crypt-gpgme.c:1092 crypt-gpgme.c:3036
-#, fuzzy
 msgid "Fingerprint: "
-msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: "
 
 #: crypt-gpgme.c:1152
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
-msgstr ""
+msgstr "·Ù¹ð: ¤³¤Î¸°¤¬¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤«¤É¤¦¤«¤ò¼¨¤¹¾Úµò¤Ï°ìÀڤʤ¤\n"
 
 #: crypt-gpgme.c:1159
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
-msgstr ""
+msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤Ç¤Ï¤Ê¤¤!\n"
 
 #: crypt-gpgme.c:1163
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
-msgstr ""
+msgstr "·Ù¹ð: ¤³¤Î¸°¤¬³Î¼Â¤Ë¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤À¤È¤Ï¸À¤¨¤Ê¤¤\n"
 
 #: crypt-gpgme.c:1238
 msgid "Error getting key information: "
-msgstr ""
+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,
@@ -848,70 +843,69 @@ msgstr ""
 #. ultimate).
 #: crypt-gpgme.c:1245 crypt-gpgme.c:1278
 msgid "Good signature from: "
-msgstr ""
+msgstr "Àµ¤·¤¤½ð̾: "
 
 #: crypt-gpgme.c:1255
 msgid "                aka: "
-msgstr ""
+msgstr "¡¡¡¡¡¡ÊÌ̾: "
 
 #: crypt-gpgme.c:1259 crypt-gpgme.c:1281
 msgid "            created: "
-msgstr ""
+msgstr "¡¡½ð̾ÆüÉÕ: "
 
 #: crypt-gpgme.c:1268
 msgid "*BAD* signature claimed to be from: "
-msgstr ""
+msgstr "**ÉÔÀµ¤Ê½ð̾**¡¡¼çÄ¥: "
 
 #: crypt-gpgme.c:1291
-#, fuzzy
 msgid "Error checking signature"
-msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡£"
+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:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
 msgid "[-- Begin signature information --]\n"
-msgstr ""
+msgstr "[-- ½ð̾¾ðÊó³«»Ï --]\n"
 
 #: crypt-gpgme.c:1344
-#, fuzzy, c-format
+#, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n"
+msgstr "¥¨¥é¡¼: ¸¡¾Ú¤Ë¼ºÇÔ¤·¤¿: %s\n"
 
 #: crypt-gpgme.c:1386
 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
-msgstr ""
+msgstr "*** Ãð¼á³«»Ï (%s ¤Î½ð̾¤Ë´Ø¤·¤Æ) ***\n"
 
 #: crypt-gpgme.c:1405
 msgid "*** End Notation ***\n"
-msgstr ""
+msgstr "*** Ãð¼á½ªÎ» ***\n"
 
 #: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
-#, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
+"[-- ½ð̾¾ðÊó½ªÎ» --]\n"
 "\n"
-"[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
 
 #: crypt-gpgme.c:1507
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
+msgstr "[-- ¥¨¥é¡¼: Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿: %s --]\n"
+"\n"
 
 #: crypt-gpgme.c:2006
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
-msgstr ""
+msgstr "¥¨¥é¡¼: Éü¹æ²½/¸¡¾Ú¤¬¼ºÇÔ¤·¤¿: %s\n"
 
 #: crypt-gpgme.c:2054
 msgid "Error: copy data failed\n"
-msgstr ""
+msgstr "¥¨¥é¡¼: ¥Ç¡¼¥¿¤Î¥³¥Ô¡¼¤Ë¼ºÇÔ¤·¤¿\n"
 
 #: crypt-gpgme.c:2074 pgp.c:405
 msgid ""
@@ -966,12 +960,11 @@ msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
 
 #: crypt-gpgme.c:2186
-#, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç½ð̾¤ª¤è¤Ó°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
 "\n"
 
 #: crypt-gpgme.c:2187 pgp.c:922
@@ -983,154 +976,142 @@ msgstr ""
 "\n"
 
 #: crypt-gpgme.c:2209
-#, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+msgstr "[-- PGP/MIME ½ð̾¤ª¤è¤Ó°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
 
 #: crypt-gpgme.c:2210 pgp.c:942
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
 
 #: crypt-gpgme.c:2252
-#, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç½ð̾¤µ¤ì¤Æ¤¤¤ë --]\n"
+"\n"
 
 #: crypt-gpgme.c:2253
-#, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+"\n"
 
 #: crypt-gpgme.c:2283
-#, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
-msgstr ""
-"\n"
-"[-- S/MIME ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
+msgstr "[-- S/MIME ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
 
 #: crypt-gpgme.c:2284
-#, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- S/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+msgstr "[-- S/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
 
 #: crypt-gpgme.c:2876
 msgid "[Can't display this user ID (unknown encoding)]"
-msgstr ""
+msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (ʸ»ú¥³¡¼¥É¤¬ÉÔÌÀ)]"
 
 #: crypt-gpgme.c:2878
 msgid "[Can't display this user ID (invalid encoding)]"
-msgstr ""
+msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (ʸ»ú¥³¡¼¥É¤¬ÉÔÀµ)]"
 
 #: crypt-gpgme.c:2883
 msgid "[Can't display this user ID (invalid DN)]"
-msgstr ""
+msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (DN ¤¬ÉÔÀµ)]"
 
+# "¥·¥ê¥¢¥ëÈÖ¹æ" == Á´³Ñ 6 ʸ»ú
+# "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È" == Á´³Ñ 9 ʸ»ú
 #: crypt-gpgme.c:2962
 msgid " aka ......: "
-msgstr ""
+msgstr " ÊÌ̾ ............: "
 
 #: crypt-gpgme.c:2962
 msgid "Name ......: "
-msgstr ""
+msgstr "̾Á° .............: "
 
-# ÉÔÀµ¤è¤êÉÔ¿®¤«¡©
 #: crypt-gpgme.c:2965 crypt-gpgme.c:3104
-#, fuzzy
 msgid "[Invalid]"
-msgstr "ÉÔÀµ      "
+msgstr "[ÉÔÀµ]"
 
 #: crypt-gpgme.c:2985 crypt-gpgme.c:3128
-#, fuzzy, c-format
+#, c-format
 msgid "Valid From : %s\n"
-msgstr "%s ¤ÏÉÔÀµ¤Ê·î"
+msgstr "ȯ¸ú´üÆü .........: %s\n"
 
 #: crypt-gpgme.c:2998 crypt-gpgme.c:3141
-#, fuzzy, c-format
+#, c-format
 msgid "Valid To ..: %s\n"
-msgstr "%s ¤ÏÉÔÀµ¤Ê·î"
+msgstr "Í­¸ú´ü¸Â .........: %s\n"
 
 #: crypt-gpgme.c:3011 crypt-gpgme.c:3154
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
-msgstr ""
+msgstr "¸°¼ïÊÌ ...........: %s, %lu ¥Ó¥Ã¥È %s\n"
 
 #: crypt-gpgme.c:3013 crypt-gpgme.c:3156
 #, c-format
 msgid "Key Usage .: "
-msgstr ""
+msgstr "¸°Ç½ÎÏ ...........: "
 
 #: crypt-gpgme.c:3018 crypt-gpgme.c:3161
-#, fuzzy
 msgid "encryption"
 msgstr "°Å¹æ²½"
 
 #: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
 #: crypt-gpgme.c:3167 crypt-gpgme.c:3172
 msgid ", "
-msgstr ""
+msgstr "¡¢"
 
 #: crypt-gpgme.c:3023 crypt-gpgme.c:3166
 msgid "signing"
-msgstr ""
+msgstr "½ð̾"
 
 #: crypt-gpgme.c:3028 crypt-gpgme.c:3171
-#, fuzzy
 msgid "certification"
-msgstr "¾ÚÌÀ½ñ¤òÊݸ¤·¤¿"
+msgstr "¾ÚÌÀ"
 
 #: crypt-gpgme.c:3068
 #, c-format
 msgid "Serial-No .: 0x%s\n"
-msgstr ""
+msgstr "¥·¥ê¥¢¥ëÈÖ¹æ .....: 0x%s\n"
 
 #: crypt-gpgme.c:3076
 #, c-format
 msgid "Issued By .: "
-msgstr ""
+msgstr "ȯ¹Ô¼Ô ...........: "
 
 #. display only the short keyID
 #: crypt-gpgme.c:3095
-#, fuzzy, c-format
+#, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "¸° ID: 0x%s"
+msgstr "Éû¸° .............: 0x%s"
 
 #: crypt-gpgme.c:3099
-#, fuzzy
 msgid "[Revoked]"
-msgstr "ÇÑ´þºÑ¤ß  "
+msgstr "[ÇÑ´þºÑ¤ß]"
 
 #: crypt-gpgme.c:3109
-#, fuzzy
 msgid "[Expired]"
-msgstr "´ü¸ÂÀÚ¤ì  "
+msgstr "[´ü¸ÂÀÚ¤ì]"
 
 #: crypt-gpgme.c:3114
 msgid "[Disabled]"
-msgstr ""
+msgstr "[»ÈÍÑÉÔ²Ä]"
 
 #: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
 msgid "Can't create temporary file"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤¤"
 
 #: crypt-gpgme.c:3201
-#, fuzzy
 msgid "Collecting data..."
-msgstr "%s ¤ËÀܳÃæ..."
+msgstr "¥Ç¡¼¥¿¼ý½¸Ãæ..."
 
 #: crypt-gpgme.c:3227
-#, fuzzy, c-format
+#, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "¥µ¡¼¥Ð %s ¤Ø¤ÎÀܳ¥¨¥é¡¼¡£"
+msgstr "ȯ¹Ô¼Ô¸°¤Î¼èÆÀ¥¨¥é¡¼: %s\n"
 
 #: crypt-gpgme.c:3237
 msgid "Error: certification chain to long - stopping here\n"
-msgstr ""
+msgstr "¥¨¥é¡¼: ¾ÚÌÀ½ñ¤ÎÏ¢º¿¤¬Ä¹¤¹¤®¤ë - ¤³¤³¤Ç¤ä¤á¤Æ¤ª¤¯\n"
 
 #: crypt-gpgme.c:3248 pgpkey.c:580
 #, c-format
@@ -1138,24 +1119,23 @@ msgid "Key ID: 0x%s"
 msgstr "¸° ID: 0x%s"
 
 #: crypt-gpgme.c:3331
-#, fuzzy, c-format
+#, c-format
 msgid "gpgme_new failed: %s"
-msgstr "SSL ¤Ï %s ¤Ç¼ºÇÔ¡£"
+msgstr "gpgme_new ¼ºÇÔ: %s"
 
 #: crypt-gpgme.c:3370 crypt-gpgme.c:3433
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
-msgstr ""
+msgstr "gpgme_op_keylist_start ¼ºÇÔ: %s"
 
 #: crypt-gpgme.c:3420 crypt-gpgme.c:3461
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
-msgstr ""
+msgstr "gpgme_op_keylist_next ¼ºÇÔ: %s"
 
 #: crypt-gpgme.c:3532
-#, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "°ìÃפ·¤¿¸°¤Ï¤¹¤Ù¤Æ´ü¸ÂÀڤ줫ÇÑ´þºÑ¤ß¡¢¤Þ¤¿¤Ï»ÈÍѶػߡ£"
+msgstr "°ìÃפ·¤¿¸°¤Ï¤¹¤Ù¤Æ´ü¸ÂÀڤ줫ÇÑ´þºÑ¤ß¡£"
 
 #: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
 #: smime.c:431
@@ -1170,37 +1150,34 @@ msgstr "
 #. __STRCAT_CHECKED__
 #: crypt-gpgme.c:3566 pgpkey.c:519
 msgid "Check key  "
-msgstr "PGP ¸°¸¡ºº  "
+msgstr "¸°¸¡ºº  "
 
 #: crypt-gpgme.c:3583
-#, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP ¸°¤Ï \"%s\" ¤Ë°ìÃס£"
+msgstr "°ìÃפ¹¤ë PGP ¤ª¤è¤Ó S/MIME ¸°"
 
 #: crypt-gpgme.c:3585
-#, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP ¸°¤Ï \"%s\" ¤Ë°ìÃס£"
+msgstr "°ìÃפ¹¤ë PGP ¸°"
 
 #: crypt-gpgme.c:3587
-#, fuzzy
 msgid "S/MIME keys matching"
-msgstr "S/MIME ¾ÚÌÀ½ñ¤Ï \"%s\" ¤Ë°ìÃס£"
+msgstr "°ìÃפ¹¤ë S/MIME ¸°"
 
 #: crypt-gpgme.c:3589
-#, fuzzy
 msgid "keys matching"
-msgstr "PGP ¸°¤Ï \"%s\" ¤Ë°ìÃס£"
+msgstr "°ìÃפ¹¤ë¸°"
 
+# "<hoge@example.org> ¤Ë°ìÃפ¹¤ë S/MIME ¸°¡£"
 #: crypt-gpgme.c:3592
 #, c-format
 msgid "%s <%s>."
-msgstr ""
+msgstr "<%2$s> ¤Ë%1$s¡£"
 
 #: crypt-gpgme.c:3594
 #, c-format
 msgid "%s \"%s\"."
-msgstr ""
+msgstr "¡Ö%2$s¡×¤Ë%1$s¡£"
 
 #: crypt-gpgme.c:3621 pgpkey.c:600
 msgid "This key can't be used: expired/disabled/revoked."
@@ -1246,30 +1223,24 @@ msgstr "%s 
 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
-msgstr ""
+msgstr "\ngpg-agent ¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ë GPGME ¤ò»ÈÍѤ·¤Æ¤¤¤ë"
 
 #: crypt-gpgme.c:4131
-#, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, %s, c:¤Ê¤· "
+msgstr "S/MIME e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, p:PGP, c:¤Ê¤· "
 
 #: crypt-gpgme.c:4132
-#, fuzzy
 msgid "esabpfc"
-msgstr "eswabfc"
+msgstr "esabpfc"
 
 #: crypt-gpgme.c:4135
-#, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, %s, c:¤Ê¤· "
+msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, m:S/MIME, c:¤Ê¤· "
 
 #: crypt-gpgme.c:4136
-#, fuzzy
 msgid "esabmfc"
-msgstr "eswabfc"
+msgstr "esabmfc"
 
-#. sign (a)s
-#. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
 #: crypt-gpgme.c:4152 pgp.c:1558 smime.c:1990
 msgid "Sign as: "
@@ -1277,12 +1248,11 @@ msgstr "
 
 #: crypt-gpgme.c:4249
 msgid "Failed to verify sender"
-msgstr ""
+msgstr "Á÷¿®¼Ô¤Î¸¡¾Ú¤Ë¼ºÇÔ¤·¤¿"
 
 #: crypt-gpgme.c:4252
-#, fuzzy
 msgid "Failed to figure out sender"
-msgstr "¥Ø¥Ã¥À²òÀϤΤ¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
+msgstr "Á÷¿®¼Ô¤Î¼±Ê̤˼ºÇÔ¤·¤¿"
 
 #: crypt.c:69
 #, c-format
@@ -1378,12 +1348,11 @@ msgstr ""
 
 #: cryptglue.c:89
 msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
-msgstr ""
+msgstr "crypt_use_gpgme ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤¬ GPGME ¥µ¥Ý¡¼¥ÈÉÕ¤­¤Ç¥Ó¥ë¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
 
 #: cryptglue.c:112
-#, fuzzy
 msgid "Invoking SMIME..."
-msgstr "PGP µ¯Æ°Ãæ..."
+msgstr "S/MIME µ¯Æ°Ãæ..."
 
 #: curs_lib.c:188
 msgid "yes"
@@ -1557,24 +1526,23 @@ msgstr "
 
 #: curs_main.c:1206
 msgid "Thread broken"
-msgstr ""
+msgstr "¥¹¥ì¥Ã¥É¤¬³°¤µ¤ì¤¿"
 
 #: curs_main.c:1228
 msgid "No Message-ID: header available to link thread"
-msgstr ""
+msgstr "Message-ID ¥Ø¥Ã¥À¤¬ÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¥¹¥ì¥Ã¥É¤ò¤Ä¤Ê¤²¤é¤ì¤Ê¤¤"
 
 #: curs_main.c:1230
-#, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò¡Ö½ñ¤­¤«¤±¡×¤Ë¤¹¤ë"
+msgstr "¤½¤ÎÁ°¤Ë¡¢¤³¤³¤Ø¤Ä¤Ê¤²¤¿¤¤¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤Æ¤ª¤¯¤³¤È"
 
 #: curs_main.c:1242
 msgid "Threads linked"
-msgstr ""
+msgstr "¥¹¥ì¥Ã¥É¤¬¤Ä¤Ê¤¬¤Ã¤¿"
 
 #: curs_main.c:1245
 msgid "No thread linked"
-msgstr ""
+msgstr "¥¹¥ì¥Ã¥É¤Ï¤Ä¤Ê¤¬¤é¤Ê¤«¤Ã¤¿"
 
 #: curs_main.c:1281 curs_main.c:1306
 msgid "You are on the last message."
@@ -2003,20 +1971,20 @@ msgstr "
 msgid "Mailbox created."
 msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ºîÀ®¤µ¤ì¤¿¡£"
 
+# Ť¤¤«¤é¡Ö¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¡×¤òºï¤Ã¤Æ¤â¤¤¤¤¤«¤â
 #: imap/browse.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "Rename mailbox %s to: "
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºîÀ®: "
+msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ %s ¤Î¥ê¥Í¡¼¥à(°ÜÆ°)Àè: "
 
 #: imap/browse.c:345
-#, fuzzy, c-format
+#, c-format
 msgid "Rename failed: %s"
-msgstr "SSL ¤Ï %s ¤Ç¼ºÇÔ¡£"
+msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) ¼ºÇÔ: %s"
 
 #: imap/browse.c:350
-#, fuzzy
 msgid "Mailbox renamed."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ºîÀ®¤µ¤ì¤¿¡£"
+msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¥ê¥Í¡¼¥à (°ÜÆ°) ¤µ¤ì¤¿¡£"
 
 #: imap/command.c:294
 msgid "Mailbox closed"
@@ -2040,7 +2008,7 @@ msgstr "
 
 #: imap/imap.c:420
 msgid "Checking mailbox subscriptions"
-msgstr ""
+msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¹ØÆɾõ¶·¤ò³ÎǧÃæ"
 
 #: imap/imap.c:458 pop_lib.c:286
 msgid "Secure connection with TLS?"
@@ -2052,7 +2020,7 @@ msgstr "TLS 
 
 #: imap/imap.c:487 pop_lib.c:331
 msgid "Encrypted connection unavailable"
-msgstr ""
+msgstr "°Å¹æ²½¤µ¤ì¤¿Àܳ¤¬ÍøÍѤǤ­¤Ê¤¤"
 
 #: imap/imap.c:616
 #, c-format
@@ -2734,7 +2702,7 @@ msgstr "
 
 #: keymap_alldefs.h:103
 msgid "break the thread in two"
-msgstr ""
+msgstr "¥¹¥ì¥Ã¥É¤ò¤Ï¤º¤¹"
 
 #: keymap_alldefs.h:104
 msgid "open a different folder"
@@ -2773,9 +2741,8 @@ msgid "show only messages matching a pattern"
 msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ·¤¿¥á¥Ã¥»¡¼¥¸¤À¤±É½¼¨"
 
 #: keymap_alldefs.h:113
-#, fuzzy
 msgid "link tagged message to the current one"
-msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
+msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò¸½ºß°ÌÃ֤ˤĤʤ°"
 
 #: keymap_alldefs.h:114
 msgid "jump to the next new message"
@@ -2934,9 +2901,8 @@ msgid "{internal}"
 msgstr "{ÆâÉô}"
 
 #: keymap_alldefs.h:153
-#, fuzzy
 msgid "rename the current mailbox (IMAP only)"
-msgstr "¸½ºß¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºï½ü(IMAP¤Î¤ß)"
+msgstr "¸½ºß¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ê¥Í¡¼¥à(IMAP¤Î¤ß)"
 
 #: keymap_alldefs.h:154
 msgid "reply to a message"
@@ -3147,7 +3113,7 @@ msgid ""
 msgstr ""
 "³«È¯¼Ô(ËܲÈ)¤ËÏ¢Íí¤ò¤È¤ë¤Ë¤Ï <mutt-dev@mutt.org> ¤Ø¥á¡¼¥ë¤»¤è¡£\n"
 "¥Ð¥°¤ò¥ì¥Ý¡¼¥È¤¹¤ë¤Ë¤Ï flea (1) ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ»¤è¡£\n"
-"ÆüËܸìÈǤΥХ°¥ì¥Ý¡¼¥È¤ª¤è¤ÓÏ¢Íí¤Ï mutt-j ML ¤Ø¡£\n"
+"ÆüËܸìÈǤΥХ°¥ì¥Ý¡¼¥È¤ª¤è¤ÓÏ¢Íí¤Ï mutt-j-users ML ¤Ø¡£\n"
 
 #: main.c:55
 msgid ""
@@ -3186,7 +3152,6 @@ msgid ""
 msgstr ""
 
 #: main.c:99
-#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -3213,6 +3178,7 @@ msgstr ""
 "             [-Q <Ì䤤¹ç¤ï¤»> ]\n"
 "        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -A <ÊÌ̾> \n"
 "             [-A <ÊÌ̾> ]\n"
+"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -D\n"
 "        mutt [-nx] [-e <¥³¥Þ¥ó¥É>] [-a <¥Õ¥¡¥¤¥ë>] [-F <¥Õ¥¡¥¤¥ë>] \n"
 "             [-H <¥Õ¥¡¥¤¥ë>] [-i <¥Õ¥¡¥¤¥ë>] [-s <Âê̾>] [-b <¥¢¥É¥ì¥¹>] \n"
 "             [-c <¥¢¥É¥ì¥¹>] <¥¢¥É¥ì¥¹> [ ... ]\n"
@@ -3224,30 +3190,13 @@ msgstr ""
 "  -a <¥Õ¥¡¥¤¥ë>\t¥á¥Ã¥»¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤òźÉÕ\n"
 "  -b <¥¢¥É¥ì¥¹>\tblind carbon-copy (BCC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
 "  -c <¥¢¥É¥ì¥¹>\tcarbon-copy (CC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
-"  -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¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸"
+"  -D\t\tÊÑ¿ô¤ò¤¹¤Ù¤Æɸ½à¥¨¥é¡¼½ÐÎϤØɽ¼¨"
 
 #: main.c:114
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
-msgstr ""
+msgstr "  -d <¥ì¥Ù¥ë>\t¥Ç¥Ð¥°½ÐÎϤò ~/.muttdebug0 ¤Ëµ­Ï¿"
 
 #: main.c:117
-#, fuzzy
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
@@ -3267,23 +3216,6 @@ msgid ""
 "  -Z\t\topen the first folder with new message, exit immediately if none\n"
 "  -h\t\tthis help message"
 msgstr ""
-"»ÈÍÑË¡: mutt [-nRyzZ] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] [-m <¥¿¥¤¥×>] \n"
-"             [-f <¥Õ¥¡¥¤¥ë>]\n"
-"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -Q <Ì䤤¹ç¤ï¤»> \n"
-"             [-Q <Ì䤤¹ç¤ï¤»> ]\n"
-"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -A <ÊÌ̾> \n"
-"             [-A <ÊÌ̾> ]\n"
-"        mutt [-nx] [-e <¥³¥Þ¥ó¥É>] [-a <¥Õ¥¡¥¤¥ë>] [-F <¥Õ¥¡¥¤¥ë>] \n"
-"             [-H <¥Õ¥¡¥¤¥ë>] [-i <¥Õ¥¡¥¤¥ë>] [-s <Âê̾>] [-b <¥¢¥É¥ì¥¹>] \n"
-"             [-c <¥¢¥É¥ì¥¹>] <¥¢¥É¥ì¥¹> [ ... ]\n"
-"        mutt [-n] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -p\n"
-"        mutt -v[v]\n"
-"\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-"  -A <ÊÌ̾>\t»ØÄꤷ¤¿ÊÌ̾¤ÎŸ³«\n"
-"  -a <¥Õ¥¡¥¤¥ë>\t¥á¥Ã¥»¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤òźÉÕ\n"
-"  -b <¥¢¥É¥ì¥¹>\tblind carbon-copy (BCC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
-"  -c <¥¢¥É¥ì¥¹>\tcarbon-copy (CC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
 "  -e <¥³¥Þ¥ó¥É>\t½é´ü²½¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Î»ØÄê\n"
 "  -f <¥Õ¥¡¥¤¥ë>\tÆɤ߽Ф·¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î»ØÄê\n"
 "  -F <¥Õ¥¡¥¤¥ë>\tÂåÂØ muttrc ¥Õ¥¡¥¤¥ë¤Î»ØÄê\n"
@@ -3335,7 +3267,7 @@ msgstr "%s 
 
 #: main.c:795
 msgid "No recipients specified.\n"
-msgstr "¼õ¼è¿Í¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£\n"
+msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£\n"
 
 #: main.c:881
 #, c-format
@@ -3654,89 +3586,82 @@ msgstr "
 
 #: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
 msgid "Error: no TLS socket open"
-msgstr ""
+msgstr "¥¨¥é¡¼: TLS ¥½¥±¥Ã¥È¤¬³«¤¤¤Æ¤¤¤Ê¤¤"
 
 #: mutt_ssl_gnutls.c:204
 msgid "All available protocols for TLS/SSL connection disabled"
-msgstr ""
+msgstr "TLS/SSL Àܳ¤ËÍøÍѲÄǽ¤Ê¥×¥í¥È¥³¥ë¤¬¤¹¤Ù¤Æ̵¸ú"
 
 #: mutt_ssl_gnutls.c:265
-#, fuzzy, c-format
+#, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "%s ¤ò»È¤Ã¤¿ SSL Àܳ (%s)"
+msgstr "%s ¤ò»È¤Ã¤¿ SSL/TLS Àܳ (%s/%s/%s)"
 
 #: mutt_ssl_gnutls.c:508
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate verification error (%s)"
-msgstr "¾ÚÌÀ½ñ \"%s\" ¤¬ \"%s\" ¤ËÂФ·¤Æ¸ºß¤¹¤ë¡£"
+msgstr "¾ÚÌÀ½ñ¤Î¸¡¾Ú¥¨¥é¡¼ (%s)"
 
 #: mutt_ssl_gnutls.c:516
-#, fuzzy
 msgid "Certificate is not X.509"
-msgstr "¾ÚÌÀ½ñ¤òÊݸ¤·¤¿"
+msgstr "¾ÚÌÀ½ñ¤¬ X.509 ¤Ç¤Ê¤¤"
 
 #: mutt_ssl_gnutls.c:523
-#, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "üËö½é´ü²½¥¨¥é¡¼"
+msgstr "gnutls ¾ÚÌÀ½ñ¥Ç¡¼¥¿½é´ü²½¥¨¥é¡¼"
 
 #: mutt_ssl_gnutls.c:539
 msgid "Error processing certificate data"
-msgstr ""
+msgstr "¾ÚÌÀ½ñ¥Ç¡¼¥¿½èÍý¥¨¥é¡¼"
 
 #: mutt_ssl_gnutls.c:724
-#, fuzzy, c-format
+#, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+msgstr "SHA1 ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
 
 #: mutt_ssl_gnutls.c:727
-#, fuzzy, c-format
+#, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+msgstr "MD5 ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
 
 #: mutt_ssl_gnutls.c:732
-#, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
+msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
 
 #: mutt_ssl_gnutls.c:737
-#, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
+msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
 
 #: mutt_ssl_gnutls.c:742
-#, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
+msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬ÇÑ´þºÑ¤ß"
 
 #: mutt_ssl_gnutls.c:747
 msgid "WARNING: Server hostname does not match certificate"
-msgstr ""
+msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤¬¾ÚÌÀ½ñ¤È°ìÃפ·¤Ê¤¤"
 
 #: mutt_ssl_gnutls.c:752
-#, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
+msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï½ð̾¼Ô¤¬ CA ¤Ç¤Ê¤¤"
 
 #: mutt_ssl_gnutls.c:755
-#, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "SSL ¾ÚÌÀ½ñ¸¡ºº"
+msgstr "TLS/SSL ¾ÚÌÀ½ñ¸¡ºº"
 
 #: mutt_tunnel.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "%s ¤ËÀܳÃæ..."
+msgstr "\"%s\" ¤ÇÀܳÃæ..."
 
 #: mutt_tunnel.c:137
 #, c-format
 msgid "Tunnel to %s returned error %d (%s)"
-msgstr ""
+msgstr "%s ¤Ø¤Î¥È¥ó¥Í¥ë¤¬¥¨¥é¡¼ %d (%s) ¤òÊÖ¤·¤¿"
 
 #: mutt_tunnel.c:155 mutt_tunnel.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "%s ¤Ø¤Î¸ò¿®¥¨¥é¡¼ (%s)¡£"
+msgstr "%s ¤Ø¤Î¥È¥ó¥Í¥ë¸ò¿®¥¨¥é¡¼: %s"
 
 # »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
 #: muttlib.c:910
@@ -4043,15 +3968,13 @@ msgstr ""
 "\n"
 
 #: pgp.c:387 pgp.c:951
-#, fuzzy
 msgid "Could not decrypt PGP message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼¤Ç¤­¤Ê¤«¤Ã¤¿"
+msgstr "PGP ¥á¥Ã¥»¡¼¥¸¤òÉü¹æ²½¤Ç¤­¤Ê¤«¤Ã¤¿"
 
 #. clear 'Invoking...' message, since there's no error
 #: pgp.c:436 pgp.c:947
-#, fuzzy
 msgid "PGP message successfully decrypted."
-msgstr "PGP ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
+msgstr "PGP ¥á¥Ã¥»¡¼¥¸¤ÎÉü¹æ²½¤ËÀ®¸ù¤·¤¿¡£"
 
 #: pgp.c:723
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
@@ -4066,9 +3989,8 @@ msgstr ""
 "\n"
 
 #: pgp.c:828
-#, fuzzy
 msgid "Decryption failed"
-msgstr "Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿¡£"
+msgstr "Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿"
 
 #: pgp.c:1003
 msgid "Can't open PGP subprocess!"