JP and ES updates.
authorphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 25 Aug 2002 09:54:19 +0000 (09:54 +0000)
committerphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 25 Aug 2002 09:54:19 +0000 (09:54 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3451 7612ce4b-ef26-0410-bec9-ea0150e637f0

locale/es_ES/LC_MESSAGES/squirrelmail.mo
locale/es_ES/LC_MESSAGES/squirrelmail.po
locale/ja_JP/LC_MESSAGES/squirrelmail.mo
locale/ja_JP/LC_MESSAGES/squirrelmail.po

index 9c4c848d0a508ac26f50ae8f5cb6e0bcafc4d443..dd546268305046e212dfbd3aff5b9736e691923e 100644 (file)
Binary files a/locale/es_ES/LC_MESSAGES/squirrelmail.mo and b/locale/es_ES/LC_MESSAGES/squirrelmail.mo differ
index d39f941e3c95ad213c5efbb03078514a122df661..0ea7d5e66a824b9e97c2b8a29f4f1dedb2b8a510 100644 (file)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $Id$\n"
-"POT-Creation-Date: 2002-08-22 12:34+0200\n"
+"POT-Creation-Date: 2002-08-24 07:40+0200\n"
 "PO-Revision-Date: 2002-02-23 22:59GMT+1\n"
 "Last-Translator: Philippe Mingo <philippe@squirrelmail.org>\n"
 "Language-Team: Spanish <squirrelmail-i18n@lists.sourceforge.net>\n"
@@ -27,7 +27,7 @@ msgstr "Todos"
 
 #: squirrelmail/src/addrbook_search.php:100
 #: squirrelmail/src/addrbook_search_html.php:90
-#: squirrelmail/src/addressbook.php:305 squirrelmail/src/vcard.php:89
+#: squirrelmail/src/addressbook.php:305 squirrelmail/src/vcard.php:79
 msgid "Name"
 msgstr "Nombre"
 
@@ -48,28 +48,28 @@ msgstr "Informaci
 msgid "Source"
 msgstr "Origen"
 
-#: squirrelmail/functions/mailbox_display.php:817
+#: squirrelmail/functions/mailbox_display.php:818
 #: squirrelmail/plugins/filters/options.php:124
 #: squirrelmail/src/addrbook_search_html.php:107
-#: squirrelmail/src/compose.php:86 squirrelmail/src/compose.php:98
+#: squirrelmail/src/compose.php:85 squirrelmail/src/compose.php:99
 #: squirrelmail/src/options_highlight.php:82
 #: squirrelmail/src/options_highlight.php:371
-#: squirrelmail/src/printer_friendly_bottom.php:105
-#: squirrelmail/src/read_body.php:325 squirrelmail/src/search.php:416
+#: squirrelmail/src/printer_friendly_bottom.php:109
+#: squirrelmail/src/read_body.php:327 squirrelmail/src/search.php:416
 msgid "To"
 msgstr "Para"
 
 #: squirrelmail/plugins/filters/options.php:127
 #: squirrelmail/src/addrbook_search_html.php:109
-#: squirrelmail/src/compose.php:87 squirrelmail/src/compose.php:100
+#: squirrelmail/src/compose.php:86 squirrelmail/src/compose.php:102
 #: squirrelmail/src/options_highlight.php:85
 #: squirrelmail/src/options_highlight.php:374
-#: squirrelmail/src/read_body.php:326 squirrelmail/src/search.php:415
+#: squirrelmail/src/read_body.php:328 squirrelmail/src/search.php:415
 msgid "Cc"
 msgstr "Cc"
 
 #: squirrelmail/src/addrbook_search_html.php:111
-#: squirrelmail/src/read_body.php:327
+#: squirrelmail/src/read_body.php:329
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -136,7 +136,7 @@ msgstr "Volver"
 #: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
 #: squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
 #: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
-#: squirrelmail/src/addrbook_search.php:206 squirrelmail/src/compose.php:756
+#: squirrelmail/src/addrbook_search.php:206 squirrelmail/src/compose.php:764
 #: squirrelmail/src/printer_friendly_top.php:39
 msgid "Close"
 msgstr "Cerrar"
@@ -215,161 +215,161 @@ msgstr "Borrar Seleccionado"
 msgid "Add to %s"
 msgstr "Agregar a %s"
 
-#: squirrelmail/functions/mailbox_display.php:837
+#: squirrelmail/functions/mailbox_display.php:838
 #: squirrelmail/plugins/filters/options.php:133
-#: squirrelmail/src/compose.php:83 squirrelmail/src/compose.php:95
+#: squirrelmail/src/compose.php:82 squirrelmail/src/compose.php:93
 #: squirrelmail/src/options_highlight.php:380
 #: squirrelmail/src/options_order.php:40
-#: squirrelmail/src/printer_friendly_bottom.php:97
-#: squirrelmail/src/read_body.php:315 squirrelmail/src/search.php:413
+#: squirrelmail/src/printer_friendly_bottom.php:101
+#: squirrelmail/src/read_body.php:317 squirrelmail/src/search.php:413
 msgid "Subject"
 msgstr "Asunto"
 
-#: squirrelmail/functions/mailbox_display.php:820
+#: squirrelmail/functions/mailbox_display.php:821
 #: squirrelmail/plugins/filters/options.php:121
-#: squirrelmail/src/compose.php:84 squirrelmail/src/compose.php:96
+#: squirrelmail/src/compose.php:83 squirrelmail/src/compose.php:95
 #: squirrelmail/src/options_highlight.php:79
 #: squirrelmail/src/options_highlight.php:368
 #: squirrelmail/src/options_order.php:38
-#: squirrelmail/src/printer_friendly_bottom.php:93
-#: squirrelmail/src/read_body.php:323 squirrelmail/src/search.php:414
+#: squirrelmail/src/printer_friendly_bottom.php:97
+#: squirrelmail/src/read_body.php:325 squirrelmail/src/search.php:414
 msgid "From"
 msgstr "De"
 
-#: squirrelmail/functions/mailbox_display.php:829
-#: squirrelmail/src/compose.php:85 squirrelmail/src/compose.php:97
+#: squirrelmail/functions/mailbox_display.php:830
+#: squirrelmail/src/compose.php:84 squirrelmail/src/compose.php:97
 #: squirrelmail/src/options_order.php:39
-#: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/read_body.php:324
+#: squirrelmail/src/printer_friendly_bottom.php:105
+#: squirrelmail/src/read_body.php:326
 msgid "Date"
 msgstr "Fecha"
 
-#: squirrelmail/src/compose.php:94
+#: squirrelmail/src/compose.php:92
 msgid "Original Message"
 msgstr "Mensaje Original"
 
-#: squirrelmail/src/compose.php:184
+#: squirrelmail/src/compose.php:186
 msgid "Draft Email Saved"
 msgstr "Borrador Guardado"
 
-#: squirrelmail/src/compose.php:287 squirrelmail/src/compose.php:330
-#: squirrelmail/src/compose.php:340
+#: squirrelmail/src/compose.php:289 squirrelmail/src/compose.php:332
+#: squirrelmail/src/compose.php:342
 msgid "Could not move/copy file. File not attached"
 msgstr "No se puede mover/copiar el archivo. Archivo no adjuntado"
 
-#: squirrelmail/src/compose.php:748
+#: squirrelmail/src/compose.php:756
 msgid "Draft Saved"
 msgstr "Borrador Guardado"
 
-#: squirrelmail/src/compose.php:751
+#: squirrelmail/src/compose.php:759
 msgid "Your Message has been sent"
 msgstr "Su mensaje ha sido enviado"
 
 #: squirrelmail/plugins/listcommands/mailout.php:54
-#: squirrelmail/src/compose.php:767
+#: squirrelmail/src/compose.php:775
 msgid "From:"
 msgstr "De:"
 
-#: squirrelmail/src/compose.php:795 squirrelmail/src/read_body.php:183
+#: squirrelmail/src/compose.php:803 squirrelmail/src/read_body.php:183
 msgid "To:"
 msgstr "Para:"
 
-#: squirrelmail/src/compose.php:803
+#: squirrelmail/src/compose.php:811
 msgid "CC:"
 msgstr "CC:"
 
-#: squirrelmail/src/compose.php:811
+#: squirrelmail/src/compose.php:819
 msgid "BCC:"
 msgstr "BCC:"
 
-#: squirrelmail/src/compose.php:818 squirrelmail/src/read_body.php:184
+#: squirrelmail/src/compose.php:826 squirrelmail/src/read_body.php:184
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: squirrelmail/src/compose.php:868 squirrelmail/src/compose.php:978
+#: squirrelmail/src/compose.php:876 squirrelmail/src/compose.php:983
 msgid "Send"
 msgstr "Enviar"
 
-#: squirrelmail/src/compose.php:883
+#: squirrelmail/src/compose.php:889
 msgid "Attach:"
 msgstr "Adjunto:"
 
-#: squirrelmail/src/compose.php:888 squirrelmail/src/options_order.php:132
+#: squirrelmail/src/compose.php:894 squirrelmail/src/options_order.php:132
 msgid "Add"
 msgstr "Agregar"
 
-#: squirrelmail/src/compose.php:908
+#: squirrelmail/src/compose.php:914
 msgid "Delete selected attachments"
 msgstr "Borrar Adjuntos Seleccionados"
 
-#: squirrelmail/src/compose.php:942 squirrelmail/src/read_body.php:329
+#: squirrelmail/src/compose.php:947 squirrelmail/src/read_body.php:331
 msgid "Priority"
 msgstr "Prioridad"
 
 #: squirrelmail/functions/mime.php:244
 #: squirrelmail/plugins/administrator/defines.php:202
 #: squirrelmail/plugins/calendar/functions.php:99
-#: squirrelmail/src/compose.php:943
+#: squirrelmail/src/compose.php:948
 msgid "High"
 msgstr "Alta"
 
 #: squirrelmail/functions/mime.php:257
 #: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:944
+#: squirrelmail/src/compose.php:949
 msgid "Normal"
 msgstr "Normal"
 
 #: squirrelmail/functions/mime.php:250
 #: squirrelmail/plugins/administrator/defines.php:199
-#: squirrelmail/src/compose.php:945
+#: squirrelmail/src/compose.php:950
 msgid "Low"
 msgstr "Baja"
 
-#: squirrelmail/src/compose.php:951
+#: squirrelmail/src/compose.php:956
 msgid "Receipt"
 msgstr "Confirmación"
 
-#: squirrelmail/src/compose.php:953
+#: squirrelmail/src/compose.php:958
 #, fuzzy
 msgid "On Read"
 msgstr "De lectura"
 
-#: squirrelmail/src/compose.php:955
+#: squirrelmail/src/compose.php:960
 msgid "On Delivery"
 msgstr "De entrega"
 
-#: squirrelmail/src/compose.php:960
+#: squirrelmail/src/compose.php:965
 #: squirrelmail/src/options_identities.php:314
 #: squirrelmail/src/options_personal.php:99
 msgid "Signature"
 msgstr "Firma"
 
-#: squirrelmail/functions/page_header.php:219 squirrelmail/src/compose.php:963
-#: squirrelmail/src/compose.php:967 squirrelmail/src/compose.php:971
+#: squirrelmail/functions/page_header.php:219 squirrelmail/src/compose.php:968
+#: squirrelmail/src/compose.php:972 squirrelmail/src/compose.php:976
 msgid "Addresses"
 msgstr "Direcciones"
 
-#: squirrelmail/src/compose.php:975
+#: squirrelmail/src/compose.php:980
 msgid "Save Draft"
 msgstr "Guardar Borrador"
 
-#: squirrelmail/src/compose.php:995
+#: squirrelmail/src/compose.php:1000
 msgid "You have not filled in the \"To:\" field."
 msgstr "No ha completado el campo \"Para:\""
 
-#: squirrelmail/src/compose.php:1083
+#: squirrelmail/src/compose.php:1087
 msgid "said"
 msgstr "dijo"
 
-#: squirrelmail/src/compose.php:1086
+#: squirrelmail/src/compose.php:1090
 msgid "quote"
 msgstr "cita"
 
-#: squirrelmail/src/compose.php:1086
+#: squirrelmail/src/compose.php:1090
 msgid "who"
 msgstr "quien"
 
-#: squirrelmail/functions/mailbox_display.php:1218
+#: squirrelmail/functions/mailbox_display.php:1225
 #: squirrelmail/functions/page_header.php:193
 #: squirrelmail/plugins/delete_move_next/setup.php:227
 #: squirrelmail/plugins/mail_fetch/options.php:172
@@ -466,13 +466,13 @@ msgstr "No se encontraron carpetas"
 msgid "Delete Folder"
 msgstr "Borrar Carpeta"
 
-#: squirrelmail/functions/mailbox_display.php:725
+#: squirrelmail/functions/mailbox_display.php:726
 #: squirrelmail/plugins/filters/options.php:194
 #: squirrelmail/plugins/mail_fetch/options.php:214
 #: squirrelmail/plugins/mail_fetch/options.php:221
 #: squirrelmail/src/folders.php:212 squirrelmail/src/options_highlight.php:100
 #: squirrelmail/src/options_identities.php:328
-#: squirrelmail/src/read_body.php:414
+#: squirrelmail/src/read_body.php:416
 msgid "Delete"
 msgstr "Borrar"
 
@@ -543,19 +543,19 @@ msgstr "Algunos o todos los documentos de ayuda no fueron encontrados"
 msgid "Table of Contents"
 msgstr "Tabla de Contenidos"
 
-#: squirrelmail/functions/mailbox_display.php:1013
-#: squirrelmail/functions/mailbox_display.php:1016
-#: squirrelmail/functions/mailbox_display.php:1019
+#: squirrelmail/functions/mailbox_display.php:1020
+#: squirrelmail/functions/mailbox_display.php:1023
+#: squirrelmail/functions/mailbox_display.php:1026
 #: squirrelmail/src/help.php:184 squirrelmail/src/help.php:188
-#: squirrelmail/src/read_body.php:448 squirrelmail/src/read_body.php:450
+#: squirrelmail/src/read_body.php:450 squirrelmail/src/read_body.php:452
 msgid "Previous"
 msgstr "Anterior"
 
-#: squirrelmail/functions/mailbox_display.php:1014
-#: squirrelmail/functions/mailbox_display.php:1017
-#: squirrelmail/functions/mailbox_display.php:1020
+#: squirrelmail/functions/mailbox_display.php:1021
+#: squirrelmail/functions/mailbox_display.php:1024
+#: squirrelmail/functions/mailbox_display.php:1027
 #: squirrelmail/src/help.php:192 squirrelmail/src/help.php:195
-#: squirrelmail/src/read_body.php:457 squirrelmail/src/read_body.php:459
+#: squirrelmail/src/read_body.php:459 squirrelmail/src/read_body.php:461
 msgid "Next"
 msgstr "Siguiente"
 
@@ -567,14 +567,13 @@ msgstr "Arriba"
 msgid "Viewing an image attachment"
 msgstr "Viendo una imagen adjunta"
 
-#: squirrelmail/src/image.php:31 squirrelmail/src/vcard.php:36
-#: squirrelmail/src/vcard.php:40 squirrelmail/src/view_header.php:84
-#: squirrelmail/src/view_text.php:36
+#: squirrelmail/src/image.php:31 squirrelmail/src/vcard.php:33
+#: squirrelmail/src/view_header.php:84 squirrelmail/src/view_text.php:36
 msgid "View message"
 msgstr "Ver el mensaje"
 
 #: squirrelmail/plugins/abook_take/setup.php:91 squirrelmail/src/image.php:40
-#: squirrelmail/src/vcard.php:213 squirrelmail/src/view_text.php:40
+#: squirrelmail/src/vcard.php:190 squirrelmail/src/view_text.php:40
 msgid "Download this as a file"
 msgstr "Bajar este mensaje como un archivo"
 
@@ -946,7 +945,7 @@ msgstr "Desactivado"
 #: squirrelmail/plugins/translate/options.php:93
 #: squirrelmail/src/options.php:201 squirrelmail/src/options_highlight.php:64
 #: squirrelmail/src/options_identities.php:57
-#: squirrelmail/src/options_order.php:32 squirrelmail/src/read_body.php:523
+#: squirrelmail/src/options_order.php:32 squirrelmail/src/read_body.php:526
 msgid "Options"
 msgstr "Opciones"
 
@@ -1121,7 +1120,7 @@ msgstr "Checkbox"
 msgid "Flags"
 msgstr "Indicadores"
 
-#: squirrelmail/functions/mailbox_display.php:844
+#: squirrelmail/functions/mailbox_display.php:845
 #: squirrelmail/src/options_order.php:42
 msgid "Size"
 msgstr "Tamaño"
@@ -1294,17 +1293,17 @@ msgstr ""
 "El orden del índice puede ser cambiado a gusto, ordenando por cualquiera de "
 "los encabezados."
 
-#: squirrelmail/src/printer_friendly_bottom.php:58
+#: squirrelmail/src/printer_friendly_bottom.php:62
 msgid "Message not printable"
 msgstr "Este mensaje no puede imprimirse"
 
-#: squirrelmail/src/printer_friendly_bottom.php:87
+#: squirrelmail/src/printer_friendly_bottom.php:91
 #: squirrelmail/src/printer_friendly_main.php:15
 #: squirrelmail/src/printer_friendly_top.php:22
 msgid "Printer Friendly"
 msgstr "Vista Preliminar"
 
-#: squirrelmail/src/printer_friendly_bottom.php:110
+#: squirrelmail/src/printer_friendly_bottom.php:114
 msgid "CC"
 msgstr "CC"
 
@@ -1329,37 +1328,37 @@ msgstr "Enviado:"
 msgid "Was displayed on %s"
 msgstr "Se mostró el %s"
 
-#: squirrelmail/src/read_body.php:217
+#: squirrelmail/src/read_body.php:219
 msgid "Read:"
 msgstr "Leído:"
 
-#: squirrelmail/src/read_body.php:291
+#: squirrelmail/src/read_body.php:293
 msgid "less"
 msgstr "menos"
 
-#: squirrelmail/src/read_body.php:293
+#: squirrelmail/src/read_body.php:295
 msgid "more"
 msgstr "mas"
 
-#: squirrelmail/functions/mime.php:408 squirrelmail/src/read_body.php:320
+#: squirrelmail/functions/mime.php:407 squirrelmail/src/read_body.php:322
 #, fuzzy
 msgid "Unknown sender"
 msgstr "Remitente Desconocido"
 
-#: squirrelmail/src/read_body.php:332
+#: squirrelmail/src/read_body.php:334
 msgid "Mailer"
 msgstr "Cliente"
 
-#: squirrelmail/src/read_body.php:338 squirrelmail/src/read_body.php:357
-#: squirrelmail/src/read_body.php:360
+#: squirrelmail/src/read_body.php:340 squirrelmail/src/read_body.php:359
+#: squirrelmail/src/read_body.php:362
 msgid "Read receipt"
 msgstr "Confirmación de lectura"
 
-#: squirrelmail/src/read_body.php:338
+#: squirrelmail/src/read_body.php:340
 msgid "send"
 msgstr "enviada"
 
-#: squirrelmail/src/read_body.php:349
+#: squirrelmail/src/read_body.php:351
 msgid ""
 "The message sender has requested a response to indicate that you have read "
 "this message. Would you like to send a receipt?"
@@ -1367,60 +1366,64 @@ msgstr ""
 "El emisor del mensaje ha solicitado una contestación que indique que ha "
 "leído este mensaje. ¿Desea mandarla ahora?"
 
-#: squirrelmail/src/read_body.php:357 squirrelmail/src/read_body.php:360
+#: squirrelmail/src/read_body.php:359 squirrelmail/src/read_body.php:362
 msgid "requested"
 msgstr "solicitada"
 
-#: squirrelmail/src/read_body.php:358
+#: squirrelmail/src/read_body.php:360
 msgid "Send read receipt now"
 msgstr "Emitir confirmación de lectura"
 
-#: squirrelmail/src/read_body.php:397
+#: squirrelmail/src/read_body.php:399
 #, fuzzy
 msgid "Search results"
 msgstr "Resultado de la búsqueda"
 
-#: squirrelmail/src/read_body.php:401
+#: squirrelmail/src/read_body.php:403
 msgid "Message List"
 msgstr "Lista de Mensajes"
 
-#: squirrelmail/src/read_body.php:424
+#: squirrelmail/src/read_body.php:426
 msgid "Resume Draft"
 msgstr "Recuperar Borrador"
 
-#: squirrelmail/src/read_body.php:427
+#: squirrelmail/src/read_body.php:429
 msgid "Edit Message as New"
 msgstr "Editar como nuevo mensaje"
 
-#: squirrelmail/src/read_body.php:464
+#: squirrelmail/src/read_body.php:466
 #, fuzzy
 msgid "View Message"
 msgstr "Ver el mensaje"
 
 #: squirrelmail/plugins/filters/options.php:206
-#: squirrelmail/src/read_body.php:470
+#: squirrelmail/src/read_body.php:472
 msgid "Up"
 msgstr "Arriba"
 
-#: squirrelmail/functions/mailbox_display.php:713
-#: squirrelmail/src/read_body.php:478 squirrelmail/src/read_body.php:480
+#: squirrelmail/functions/mailbox_display.php:714
+#: squirrelmail/src/read_body.php:480 squirrelmail/src/read_body.php:482
 msgid "Forward"
 msgstr "Reenviar"
 
-#: squirrelmail/src/read_body.php:488 squirrelmail/src/read_body.php:490
+#: squirrelmail/src/read_body.php:490 squirrelmail/src/read_body.php:492
 #, fuzzy
 msgid "Forward as Attachment"
 msgstr "Ficheros adjuntos"
 
-#: squirrelmail/src/read_body.php:499 squirrelmail/src/read_body.php:501
+#: squirrelmail/src/read_body.php:500 squirrelmail/src/read_body.php:502
 msgid "Reply"
 msgstr "Responder"
 
-#: squirrelmail/src/read_body.php:508 squirrelmail/src/read_body.php:510
+#: squirrelmail/src/read_body.php:509 squirrelmail/src/read_body.php:511
 msgid "Reply All"
 msgstr "Responder a Todos"
 
-#: squirrelmail/src/read_body.php:670
+#: squirrelmail/src/read_body.php:528
+msgid "View Full Header"
+msgstr "Ver Encabezado Completo"
+
+#: squirrelmail/src/read_body.php:672
 msgid "Attachments"
 msgstr "Ficheros adjuntos"
 
@@ -1497,55 +1500,55 @@ msgstr "Se ha desconectado correctamente."
 msgid "Click here to log back in."
 msgstr "Pulse aquí para volver a ingresar"
 
-#: squirrelmail/src/vcard.php:31
+#: squirrelmail/src/vcard.php:30
 msgid "Viewing a Business Card"
 msgstr "Viendo Tarjeta de Visita"
 
-#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:160
+#: squirrelmail/src/vcard.php:80 squirrelmail/src/vcard.php:140
 msgid "Title"
 msgstr "Título"
 
-#: squirrelmail/src/vcard.php:91
+#: squirrelmail/src/vcard.php:81
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:152
+#: squirrelmail/src/vcard.php:82 squirrelmail/src/vcard.php:132
 msgid "Web Page"
 msgstr "Página WEB"
 
-#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:164
+#: squirrelmail/src/vcard.php:83 squirrelmail/src/vcard.php:144
 msgid "Organization / Department"
 msgstr "Empresa / Dpto."
 
-#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:156
+#: squirrelmail/src/vcard.php:84 squirrelmail/src/vcard.php:136
 msgid "Address"
 msgstr "Dirección"
 
-#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:173
+#: squirrelmail/src/vcard.php:85 squirrelmail/src/vcard.php:153
 msgid "Work Phone"
 msgstr "Teléfono Profesional"
 
-#: squirrelmail/src/vcard.php:96 squirrelmail/src/vcard.php:177
+#: squirrelmail/src/vcard.php:86 squirrelmail/src/vcard.php:157
 msgid "Home Phone"
 msgstr "Teléfono Personal"
 
-#: squirrelmail/src/vcard.php:97 squirrelmail/src/vcard.php:181
+#: squirrelmail/src/vcard.php:87 squirrelmail/src/vcard.php:161
 msgid "Cellular Phone"
 msgstr "Teléfono Móvil"
 
-#: squirrelmail/src/vcard.php:98 squirrelmail/src/vcard.php:185
+#: squirrelmail/src/vcard.php:88 squirrelmail/src/vcard.php:165
 msgid "Fax"
 msgstr "Fax"
 
-#: squirrelmail/src/vcard.php:99 squirrelmail/src/vcard.php:189
+#: squirrelmail/src/vcard.php:89 squirrelmail/src/vcard.php:169
 msgid "Note"
 msgstr "Nota"
 
-#: squirrelmail/src/vcard.php:129
+#: squirrelmail/src/vcard.php:118
 msgid "Add to Addressbook"
 msgstr "Agregar al Listín"
 
-#: squirrelmail/src/vcard.php:169
+#: squirrelmail/src/vcard.php:149
 msgid "Title & Org. / Dept."
 msgstr "Puesto, Empr. / Dpto."
 
@@ -1870,13 +1873,13 @@ msgid ""
 "to resolve this issue."
 msgstr "Contacte con su administrador y comuníquele este error."
 
-#: squirrelmail/functions/i18n.php:751
+#: squirrelmail/functions/i18n.php:785
 msgid ""
 "You need to have php4 installed with the multibyte string function enabled "
 "(using configure option --with-mbstring)."
 msgstr ""
-"Error de sistema. Avise al administrador que necesita una versión de "
-"php4 con la opción multibyte activada (--with-mbstring)."
+"Error de sistema. Avise al administrador que necesita una versión de php4 "
+"con la opción multibyte activada (--with-mbstring)."
 
 #: squirrelmail/functions/imap_general.php:121
 #: squirrelmail/functions/imap_messages.php:427
@@ -1885,7 +1888,6 @@ msgstr ""
 #: squirrelmail/functions/imap_messages.php:452
 #: squirrelmail/functions/imap_messages.php:652
 #: squirrelmail/functions/imap_messages.php:663
-#: squirrelmail/plugins/filters/filters.php:227
 msgid "ERROR : Could not complete request."
 msgstr "ERROR: No se pudo completar el pedido."
 
@@ -1895,17 +1897,14 @@ msgid "Query:"
 msgstr "Consulta:"
 
 #: squirrelmail/functions/imap_general.php:125
-#: squirrelmail/plugins/filters/filters.php:229
 msgid "Reason Given: "
 msgstr "Razón dada: "
 
 #: squirrelmail/functions/imap_general.php:133
-#: squirrelmail/plugins/filters/filters.php:236
 msgid "ERROR : Bad or malformed request."
 msgstr "ERROR: pedido erroneo o con formato erroneo."
 
 #: squirrelmail/functions/imap_general.php:137
-#: squirrelmail/plugins/filters/filters.php:238
 msgid "Server responded: "
 msgstr "El servidor respondió: "
 
@@ -1944,7 +1943,7 @@ msgstr "N
 #: squirrelmail/functions/imap_messages.php:579
 #: squirrelmail/functions/imap_parse.php:183
 #: squirrelmail/functions/imap_parse.php:205
-#: squirrelmail/functions/mailbox_display.php:1177
+#: squirrelmail/functions/mailbox_display.php:1184
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
@@ -1960,7 +1959,7 @@ msgstr "(remitente desconocido)"
 msgid "A"
 msgstr "C"
 
-#: squirrelmail/functions/mailbox_display.php:388
+#: squirrelmail/functions/mailbox_display.php:389
 msgid ""
 "Thread sorting is not supported by your IMAP server.<br>Please report this "
 "to the system administrator."
@@ -1968,7 +1967,7 @@ msgstr ""
 "Avise al administrador del sistema que Su servidor IMAP no soporta la "
 "ordenación temática."
 
-#: squirrelmail/functions/mailbox_display.php:407
+#: squirrelmail/functions/mailbox_display.php:408
 msgid ""
 "Server-side sorting is not supported by your IMAP server.<br>Please report "
 "this to the system administrator."
@@ -1976,76 +1975,76 @@ msgstr ""
 "Avise al administrador que su servidor IMAP no permite ordenaciones de "
 "servidor."
 
-#: squirrelmail/functions/mailbox_display.php:608
+#: squirrelmail/functions/mailbox_display.php:609
 msgid "THIS FOLDER IS EMPTY"
 msgstr "Esta Carpeta esta Vacía"
 
-#: squirrelmail/functions/mailbox_display.php:706
+#: squirrelmail/functions/mailbox_display.php:707
 #, fuzzy
 msgid "Move Selected To"
 msgstr "Mover seleccionados a:"
 
-#: squirrelmail/functions/mailbox_display.php:707
+#: squirrelmail/functions/mailbox_display.php:708
 msgid "Transform Selected Messages"
 msgstr "Marcar mensajes seleccionados como"
 
-#: squirrelmail/functions/mailbox_display.php:712
+#: squirrelmail/functions/mailbox_display.php:713
 #: squirrelmail/plugins/delete_move_next/setup.php:253
 #: squirrelmail/plugins/delete_move_next/setup.php:277
 msgid "Move"
 msgstr "Mover"
 
-#: squirrelmail/functions/mailbox_display.php:719
+#: squirrelmail/functions/mailbox_display.php:720
 msgid "Expunge"
 msgstr "Purgar"
 
-#: squirrelmail/functions/mailbox_display.php:720
+#: squirrelmail/functions/mailbox_display.php:721
 msgid "mailbox"
 msgstr "buzón"
 
-#: squirrelmail/functions/mailbox_display.php:723
+#: squirrelmail/functions/mailbox_display.php:724
 msgid "Read"
 msgstr "Leído"
 
-#: squirrelmail/functions/mailbox_display.php:724
+#: squirrelmail/functions/mailbox_display.php:725
 msgid "Unread"
 msgstr "No Leído"
 
-#: squirrelmail/functions/mailbox_display.php:739
+#: squirrelmail/functions/mailbox_display.php:740
 msgid "Unthread View"
 msgstr "Quitar Orden Temático"
 
-#: squirrelmail/functions/mailbox_display.php:743
+#: squirrelmail/functions/mailbox_display.php:744
 msgid "Thread View"
 msgstr "Orden Temático"
 
-#: squirrelmail/functions/mailbox_display.php:900
+#: squirrelmail/functions/mailbox_display.php:901
 msgid "Toggle All"
 msgstr "Cambia Todos"
 
-#: squirrelmail/functions/mailbox_display.php:924
+#: squirrelmail/functions/mailbox_display.php:925
 msgid "Unselect All"
 msgstr "De-seleccionar Todos"
 
-#: squirrelmail/functions/mailbox_display.php:926
+#: squirrelmail/functions/mailbox_display.php:927
 msgid "Select All"
 msgstr "Seleccionar Todos"
 
-#: squirrelmail/functions/mailbox_display.php:943
+#: squirrelmail/functions/mailbox_display.php:944
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr "Viendo Mensajes: del <B>%s</B> al <B>%s</B> (total %s)"
 
-#: squirrelmail/functions/mailbox_display.php:946
+#: squirrelmail/functions/mailbox_display.php:947
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr "Viendo Mensaje: <b>%s</b> (total 1)"
 
-#: squirrelmail/functions/mailbox_display.php:1139
+#: squirrelmail/functions/mailbox_display.php:1146
 msgid "Paginate"
 msgstr "Paginar"
 
-#: squirrelmail/functions/mailbox_display.php:1146
+#: squirrelmail/functions/mailbox_display.php:1153
 msgid "Show All"
 msgstr "Todos"
 
@@ -2083,19 +2082,19 @@ msgstr "Mensaje:"
 msgid "FETCH line:"
 msgstr "Línea contestada:"
 
-#: squirrelmail/functions/mime.php:366
+#: squirrelmail/functions/mime.php:365
 msgid "Hide Unsafe Images"
 msgstr "Ocultar imágenes inseguras"
 
-#: squirrelmail/functions/mime.php:368
+#: squirrelmail/functions/mime.php:367
 msgid "View Unsafe Images"
 msgstr "Ver imágenes inseguras"
 
-#: squirrelmail/functions/mime.php:395
+#: squirrelmail/functions/mime.php:394
 msgid "download"
 msgstr "descargar"
 
-#: squirrelmail/functions/mime.php:1176 squirrelmail/functions/mime.php:1497
+#: squirrelmail/functions/mime.php:1177 squirrelmail/functions/mime.php:1498
 msgid "sec_remove_eng.png"
 msgstr "sec_remove_es_ES.png"
 
@@ -2138,7 +2137,7 @@ msgstr "Error creando el directorio %s."
 msgid "Could not create hashed directory structure!"
 msgstr "¡No pude crear la estructura de directorios!"
 
-#: squirrelmail/plugins/filters/filters.php:560
+#: squirrelmail/plugins/filters/filters.php:469
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "
 "is a pretty reliable list to scan spam from."
@@ -2146,7 +2145,7 @@ msgstr ""
 "COMERCIAL - Esta lista contiene servidores reconocidos como emisores de "
 "mensajes SPAM y resulta muy fiable."
 
-#: squirrelmail/plugins/filters/filters.php:568
+#: squirrelmail/plugins/filters/filters.php:477
 msgid ""
 "COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to "
 "be relayed through their system will be banned with this.  Another good one "
@@ -2155,7 +2154,7 @@ msgstr ""
 "COMERCIAL - Los servidores que estén configurados ( o mal configurados) para "
 "permitir correo SPAM pasar a través de ellos serán bloqueados. Muy bueno."
 
-#: squirrelmail/plugins/filters/filters.php:576
+#: squirrelmail/plugins/filters/filters.php:485
 msgid ""
 "COMMERCIAL - Dial-up users are often filtered out since they should use "
 "their ISP's mail servers to send mail.  Spammers typically get a dial-up "
@@ -2166,19 +2165,19 @@ msgstr ""
 "sus ISP. Es típico que los \"Spammers\" utilicen una cuenta de este tipo "
 "para mandar sus mensajes."
 
-#: squirrelmail/plugins/filters/filters.php:584
+#: squirrelmail/plugins/filters/filters.php:493
 msgid "COMMERCIAL - RBL+ Blackhole entries."
 msgstr "COMERCIAL - RBL + listado \"Blackhole\"."
 
-#: squirrelmail/plugins/filters/filters.php:592
+#: squirrelmail/plugins/filters/filters.php:501
 msgid "COMMERCIAL - RBL+ OpenRelay entries."
 msgstr "COMERCIAL - RBL+ listado \"OpenRelay\"."
 
-#: squirrelmail/plugins/filters/filters.php:600
+#: squirrelmail/plugins/filters/filters.php:509
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr "COMERCIAL - RBL+ conexiones RTC."
 
-#: squirrelmail/plugins/filters/filters.php:609
+#: squirrelmail/plugins/filters/filters.php:518
 msgid ""
 "FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to "
 "include servers used by abuse@uunet.net auto-replies too."
@@ -2187,13 +2186,13 @@ msgstr ""
 "Parece que también incluye servidores empleados por las respuestas "
 "automáticas de abuse@uunet.net"
 
-#: squirrelmail/plugins/filters/filters.php:617
+#: squirrelmail/plugins/filters/filters.php:526
 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
 msgstr ""
 "GRATUITO - RTC de \"Osirusoft\" - Lista SPAM de \"Osirusoft\" de conexiones "
 "RTC."
 
-#: squirrelmail/plugins/filters/filters.php:625
+#: squirrelmail/plugins/filters/filters.php:534
 msgid ""
 "FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and "
 "have been manually added after multiple nominations. Use with caution. Seems "
@@ -2204,7 +2203,7 @@ msgstr ""
 "nominaciones. A usar con precaución ya que parece emplear respuestas "
 "automáticas de algunos ISPs."
 
-#: squirrelmail/plugins/filters/filters.php:633
+#: squirrelmail/plugins/filters/filters.php:542
 msgid ""
 "FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for "
 "other mail servers that are not secure."
@@ -2212,7 +2211,7 @@ msgstr ""
 "GRATUITO - \"Osirusoft Smart Hosts\" - Lista de servidores seguros que sin "
 "embargo permiten el paso a terceros que no lo son."
 
-#: squirrelmail/plugins/filters/filters.php:641
+#: squirrelmail/plugins/filters/filters.php:550
 msgid ""
 "FREE - Osirusoft Spamware Developers - It is believed that these are IP "
 "ranges of companies that are known to produce spam software. Seems to catch "
@@ -2222,23 +2221,23 @@ msgstr ""
 "piensa que estas IPs pertenecen a desarrolladores de programas SPAM. Parece "
 "que intercepta abusos en las respuestas de algunos ISPs."
 
-#: squirrelmail/plugins/filters/filters.php:649
+#: squirrelmail/plugins/filters/filters.php:558
 msgid ""
 "FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
 "users in without confirmation."
 msgstr "GRATUITO - Lista Osirusoft de Servidores \"Opt-In\" sin confirmar."
 
-#: squirrelmail/plugins/filters/filters.php:657
+#: squirrelmail/plugins/filters/filters.php:566
 msgid ""
 "FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail."
 "cgi scripts. (planned)."
 msgstr "GRATUITO - Formularios inseguros de Osirusoft."
 
-#: squirrelmail/plugins/filters/filters.php:665
+#: squirrelmail/plugins/filters/filters.php:574
 msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
 msgstr "GRATUITO - Lista de servidores Proxy abiertos de Osirusoft."
 
-#: squirrelmail/plugins/filters/filters.php:673
+#: squirrelmail/plugins/filters/filters.php:582
 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."
@@ -2246,39 +2245,39 @@ msgstr ""
 "GRATUITO - ORDB nació cuando ORBS desapareció. Al parecer tiene menos falsos "
 "positivos de los que tenia ORBS."
 
-#: squirrelmail/plugins/filters/filters.php:681
+#: squirrelmail/plugins/filters/filters.php:590
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
 msgstr "GRATUITO - Five-Ten-sg.com - Fuentes SPAM directa."
 
-#: squirrelmail/plugins/filters/filters.php:689
+#: squirrelmail/plugins/filters/filters.php:598
 msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs."
 msgstr ""
 "GRATUITO - Five-Ten-sg.com - Lista de conexiones RTC - incluye algunas IPs "
 "DSL."
 
-#: squirrelmail/plugins/filters/filters.php:697
+#: squirrelmail/plugins/filters/filters.php:606
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
 msgstr ""
 "GRATUITO - Five-Ten-sg.com - Emisores masivos que no emplean \"opt in\" "
 "confirmados."
 
-#: squirrelmail/plugins/filters/filters.php:705
+#: squirrelmail/plugins/filters/filters.php:614
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
 msgstr "GRATUITO - Five-Ten-sg.com - Otros servidores varios."
 
-#: squirrelmail/plugins/filters/filters.php:713
+#: squirrelmail/plugins/filters/filters.php:622
 msgid "FREE - Five-Ten-sg.com - Single Stage servers."
 msgstr "GRATUITO - Five-Ten-sg.com - Servidores de Simple Fase."
 
-#: squirrelmail/plugins/filters/filters.php:721
+#: squirrelmail/plugins/filters/filters.php:630
 msgid "FREE - Five-Ten-sg.com - SPAM Support servers."
 msgstr "GRATUITO - Five-Ten-sg.com - Servidores de Soporte de SPAM."
 
-#: squirrelmail/plugins/filters/filters.php:729
+#: squirrelmail/plugins/filters/filters.php:638
 msgid "FREE - Five-Ten-sg.com - Web Form IPs."
 msgstr "GRATUITO - Five-Ten-sg.com - IPs de formularios WEB."
 
-#: squirrelmail/plugins/filters/filters.php:737
+#: squirrelmail/plugins/filters/filters.php:646
 msgid ""
 "FREE - Dorkslayers appears to include only really bad open relays outside "
 "the US to avoid being sued. Interestingly enough, their website recommends "
@@ -2288,11 +2287,11 @@ msgstr ""
 "fuera de los EEUU. Aunque es bastante interesante, su página web recomienda "
 "que NO se use su servicio."
 
-#: squirrelmail/plugins/filters/filters.php:745
+#: squirrelmail/plugins/filters/filters.php:654
 msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
 msgstr "GRATUITO - Lista de conocidos SPAMERS de SPAMHaus."
 
-#: squirrelmail/plugins/filters/filters.php:753
+#: squirrelmail/plugins/filters/filters.php:662
 #, c-format
 msgid ""
 "FREE, for now - SPAMCOP - An interesting solution that lists servers that "
@@ -2301,58 +2300,58 @@ msgstr ""
 "GRATUITO (de momento) - SPAMCOP - Una solución interesante que relaciona "
 "servidores que tienen un ratio muy elevado de SPAM (85% o superior)."
 
-#: squirrelmail/plugins/filters/filters.php:761
+#: squirrelmail/plugins/filters/filters.php:670
 msgid "FREE - dev.null.dk - I don't have any detailed info on this list."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:769
+#: squirrelmail/plugins/filters/filters.php:678
 msgid "FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:777
+#: squirrelmail/plugins/filters/filters.php:686
 msgid "FREE - 2mbit.com Open Relays - Another list of Open Relays."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:785
+#: squirrelmail/plugins/filters/filters.php:694
 msgid "FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:793
+#: squirrelmail/plugins/filters/filters.php:702
 msgid "FREE - 2mbit.com SPAM ISPs - List of SPAM-friendly ISPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:801
+#: squirrelmail/plugins/filters/filters.php:710
 msgid ""
 "FREE - Leadmon DUL - Another list of Dial-up or otherwise dynamically "
 "assigned IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:809
+#: squirrelmail/plugins/filters/filters.php:718
 msgid ""
 "FREE - Leadmon SPAM Source - List of IPs Leadmon.net has received SPAM "
 "directly from."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:817
+#: squirrelmail/plugins/filters/filters.php:726
 msgid ""
 "FREE - Leadmon Bulk Mailers - Bulk mailers that do not require confirmed opt-"
 "in or that have allowed known spammers to become clients and abuse their "
 "services."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:825
+#: squirrelmail/plugins/filters/filters.php:734
 msgid ""
 "FREE - Leadmon Open Relays - Single Stage Open Relays that are not listed on "
 "other active RBLs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:833
+#: squirrelmail/plugins/filters/filters.php:742
 msgid ""
 "FREE - Leadmon Multi-stage - Multi-Stage Open Relays that are not listed on "
 "other active RBLs and that have sent SPAM to Leadmon.net."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:841
+#: squirrelmail/plugins/filters/filters.php:750
 msgid ""
 "FREE - Leadmon SpamBlock - Sites on this listing have sent Leadmon.net "
 "direct SPAM from IPs in netblocks where the entire block has no DNS "
@@ -2360,25 +2359,25 @@ msgid ""
 "Leadmon.net."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:849
+#: squirrelmail/plugins/filters/filters.php:758
 msgid ""
 "FREE, for now - Not Just Another Blacklist - Both Open Relays and Direct "
 "SPAM Sources."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:857
+#: squirrelmail/plugins/filters/filters.php:766
 msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:865
+#: squirrelmail/plugins/filters/filters.php:774
 msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:873
+#: squirrelmail/plugins/filters/filters.php:782
 msgid "FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:881
+#: squirrelmail/plugins/filters/filters.php:790
 msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
 msgstr ""
 
@@ -4658,9 +4657,6 @@ msgstr "Cabecera de mensaje no entregado"
 #~ msgid "Use References header for thread sort"
 #~ msgstr "Ordenar por referencia de cabecera"
 
-#~ msgid "View Full Header"
-#~ msgstr "Ver Encabezado Completo"
-
 #~ msgid "No Messages found"
 #~ msgstr "No se encontraron mensajes"
 
index 45b6aab492262b88fc4c3a2f9bfb4a7d3f6324e7..d919f7a103697b4ee93991f59640dcedbb41d583 100644 (file)
Binary files a/locale/ja_JP/LC_MESSAGES/squirrelmail.mo and b/locale/ja_JP/LC_MESSAGES/squirrelmail.mo differ
index 6e03a3d264d65d0979b8a314ac4b1fe102939478..b84cfd883153e1d5b5a670930b5d167ac03d1473 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: $Id$\n"
 "POT-Creation-Date: 2002-05-30 16:53+0200\n"
-"PO-Revision-Date: 2002-08-19 02:21+0900\n"
+"PO-Revision-Date: 2002-08-24 08:03+0900\n"
 "Last-Translator: Masato HIGASHIYAMA <masato@yamaai-tech.com>\n"
 "Language-Team: Japanese  <squirrelmail-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,13 @@ msgstr ""
 msgid "Address Book"
 msgstr "¥¢¥É¥ì¥¹Ä¢"
 
+#: squirrelmail/plugins/mail_fetch/fetch.php:71
+#: squirrelmail/src/addrbook_search_html.php:81
+#: squirrelmail/src/addrbook_search_html.php:83
+#: squirrelmail/src/addrbook_search_html.php:85
+msgid "All"
+msgstr "Á´¤Æ"
+
 #: squirrelmail/src/addrbook_search.php:100
 #: squirrelmail/src/addrbook_search_html.php:90
 #: squirrelmail/src/addressbook.php:305 squirrelmail/src/vcard.php:89
@@ -40,128 +47,126 @@ msgstr "
 msgid "Source"
 msgstr "¥½¡¼¥¹"
 
-#: squirrelmail/src/addrbook_search.php:165
-#: squirrelmail/src/addrbook_search.php:261
-#: squirrelmail/src/addrbook_search_html.php:253
-msgid "No persons matching your search was found"
-msgstr "°ìÃפ·¤Þ¤»¤ó¤Ç¤·¤¿"
+#: squirrelmail/functions/mailbox_display.php:817
+#: squirrelmail/plugins/filters/options.php:124
+#: squirrelmail/src/addrbook_search_html.php:107
+#: squirrelmail/src/compose.php:86 squirrelmail/src/compose.php:98
+#: squirrelmail/src/options_highlight.php:82
+#: squirrelmail/src/options_highlight.php:371
+#: squirrelmail/src/printer_friendly_bottom.php:105
+#: squirrelmail/src/read_body.php:325 squirrelmail/src/search.php:416
+msgid "To"
+msgstr ""
+
+#: squirrelmail/plugins/filters/options.php:127
+#: squirrelmail/src/addrbook_search_html.php:109
+#: squirrelmail/src/compose.php:87 squirrelmail/src/compose.php:100
+#: squirrelmail/src/options_highlight.php:85
+#: squirrelmail/src/options_highlight.php:374
+#: squirrelmail/src/read_body.php:326 squirrelmail/src/search.php:415
+msgid "Cc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:111
+#: squirrelmail/src/read_body.php:327
+msgid "Bcc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:127
+msgid "Use Addresses"
+msgstr "¥Á¥§¥Ã¥¯¤·¤¿¥¢¥É¥ì¥¹¤ò»È¤¦"
+
+#: squirrelmail/src/addrbook_search_html.php:151
+msgid "Address Book Search"
+msgstr "¥¢¥É¥ì¥¹Ä¢¤Î¸¡º÷"
 
-#: squirrelmail/src/addrbook_search.php:180
-#: squirrelmail/src/addrbook_search_html.php:162
+#: squirrelmail/src/addrbook_search.php:181
+#: squirrelmail/src/addrbook_search_html.php:163
 msgid "Search for"
 msgstr "¸¡º÷ for"
 
-#: squirrelmail/src/addrbook_search.php:187
-#: squirrelmail/src/addrbook_search_html.php:172
+#: squirrelmail/src/addrbook_search.php:188
+#: squirrelmail/src/addrbook_search_html.php:173
 msgid "in"
 msgstr "Ãæ"
 
-#: squirrelmail/src/addrbook_search.php:188
-#: squirrelmail/src/addrbook_search_html.php:175
+#: squirrelmail/src/addrbook_search.php:189
+#: squirrelmail/src/addrbook_search_html.php:176
 msgid "All address books"
 msgstr "Á´¥¢¥É¥ì¥¹Ä¢"
 
-#: squirrelmail/src/addrbook_search.php:202
-#: squirrelmail/src/addrbook_search_html.php:190
-#: squirrelmail/src/search.php:194 squirrelmail/src/search.php:198
-#: squirrelmail/src/search.php:218 squirrelmail/src/search.php:366
-#: squirrelmail/src/search.php:396 squirrelmail/src/search.php:417
-#: squirrelmail/src/search.php:426 squirrelmail/functions/page_header.php:224
+#: squirrelmail/functions/page_header.php:225
+#: squirrelmail/src/addrbook_search.php:203
+#: squirrelmail/src/addrbook_search_html.php:191
+#: squirrelmail/src/search.php:226 squirrelmail/src/search.php:230
+#: squirrelmail/src/search.php:249 squirrelmail/src/search.php:419
+#: squirrelmail/src/search.php:449 squirrelmail/src/search.php:471
+#: squirrelmail/src/search.php:486
 msgid "Search"
 msgstr "¸¡º÷"
 
-#: squirrelmail/src/addrbook_search.php:203
-#: squirrelmail/src/addrbook_search_html.php:191
+#: squirrelmail/src/addrbook_search.php:204
+#: squirrelmail/src/addrbook_search_html.php:192
 msgid "List all"
 msgstr "Á´É½¼¨"
 
-#: squirrelmail/src/addrbook_search.php:205 squirrelmail/src/compose.php:639
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
-#: squirrelmail/plugins/newmail/testsound.php:36
-msgid "Close"
-msgstr "ÊĤ¸¤ë"
-
-#: squirrelmail/src/addrbook_search.php:226
-#: squirrelmail/src/addrbook_search_html.php:221
+#: squirrelmail/src/addrbook_search.php:227
+#: squirrelmail/src/addrbook_search_html.php:222
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr "%s ¤Î¸¡º÷·ë²Ì¤ÏÍ­¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: squirrelmail/src/addrbook_search.php:252
-#: squirrelmail/src/addrbook_search_html.php:246
+#: squirrelmail/src/addrbook_search.php:253
+#: squirrelmail/src/addrbook_search_html.php:247
 msgid "Your search failed with the following error(s)"
 msgstr "¼¡¤Î¥¨¥é¡¼¤Ç¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: squirrelmail/src/addrbook_search_html.php:81
-#: squirrelmail/src/addrbook_search_html.php:83
-#: squirrelmail/src/addrbook_search_html.php:85
-#: squirrelmail/plugins/mail_fetch/fetch.php:71
-msgid "All"
-msgstr "Á´¤Æ"
-
-#: squirrelmail/src/addrbook_search_html.php:106
-#: squirrelmail/src/compose.php:464 squirrelmail/src/download.php:401
-#: squirrelmail/src/download.php:410 squirrelmail/src/options_highlight.php:83
-#: squirrelmail/src/options_highlight.php:372
-#: squirrelmail/src/printer_friendly_bottom.php:103
-#: squirrelmail/src/search.php:363
-#: squirrelmail/functions/mailbox_display.php:793
-#: squirrelmail/plugins/filters/options.php:125
-msgid "To"
-msgstr ""
-
-#: squirrelmail/src/addrbook_search_html.php:108
-#: squirrelmail/src/compose.php:471 squirrelmail/src/options_highlight.php:86
-#: squirrelmail/src/options_highlight.php:375 squirrelmail/src/search.php:362
-#: squirrelmail/plugins/filters/options.php:128
-msgid "Cc"
-msgstr ""
-
-#: squirrelmail/src/addrbook_search_html.php:110
-msgid "Bcc"
-msgstr ""
-
-#: squirrelmail/src/addrbook_search_html.php:126
-msgid "Use Addresses"
-msgstr "¥Á¥§¥Ã¥¯¤·¤¿¥¢¥É¥ì¥¹¤ò»È¤¦"
-
-#: squirrelmail/src/addrbook_search_html.php:150
-msgid "Address Book Search"
-msgstr "¥¢¥É¥ì¥¹Ä¢¤Î¸¡º÷"
+#: squirrelmail/src/addrbook_search.php:166
+#: squirrelmail/src/addrbook_search.php:262
+#: squirrelmail/src/addrbook_search_html.php:254
+msgid "No persons matching your search was found"
+msgstr "°ìÃפ·¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: squirrelmail/src/addrbook_search_html.php:267
+#: squirrelmail/src/addrbook_search_html.php:268
 msgid "Return"
 msgstr "Ìá¤ë"
 
-#: squirrelmail/src/addressbook.php:40 squirrelmail/src/addressbook.php:304
+#: squirrelmail/plugins/newmail/testsound.php:36
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
+#: squirrelmail/src/addrbook_search.php:206 squirrelmail/src/compose.php:756
+#: squirrelmail/src/printer_friendly_top.php:39
+msgid "Close"
+msgstr "ÊĤ¸¤ë"
+
 #: squirrelmail/plugins/abook_take/take.php:35
+#: squirrelmail/src/addressbook.php:40 squirrelmail/src/addressbook.php:304
 msgid "Nickname"
 msgstr "¥Ë¥Ã¥¯¥Í¡¼¥à"
 
-#: squirrelmail/src/addressbook.php:41
 #: squirrelmail/plugins/abook_take/take.php:37
+#: squirrelmail/src/addressbook.php:41
 msgid "Must be unique"
 msgstr "½ÅÊ£¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: squirrelmail/src/addressbook.php:42
 #: squirrelmail/plugins/abook_take/take.php:41
+#: squirrelmail/src/addressbook.php:42
 msgid "E-mail address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:43
 #: squirrelmail/plugins/abook_take/take.php:60
+#: squirrelmail/src/addressbook.php:43
 msgid "First name"
 msgstr "̾"
 
-#: squirrelmail/src/addressbook.php:44
 #: squirrelmail/plugins/abook_take/take.php:64
+#: squirrelmail/src/addressbook.php:44
 msgid "Last name"
 msgstr "À«"
 
-#: squirrelmail/src/addressbook.php:45
 #: squirrelmail/plugins/abook_take/take.php:68
+#: squirrelmail/src/addressbook.php:45
 msgid "Additional info"
 msgstr "¤½¤Î¾¤Î¾ðÊó"
 
@@ -178,11 +183,11 @@ msgstr "
 msgid "Update address"
 msgstr "¥¢¥É¥ì¥¹Ä¢¤ò¹¹¿·"
 
-#: squirrelmail/src/addressbook.php:197 squirrelmail/src/addressbook.php:251
 #: squirrelmail/functions/display_messages.php:70
 #: squirrelmail/functions/display_messages.php:89
 #: squirrelmail/functions/display_messages.php:106
 #: squirrelmail/functions/display_messages.php:172
+#: squirrelmail/src/addressbook.php:197 squirrelmail/src/addressbook.php:251
 msgid "ERROR"
 msgstr "¥¨¥é¡¼"
 
@@ -190,245 +195,204 @@ msgstr "
 msgid "Unknown error"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼"
 
-#: squirrelmail/src/addressbook.php:271 squirrelmail/src/addressbook.php:373
 #: squirrelmail/plugins/abook_take/take.php:73
+#: squirrelmail/src/addressbook.php:271 squirrelmail/src/addressbook.php:374
 msgid "Add address"
 msgstr "¥¢¥É¥ì¥¹¤ÎÄɲÃ"
 
-#: squirrelmail/src/addressbook.php:285 squirrelmail/src/addressbook.php:351
+#: squirrelmail/src/addressbook.php:285 squirrelmail/src/addressbook.php:352
 msgid "Edit selected"
 msgstr "ÁªÂò¤µ¤ì¤¿Êª¤òÊÔ½¸"
 
-#: squirrelmail/src/addressbook.php:287 squirrelmail/src/addressbook.php:353
+#: squirrelmail/src/addressbook.php:287 squirrelmail/src/addressbook.php:354
 msgid "Delete selected"
 msgstr "ÁªÂò¤µ¤ì¤¿Êª¤òºï½ü"
 
-#: squirrelmail/src/addressbook.php:368
 #: squirrelmail/plugins/abook_take/take.php:29
+#: squirrelmail/src/addressbook.php:369
 #, c-format
 msgid "Add to %s"
 msgstr "%s ¤ËÄɲÃ"
 
-#: squirrelmail/src/compose.php:98
-msgid "Draft Email Saved"
-msgstr "¥É¥é¥Õ¥È¤ËÊݸ¤·¤Þ¤·¤¿"
-
-#: squirrelmail/src/compose.php:201 squirrelmail/src/compose.php:245
-#: squirrelmail/src/compose.php:255
-msgid "Could not move/copy file. File not attached"
-msgstr "źÉÕ¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
-
-#: squirrelmail/src/compose.php:459
-msgid "Original Message"
-msgstr "¥ª¥ê¥¸¥Ê¥ë¥á¥Ã¥»¡¼¥¸"
-
-#: squirrelmail/src/compose.php:460 squirrelmail/src/download.php:399
-#: squirrelmail/src/download.php:406
-#: squirrelmail/src/options_highlight.php:381
+#: squirrelmail/functions/mailbox_display.php:837
+#: squirrelmail/plugins/filters/options.php:133
+#: squirrelmail/src/compose.php:83 squirrelmail/src/compose.php:95
+#: squirrelmail/src/options_highlight.php:380
 #: squirrelmail/src/options_order.php:40
-#: squirrelmail/src/printer_friendly_bottom.php:117
-#: squirrelmail/src/search.php:360
-#: squirrelmail/functions/mailbox_display.php:813
-#: squirrelmail/plugins/filters/options.php:134
+#: squirrelmail/src/printer_friendly_bottom.php:97
+#: squirrelmail/src/read_body.php:315 squirrelmail/src/search.php:413
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/src/compose.php:461 squirrelmail/src/download.php:171
-#: squirrelmail/src/download.php:400 squirrelmail/src/download.php:408
-#: squirrelmail/src/options_highlight.php:80
-#: squirrelmail/src/options_highlight.php:369
+#: squirrelmail/functions/mailbox_display.php:820
+#: squirrelmail/plugins/filters/options.php:121
+#: squirrelmail/src/compose.php:84 squirrelmail/src/compose.php:96
+#: squirrelmail/src/options_highlight.php:79
+#: squirrelmail/src/options_highlight.php:368
 #: squirrelmail/src/options_order.php:38
-#: squirrelmail/src/printer_friendly_bottom.php:99
-#: squirrelmail/src/search.php:361
-#: squirrelmail/functions/mailbox_display.php:796
-#: squirrelmail/plugins/filters/options.php:122
+#: squirrelmail/src/printer_friendly_bottom.php:93
+#: squirrelmail/src/read_body.php:323 squirrelmail/src/search.php:414
 msgid "From"
 msgstr ""
 
-#: squirrelmail/src/compose.php:462 squirrelmail/src/download.php:402
-#: squirrelmail/src/download.php:412 squirrelmail/src/options_order.php:39
-#: squirrelmail/src/printer_friendly_bottom.php:113
-#: squirrelmail/functions/mailbox_display.php:805
+#: squirrelmail/functions/mailbox_display.php:829
+#: squirrelmail/src/compose.php:85 squirrelmail/src/compose.php:97
+#: squirrelmail/src/options_order.php:39
+#: squirrelmail/src/printer_friendly_bottom.php:101
+#: squirrelmail/src/read_body.php:324
 msgid "Date"
 msgstr ""
 
-#: squirrelmail/src/compose.php:628
+#: squirrelmail/src/compose.php:94
+msgid "Original Message"
+msgstr "¥ª¥ê¥¸¥Ê¥ë¥á¥Ã¥»¡¼¥¸"
+
+#: squirrelmail/src/compose.php:184
+msgid "Draft Email Saved"
+msgstr "¥É¥é¥Õ¥È¤ËÊݸ¤·¤Þ¤·¤¿"
+
+#: squirrelmail/src/compose.php:287 squirrelmail/src/compose.php:330
+#: squirrelmail/src/compose.php:340
+msgid "Could not move/copy file. File not attached"
+msgstr "źÉÕ¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
+
+#: squirrelmail/src/compose.php:748
 msgid "Draft Saved"
 msgstr "¥É¥é¥Õ¥È¤ËÊݸ¤·¤Þ¤·¤¿"
 
-#: squirrelmail/src/compose.php:631
+#: squirrelmail/src/compose.php:751
 msgid "Your Message has been sent"
 msgstr "Á÷¿®´°Î»¤·¤Þ¤·¤¿¡£"
 
-#: squirrelmail/src/compose.php:650 squirrelmail/src/read_body.php:872
 #: squirrelmail/plugins/listcommands/mailout.php:54
+#: squirrelmail/src/compose.php:767
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:677 squirrelmail/src/download.php:183
-#: squirrelmail/src/read_body.php:220 squirrelmail/src/read_body.php:887
+#: squirrelmail/src/compose.php:795 squirrelmail/src/read_body.php:183
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:684
+#: squirrelmail/src/compose.php:803
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:691
+#: squirrelmail/src/compose.php:811
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:719 squirrelmail/src/download.php:176
-#: squirrelmail/src/read_body.php:221 squirrelmail/src/read_body.php:847
+#: squirrelmail/src/compose.php:818 squirrelmail/src/read_body.php:184
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:762 squirrelmail/src/compose.php:858
+#: squirrelmail/src/compose.php:868 squirrelmail/src/compose.php:978
 msgid "Send"
 msgstr "Á÷¿®"
 
-#: squirrelmail/src/compose.php:769
+#: squirrelmail/src/compose.php:883
 msgid "Attach:"
 msgstr "źÉÕ:"
 
-#: squirrelmail/src/compose.php:772 squirrelmail/src/options_order.php:132
+#: squirrelmail/src/compose.php:888 squirrelmail/src/options_order.php:132
 msgid "Add"
 msgstr "ÄɲÃ"
 
-#: squirrelmail/src/compose.php:791
+#: squirrelmail/src/compose.php:908
 msgid "Delete selected attachments"
 msgstr "ÁªÂò¤·¤¿ÅºÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü"
 
-#: squirrelmail/src/compose.php:824 squirrelmail/src/read_body.php:913
+#: squirrelmail/src/compose.php:942 squirrelmail/src/read_body.php:329
 msgid "Priority"
 msgstr "½ÅÍ×ÅÙ"
 
-#: squirrelmail/src/compose.php:825 squirrelmail/src/read_body.php:622
+#: squirrelmail/functions/mime.php:244
+#: squirrelmail/plugins/administrator/defines.php:202
 #: squirrelmail/plugins/calendar/functions.php:99
-#: squirrelmail/plugins/administrator/defines.php:201
+#: squirrelmail/src/compose.php:943
 msgid "High"
 msgstr "¹â"
 
-#: squirrelmail/src/compose.php:826 squirrelmail/src/read_body.php:635
+#: squirrelmail/functions/mime.php:257
 #: squirrelmail/plugins/calendar/functions.php:98
+#: squirrelmail/src/compose.php:944
 msgid "Normal"
 msgstr "Ãæ"
 
-#: squirrelmail/src/compose.php:827 squirrelmail/src/read_body.php:628
-#: squirrelmail/plugins/administrator/defines.php:198
+#: squirrelmail/functions/mime.php:250
+#: squirrelmail/plugins/administrator/defines.php:199
+#: squirrelmail/src/compose.php:945
 msgid "Low"
 msgstr "Äã"
 
-#: squirrelmail/src/compose.php:833
+#: squirrelmail/src/compose.php:951
 msgid "Receipt"
 msgstr "¼õ¼èÄÌÃÎ"
 
-#: squirrelmail/src/compose.php:835
-msgid "On read"
+#: squirrelmail/src/compose.php:953
+msgid "On Read"
 msgstr "Æɤó¤À¤È¤­"
 
-#: squirrelmail/src/compose.php:837
+#: squirrelmail/src/compose.php:955
 msgid "On Delivery"
 msgstr "ÇÛÁ÷¤·¤¿¤È¤­"
 
-#: squirrelmail/src/compose.php:845
+#: squirrelmail/src/compose.php:960
 #: squirrelmail/src/options_identities.php:314
 #: squirrelmail/src/options_personal.php:99
 msgid "Signature"
 msgstr "½ð̾"
 
-#: squirrelmail/src/compose.php:848 squirrelmail/src/compose.php:852
-#: squirrelmail/src/compose.php:856 squirrelmail/functions/page_header.php:218
+#: squirrelmail/functions/page_header.php:219 squirrelmail/src/compose.php:963
+#: squirrelmail/src/compose.php:967 squirrelmail/src/compose.php:971
 msgid "Addresses"
 msgstr "¥¢¥É¥ì¥¹Ä¢"
 
-#: squirrelmail/src/compose.php:861
+#: squirrelmail/src/compose.php:975
 msgid "Save Draft"
 msgstr "¥É¥é¥Õ¥È¤ËÊݸ"
 
-#: squirrelmail/src/compose.php:880
+#: squirrelmail/src/compose.php:995
 msgid "You have not filled in the \"To:\" field."
 msgstr "°¸À褬ÆþÎϤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: squirrelmail/src/compose.php:972
+#: squirrelmail/src/compose.php:1083
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:975
+#: squirrelmail/src/compose.php:1086
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:975
+#: squirrelmail/src/compose.php:1086
 msgid "who"
 msgstr ""
 
-#: squirrelmail/src/download.php:32 squirrelmail/src/download.php:34
-#: squirrelmail/src/download.php:102 squirrelmail/src/image.php:26
-#: squirrelmail/src/image.php:30 squirrelmail/src/read_body.php:437
-#: squirrelmail/src/vcard.php:36 squirrelmail/src/vcard.php:40
-msgid "View message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤òɽ¼¨"
-
-#: squirrelmail/src/download.php:43
-msgid "Viewing a text attachment"
-msgstr "¥Æ¥­¥¹¥È¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤òɽ¼¨"
-
-#: squirrelmail/src/download.php:50 squirrelmail/src/download.php:109
-#: squirrelmail/src/image.php:49 squirrelmail/src/vcard.php:213
-#: squirrelmail/functions/mime.php:863
-#: squirrelmail/plugins/abook_take/setup.php:91
-msgid "Download this as a file"
-msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É"
-
-#: squirrelmail/src/download.php:101
-msgid "Viewing a message attachment"
-msgstr "źÉդΥ¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤òɽ¼¨"
-
-#: squirrelmail/src/download.php:137
-msgid "Save to:"
-msgstr "°ÜÆ°"
-
-#: squirrelmail/src/download.php:141
-msgid "Extract"
-msgstr "¼è¤ê½Ð¤¹"
-
-#: squirrelmail/src/download.php:156 squirrelmail/src/left_main.php:74
-#: squirrelmail/src/search.php:329 squirrelmail/functions/imap_search.php:217
-#: squirrelmail/functions/mailbox_display.php:717
-#: squirrelmail/functions/page_header.php:192
+#: squirrelmail/functions/mailbox_display.php:1218
+#: squirrelmail/functions/page_header.php:193
+#: squirrelmail/plugins/delete_move_next/setup.php:227
 #: squirrelmail/plugins/mail_fetch/options.php:172
 #: squirrelmail/plugins/mail_fetch/options.php:290
-#: squirrelmail/plugins/delete_move_next/setup.php:219
+#: squirrelmail/src/download.php:29 squirrelmail/src/left_main.php:74
+#: squirrelmail/src/search.php:168 squirrelmail/src/search.php:382
 msgid "INBOX"
 msgstr ""
 
-#: squirrelmail/src/download.php:189 squirrelmail/src/read_body.php:880
-#: squirrelmail/plugins/calendar/event_create.php:125
-#: squirrelmail/plugins/calendar/event_delete.php:35
-#: squirrelmail/plugins/calendar/event_edit.php:37
-#: squirrelmail/plugins/calendar/event_edit.php:103
-#: squirrelmail/plugins/calendar/event_edit.php:127
-msgid "Date:"
-msgstr "ÆüÉÕ:"
-
-#: squirrelmail/src/download.php:197 squirrelmail/src/read_body.php:895
-msgid "Cc:"
-msgstr ""
-
-#: squirrelmail/src/download.php:205 squirrelmail/src/read_body.php:905
-msgid "Bcc:"
-msgstr ""
+#: squirrelmail/src/folders_create.php:29
+msgid "Illegal folder name.  Please select a different name."
+msgstr "Àµ¤·¤¯¤Ê¤¤¥Õ¥©¥ë¥À̾¤Ç¤¹¡£°ã¤¦Ì¾Á°¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: squirrelmail/src/download.php:224 squirrelmail/src/read_body.php:586
-msgid "more"
-msgstr "Á´Éô"
+#: squirrelmail/src/folders_create.php:29
+#: squirrelmail/src/folders_delete.php:30
+#: squirrelmail/src/folders_rename_getname.php:24
+msgid "Click here to go back"
+msgstr "Ìá¤ë"
 
-#: squirrelmail/src/download.php:225 squirrelmail/src/read_body.php:587
-msgid "less"
-msgstr "¾Êά"
+#: squirrelmail/src/folders_delete.php:30
+msgid "You have not selected a folder to delete. Please do so."
+msgstr "ºï½ü¤¹¤ë¥Õ¥©¥ë¥À¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: squirrelmail/src/folders.php:28 squirrelmail/src/left_main.php:754
-#: squirrelmail/functions/page_header.php:220
+#: squirrelmail/functions/page_header.php:221 squirrelmail/src/folders.php:28
+#: squirrelmail/src/left_main.php:754
 msgid "Folders"
 msgstr "¥Õ¥©¥ë¥À"
 
@@ -452,91 +416,86 @@ msgstr "
 msgid "Renamed successfully!"
 msgstr "̾Á°¤òÊѹ¹¤·¤Þ¤·¤¿¡£"
 
-#: squirrelmail/src/folders.php:51 squirrelmail/src/left_main.php:793
+#: squirrelmail/src/folders.php:48
+msgid "Subscription Unsuccessful - Folder does not exist."
+msgstr "½èÍý¤Ï´°Î»¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£¥Õ¥©¥ë¥À¤¬Â¸ºß¤·¤Þ¤»¤ó¡£"
+
+#: squirrelmail/src/folders.php:55 squirrelmail/src/left_main.php:793
 msgid "refresh folder list"
 msgstr "¥ê¥Õ¥ì¥Ã¥·¥å"
 
-#: squirrelmail/src/folders.php:64
+#: squirrelmail/src/folders.php:68
 msgid "Create Folder"
 msgstr "¥Õ¥©¥ë¥À¤ÎºîÀ®"
 
-#: squirrelmail/src/folders.php:71
+#: squirrelmail/src/folders.php:75
 msgid "as a subfolder of"
 msgstr "¤³¤Î¥Õ¥©¥ë¥À¤Î¥µ¥Ö¥Õ¥©¥ë¥À¤È¤·¤Æ"
 
-#: squirrelmail/src/folders.php:75 squirrelmail/src/folders.php:77
+#: squirrelmail/src/folders.php:79 squirrelmail/src/folders.php:81
 msgid "None"
 msgstr "¤Ê¤·"
 
-#: squirrelmail/src/folders.php:102
+#: squirrelmail/src/folders.php:106
 msgid "Let this folder contain subfolders"
 msgstr "¤³¤Î¥Õ¥©¥ë¥À¤Î¥µ¥Ö¥Õ¥©¥ë¥À¤È¤·¤Æ"
 
-#: squirrelmail/src/folders.php:105
+#: squirrelmail/src/folders.php:109
 msgid "Create"
 msgstr "ºîÀ®"
 
-#: squirrelmail/src/folders.php:141
+#: squirrelmail/src/folders.php:145
 msgid "Rename a Folder"
 msgstr "¥ê¥Í¡¼¥à"
 
-#: squirrelmail/src/folders.php:149 squirrelmail/src/folders.php:190
+#: squirrelmail/src/folders.php:153 squirrelmail/src/folders.php:194
 msgid "Select a folder"
 msgstr "¥Õ¥©¥ë¥À¤òÁªÂò"
 
-#: squirrelmail/src/folders.php:168
+#: squirrelmail/src/folders.php:172
 msgid "Rename"
 msgstr "¥ê¥Í¡¼¥à"
 
-#: squirrelmail/src/folders.php:172 squirrelmail/src/folders.php:212
+#: squirrelmail/src/folders.php:176 squirrelmail/src/folders.php:216
 msgid "No folders found"
 msgstr "¥Õ¥©¥ë¥À¤¬Í­¤ê¤Þ¤»¤ó"
 
-#: squirrelmail/src/folders.php:182
+#: squirrelmail/src/folders.php:186
 msgid "Delete Folder"
 msgstr "¥Õ¥©¥ë¥Àºï½ü"
 
-#: squirrelmail/src/folders.php:208 squirrelmail/src/options_highlight.php:101
-#: squirrelmail/src/options_identities.php:328
-#: squirrelmail/src/read_body.php:729
-#: squirrelmail/functions/mailbox_display.php:739
-#: squirrelmail/plugins/filters/options.php:196
+#: squirrelmail/functions/mailbox_display.php:725
+#: squirrelmail/plugins/filters/options.php:194
 #: squirrelmail/plugins/mail_fetch/options.php:214
 #: squirrelmail/plugins/mail_fetch/options.php:221
+#: squirrelmail/src/folders.php:212 squirrelmail/src/options_highlight.php:100
+#: squirrelmail/src/options_identities.php:328
+#: squirrelmail/src/read_body.php:414
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:245
-#: squirrelmail/plugins/listcommands/setup.php:36
+#: squirrelmail/plugins/listcommands/setup.php:34
+#: squirrelmail/src/folders.php:227 squirrelmail/src/folders.php:249
 msgid "Unsubscribe"
 msgstr "²ò½ü¤¹¤ë"
 
-#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:286
-#: squirrelmail/plugins/listcommands/setup.php:35
+#: squirrelmail/plugins/listcommands/setup.php:33
+#: squirrelmail/src/folders.php:227 squirrelmail/src/folders.php:292
+#: squirrelmail/src/folders.php:302
 msgid "Subscribe"
 msgstr "ÅÐÏ¿¤¹¤ë"
 
-#: squirrelmail/src/folders.php:249
+#: squirrelmail/src/folders.php:253
 msgid "No folders were found to unsubscribe from!"
 msgstr "¥Õ¥©¥ë¥À¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡§"
 
-#: squirrelmail/src/folders.php:289
+#: squirrelmail/src/folders.php:295
 msgid "No folders were found to subscribe to!"
 msgstr "¥Õ¥©¥ë¥À¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡§"
 
-#: squirrelmail/src/folders_create.php:29
-msgid "Illegal folder name.  Please select a different name."
-msgstr "Àµ¤·¤¯¤Ê¤¤¥Õ¥©¥ë¥À̾¤Ç¤¹¡£°ã¤¦Ì¾Á°¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
-
-#: squirrelmail/src/folders_create.php:29
-#: squirrelmail/src/folders_delete.php:29
-#: squirrelmail/src/folders_rename_getname.php:24
-msgid "Click here to go back"
-msgstr "Ìá¤ë"
-
-#: squirrelmail/src/folders_delete.php:29
-msgid "You have not selected a folder to delete. Please do so."
-msgstr "ºï½ü¤¹¤ë¥Õ¥©¥ë¥À¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
+#: squirrelmail/src/folders.php:300
+msgid "Subscribe to:"
+msgstr "ÅÐÏ¿¤¹¤ë"
 
 #: squirrelmail/src/folders_rename_getname.php:24
 msgid "You have not selected a folder to rename. Please do so."
@@ -550,63 +509,70 @@ msgstr "̾
 msgid "New name:"
 msgstr "¿·¤·¤¤Ì¾Á°"
 
-#: squirrelmail/src/folders_rename_getname.php:62
-#: squirrelmail/src/options_highlight.php:394
 #: squirrelmail/functions/options.php:419
-#: squirrelmail/plugins/filters/options.php:174
-#: squirrelmail/plugins/translate/options.php:160
-#: squirrelmail/plugins/newmail/newmail_opt.php:155
+#: squirrelmail/plugins/filters/options.php:173
+#: squirrelmail/plugins/newmail/newmail_opt.php:154
+#: squirrelmail/plugins/translate/options.php:159
+#: squirrelmail/src/folders_rename_getname.php:62
+#: squirrelmail/src/options_highlight.php:393
 msgid "Submit"
 msgstr "ÅÐÏ¿"
 
-#: squirrelmail/src/help.php:90 squirrelmail/functions/page_header.php:226
-#: squirrelmail/plugins/listcommands/setup.php:39
+#: squirrelmail/functions/page_header.php:227
+#: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:89
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: squirrelmail/src/help.php:129
+#: squirrelmail/src/help.php:128
 #, c-format
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
 "instead."
 msgstr "¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤Ï¤Þ¤À %s ¤ËËÝÌõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£±Ñ¸ì¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£"
 
-#: squirrelmail/src/help.php:135
+#: squirrelmail/src/help.php:134
 msgid "Some or all of the help documents are not present!"
 msgstr "¤¤¤¯¤Ä¤«¤Î¥Ø¥ë¥×¥É¥­¥å¥á¥ó¥È¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: squirrelmail/src/help.php:169 squirrelmail/src/help.php:191
+#: squirrelmail/src/help.php:168 squirrelmail/src/help.php:190
 msgid "Table of Contents"
 msgstr "Ìܼ¡"
 
-#: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:775 squirrelmail/src/read_body.php:777
-#: squirrelmail/functions/mailbox_display.php:978
-#: squirrelmail/functions/mailbox_display.php:981
-#: squirrelmail/functions/mailbox_display.php:984
-#: squirrelmail/plugins/delete_move_next/setup.php:167
-#: squirrelmail/plugins/delete_move_next/setup.php:169
+#: squirrelmail/functions/mailbox_display.php:1013
+#: squirrelmail/functions/mailbox_display.php:1016
+#: squirrelmail/functions/mailbox_display.php:1019
+#: squirrelmail/src/help.php:184 squirrelmail/src/help.php:188
+#: squirrelmail/src/read_body.php:448 squirrelmail/src/read_body.php:450
 msgid "Previous"
 msgstr "Ìá¤ë"
 
-#: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:781 squirrelmail/src/read_body.php:783
-#: squirrelmail/functions/mailbox_display.php:979
-#: squirrelmail/functions/mailbox_display.php:982
-#: squirrelmail/functions/mailbox_display.php:985
-#: squirrelmail/plugins/delete_move_next/setup.php:172
-#: squirrelmail/plugins/delete_move_next/setup.php:174
+#: squirrelmail/functions/mailbox_display.php:1014
+#: squirrelmail/functions/mailbox_display.php:1017
+#: squirrelmail/functions/mailbox_display.php:1020
+#: squirrelmail/src/help.php:192 squirrelmail/src/help.php:195
+#: squirrelmail/src/read_body.php:457 squirrelmail/src/read_body.php:459
 msgid "Next"
 msgstr "¼¡¤Ø"
 
-#: squirrelmail/src/help.php:217
+#: squirrelmail/src/help.php:216
 msgid "Top"
 msgstr "¥È¥Ã¥×"
 
-#: squirrelmail/src/image.php:42
+#: squirrelmail/src/image.php:27
 msgid "Viewing an image attachment"
 msgstr "źÉդΥ¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤òɽ¼¨"
 
+#: squirrelmail/src/image.php:31 squirrelmail/src/vcard.php:36
+#: squirrelmail/src/vcard.php:40 squirrelmail/src/view_header.php:84
+#: squirrelmail/src/view_text.php:36
+msgid "View message"
+msgstr "¥á¥Ã¥»¡¼¥¸¤òɽ¼¨"
+
+#: squirrelmail/plugins/abook_take/setup.php:91 squirrelmail/src/image.php:40
+#: squirrelmail/src/vcard.php:213 squirrelmail/src/view_text.php:40
+msgid "Download this as a file"
+msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É"
+
 #: squirrelmail/src/left_main.php:98 squirrelmail/src/left_main.php:251
 #: squirrelmail/src/left_main.php:326
 msgid "purge"
@@ -618,130 +584,50 @@ msgstr "
 
 #: squirrelmail/src/left_main.php:867
 msgid "Save folder tree"
-msgstr ""
+msgstr "¥Õ¥©¥ë¥À¥Ä¥ê¡¼¤ÎÊݸ"
 
-#: squirrelmail/src/login.php:103 squirrelmail/src/login.php:171
+#: squirrelmail/src/login.php:62 squirrelmail/src/login.php:124
 msgid "Login"
 msgstr "¥í¥°¥¤¥ó"
 
-#: squirrelmail/src/login.php:133
 #: squirrelmail/functions/display_messages.php:164
+#: squirrelmail/src/login.php:87
 #, c-format
 msgid "%s Logo"
 msgstr ""
 
-#: squirrelmail/src/login.php:136
 #: squirrelmail/functions/display_messages.php:167
+#: squirrelmail/src/login.php:90
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr ""
 
-#: squirrelmail/src/login.php:137
 #: squirrelmail/functions/display_messages.php:168
+#: squirrelmail/src/login.php:91
 msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:141
+#: squirrelmail/src/login.php:95
 #, c-format
 msgid "%s Login"
 msgstr ""
 
-#: squirrelmail/src/login.php:149
+#: squirrelmail/src/login.php:103
 msgid "Name:"
 msgstr "¥í¥°¥¤¥ó̾:"
 
-#: squirrelmail/src/login.php:157
 #: squirrelmail/plugins/mail_fetch/options.php:157
 #: squirrelmail/plugins/mail_fetch/options.php:274
+#: squirrelmail/src/login.php:111
 msgid "Password:"
 msgstr "¥Ñ¥¹¥ï¡¼¥É:"
 
-#: squirrelmail/src/move_messages.php:94
-msgid "<No subject>"
-msgstr ""
-
-#: squirrelmail/src/move_messages.php:172
-#: squirrelmail/src/move_messages.php:225
-#: squirrelmail/src/move_messages.php:254
+#: squirrelmail/src/move_messages.php:158
+#: squirrelmail/src/move_messages.php:200
+#: squirrelmail/src/move_messages.php:224
 msgid "No messages were selected."
 msgstr "¥á¥Ã¥»¡¼¥¸¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: squirrelmail/src/options.php:136 squirrelmail/src/options.php:285
-msgid "Personal Information"
-msgstr "¸Ä¿Í¾ðÊó"
-
-#: squirrelmail/src/options.php:142 squirrelmail/src/options.php:293
-msgid "Display Preferences"
-msgstr "ɽ¼¨¥ª¥×¥·¥ç¥ó"
-
-#: squirrelmail/src/options.php:148 squirrelmail/src/options.php:301
-#: squirrelmail/src/options_highlight.php:64
-msgid "Message Highlighting"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥Ï¥¤¥é¥¤¥Èɽ¼¨"
-
-#: squirrelmail/src/options.php:154 squirrelmail/src/options.php:309
-msgid "Folder Preferences"
-msgstr "¥Õ¥©¥ë¥À¤ÎÀßÄê"
-
-#: squirrelmail/src/options.php:160 squirrelmail/src/options.php:317
-#: squirrelmail/src/options_order.php:32
-msgid "Index Order"
-msgstr "ɽ¼¨½ç¤ÎÀßÄê"
-
-#: squirrelmail/src/options.php:200 squirrelmail/src/options_highlight.php:64
-#: squirrelmail/src/options_identities.php:57
-#: squirrelmail/src/options_order.php:32
-#: squirrelmail/functions/page_header.php:222
-#: squirrelmail/plugins/filters/options.php:71
-#: squirrelmail/plugins/translate/options.php:94
-#: squirrelmail/plugins/newmail/newmail_opt.php:38
-msgid "Options"
-msgstr "¥ª¥×¥·¥ç¥ó"
-
-#: squirrelmail/src/options.php:268
-msgid "Successfully Saved Options"
-msgstr "¥ª¥×¥·¥ç¥ó¤òÊݸ¤·¤Þ¤·¤¿¡£"
-
-#: squirrelmail/src/options.php:273
-msgid "Refresh Folder List"
-msgstr "¥ê¥Õ¥ì¥Ã¥·¥å"
-
-#: squirrelmail/src/options.php:275
-msgid "Refresh Page"
-msgstr "²èÌ̤ò¹¹¿·"
-
-#: squirrelmail/src/options.php:287
-msgid ""
-"This contains personal information about yourself such as your name, your "
-"email address, etc."
-msgstr "̾Á°¡¢¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ê¤É¤Î¸Ä¿Í¾ðÊó¤ÎÀßÄê¤ò¤·¤Þ¤¹¡£"
-
-#: squirrelmail/src/options.php:295
-msgid ""
-"You can change the way that SquirrelMail looks and displays information to "
-"you, such as the colors, the language, and other settings."
-msgstr "SquirrelMail¤Î²èÌÌɽ¼¨¤ÎÀßÄê¤ä¸À¸ì¡¢¤½¤Î¾¤ÎÁªÂò¤ò¤·¤Þ¤¹¡£"
-
-#: squirrelmail/src/options.php:303
-msgid ""
-"Based upon given criteria, incoming messages can have different background "
-"colors in the message list.  This helps to easily distinguish who the "
-"messages are from, especially for mailing lists."
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸¤Î¼ïÎàËè¤ËÇطʤòÊѹ¹¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤¬Ã¯¤«¤é¤Îʪ¤«¡¢"
-"¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥á¥Ã¥»¡¼¥¸¤Ê¤Î¤«´Êñ¤Ëʬ¤«¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£"
-
-#: squirrelmail/src/options.php:311
-msgid ""
-"These settings change the way your folders are displayed and manipulated."
-msgstr "¥Õ¥©¥ë¥À¤ÎÀßÄê¤ÎÊѹ¹¤ò¤·¤Þ¤¹¡£"
-
-#: squirrelmail/src/options.php:319
-msgid ""
-"The order of the message index can be rearranged and changed to contain the "
-"headers in any order you want."
-msgstr "¥á¥Ã¥»¡¼¥¸°ìÍ÷¤Îɽ¼¨¹àÌܤνçÈÖ¤òÀßÄꤷ¤Þ¤¹¡£"
-
 #: squirrelmail/src/options_display.php:33
 msgid "General Display Options"
 msgstr "ɽ¼¨¥ª¥×¥·¥ç¥ó"
@@ -750,9 +636,9 @@ msgstr "ɽ
 msgid "Theme"
 msgstr "¥Æ¡¼¥Þ"
 
+#: squirrelmail/plugins/administrator/defines.php:42
 #: squirrelmail/src/options_display.php:52
 #: squirrelmail/src/options_display.php:81
-#: squirrelmail/plugins/administrator/defines.php:42
 msgid "Default"
 msgstr "¥Ç¥Õ¥©¥ë¥È"
 
@@ -846,56 +732,60 @@ msgid "Show HTML Version by Default"
 msgstr "HTML ¥Ñ¡¼¥È¤òÍ¥À褹¤ë"
 
 #: squirrelmail/src/options_display.php:199
-msgid "Include Me in CC when I Reply All"
-msgstr "ÊÖ¿®¤¹¤ë¤È¤­ CC ¤Ë¼«Ê¬¤â´Þ¤á¤ë"
+msgid "Enable Forward as Attachment"
+msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤È¤·¤ÆžÁ÷¤òÍ­¸ú"
 
 #: squirrelmail/src/options_display.php:206
-msgid "Include CCs when forwarding messages"
+msgid "Include CCs when Forwarding Messages"
 msgstr "¥Õ¥©¥ï¡¼¥É¤¹¤ë¤È¤­¤ËCC¤Î°¸Àè¤â´Þ¤á¤ë"
 
 #: squirrelmail/src/options_display.php:213
+msgid "Include Me in CC when I Reply All"
+msgstr "ÊÖ¿®¤¹¤ë¤È¤­ CC ¤Ë¼«Ê¬¤â´Þ¤á¤ë"
+
+#: squirrelmail/src/options_display.php:220
 msgid "Enable Mailer Display"
 msgstr "¥á¡¼¥é¤òɽ¼¨"
 
-#: squirrelmail/src/options_display.php:220
+#: squirrelmail/src/options_display.php:227
 msgid "Display Attached Images with Message"
 msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤Î¥¤¥á¡¼¥¸¤òɽ¼¨¤¹¤ë"
 
-#: squirrelmail/src/options_display.php:227
+#: squirrelmail/src/options_display.php:234
 msgid "Enable Subtle Printer Friendly Link"
 msgstr "°õºþÍѤΥê¥ó¥¯¤òɽ¼¨¤¹¤ë"
 
-#: squirrelmail/src/options_display.php:234
+#: squirrelmail/src/options_display.php:241
 msgid "Enable Printer Friendly Clean Display"
 msgstr "¥×¥ê¥ó¥¿ÍÑɽ¼¨¤ò¤è¤ê´Ê·é¤Ë"
 
-#: squirrelmail/src/options_display.php:242
-msgid "Enable request/confirm reading"
-msgstr "¼õ¼èÄÌÃε¡Ç½¤ò»ÈÍѤ¹¤ë"
+#: squirrelmail/src/options_display.php:249
+msgid "Enable Mail Delivery Notification"
+msgstr "¥á¡¼¥ëÇÛÁ÷ÄÌÃΤòÍ­¸ú¤Ë"
 
-#: squirrelmail/src/options_display.php:250
-msgid "Always compose in a new window"
+#: squirrelmail/src/options_display.php:257
+msgid "Compose Messages in New Window"
 msgstr "¥á¡¼¥ëºîÀ®¤Ï¿·µ¬¥¦¥¤¥ó¥É¥¦¤Ç"
 
-#: squirrelmail/src/options_display.php:257
-msgid "Width of compose window"
+#: squirrelmail/src/options_display.php:264
+msgid "Width of Compose Window"
 msgstr "¥á¡¼¥ëºîÀ®¥¦¥¤¥ó¥É¥¦¤ÎÉý"
 
-#: squirrelmail/src/options_display.php:265
-msgid "Height of compose window"
+#: squirrelmail/src/options_display.php:272
+msgid "Height of Compose Window"
 msgstr "¥á¡¼¥ëºîÀ®¥¦¥¤¥ó¥É¥¦¤Î¹â¤µ<"
 
-#: squirrelmail/src/options_display.php:273
-msgid "Append signature before reply/forward text"
-msgstr "½ð̾¤òÊÖ¿®¡¿Å¾Á÷¤¹¤ëʸ½ñ¤ÎÁ°¤ËÆþ¤ì¤ë"
-
 #: squirrelmail/src/options_display.php:280
-msgid "Use receive date for sort"
-msgstr "¥½¡¼¥È¡Ê°ìÍ÷ɽ¼¨¡Ë¤Ë¼õ¿®ÆüÉÕ¤ò»ÈÍѤ¹¤ë"
+msgid "Append Signature before Reply/Forward Text"
+msgstr "½ð̾¤òÊÖ¿®¡¿Å¾Á÷¤¹¤ëʸ½ñ¤ÎÁ°¤ËÆþ¤ì¤ë"
 
 #: squirrelmail/src/options_display.php:287
-msgid "Use References header for thread sort"
-msgstr "References¥Ø¥Ã¥À¡¼¤Ç¥¹¥ì¥Ã¥É¤òʤÙÊѤ¨¤ë"
+msgid "Enable Sort by of Receive Date"
+msgstr "¼õ¿®ÆüÉդǥ½¡¼¥È¤òÍ­¸ú"
+
+#: squirrelmail/src/options_display.php:294
+msgid "Enable Thread Sort by References Header"
+msgstr "¥¹¥ì¥Ã¥É¤Î¥½¡¼¥È¤ËReferences¥Ø¥Ã¥À¤ò»È¤¦"
 
 #: squirrelmail/src/options_folder.php:40
 msgid "Special Folder Options"
@@ -909,8 +799,8 @@ msgstr "
 msgid "Do not use Trash"
 msgstr "Trash¤ò»ÈÍѤ·¤Ê¤¤"
 
-#: squirrelmail/src/options_folder.php:67
 #: squirrelmail/plugins/administrator/defines.php:135
+#: squirrelmail/src/options_folder.php:67
 msgid "Trash Folder"
 msgstr "Trash¥Õ¥©¥ë¥À"
 
@@ -918,8 +808,8 @@ msgstr "Trash
 msgid "Do not use Sent"
 msgstr "Sent¤ò»ÈÍѤ·¤Ê¤¤"
 
-#: squirrelmail/src/options_folder.php:78
 #: squirrelmail/plugins/administrator/defines.php:138
+#: squirrelmail/src/options_folder.php:78
 msgid "Sent Folder"
 msgstr "Sent¥Õ¥©¥ë¥À"
 
@@ -927,8 +817,8 @@ msgstr "Sent
 msgid "Do not use Drafts"
 msgstr "Trash¤ò»ÈÍѤ·¤Ê¤¤"
 
-#: squirrelmail/src/options_folder.php:89
 #: squirrelmail/plugins/administrator/defines.php:141
+#: squirrelmail/src/options_folder.php:89
 msgid "Draft Folder"
 msgstr "Draft ¥Õ¥©¥ë¥À"
 
@@ -948,8 +838,8 @@ msgstr "
 msgid "Right"
 msgstr "±¦"
 
-#: squirrelmail/src/options_folder.php:111
 #: squirrelmail/plugins/administrator/defines.php:45
+#: squirrelmail/src/options_folder.php:111
 msgid "pixels"
 msgstr "¥Ô¥¯¥»¥ë"
 
@@ -977,18 +867,18 @@ msgstr "
 msgid "Enable Unread Message Notification"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤ÎÄÌÃÎ"
 
-#: squirrelmail/src/options_folder.php:145
 #: squirrelmail/plugins/administrator/defines.php:162
+#: squirrelmail/src/options_folder.php:145
 msgid "No Notification"
 msgstr "ÄÌÃΤ·¤Ê¤¤"
 
-#: squirrelmail/src/options_folder.php:146
 #: squirrelmail/plugins/administrator/defines.php:163
+#: squirrelmail/src/options_folder.php:146
 msgid "Only INBOX"
 msgstr "INBOX¤À¤±"
 
-#: squirrelmail/src/options_folder.php:147
 #: squirrelmail/plugins/administrator/defines.php:164
+#: squirrelmail/src/options_folder.php:147
 msgid "All Folders"
 msgstr "Á´¥Õ¥©¥ë¥À"
 
@@ -996,13 +886,13 @@ msgstr "
 msgid "Unread Message Notification Type"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤ÎÄÌÃΤΥ¿¥¤¥×"
 
-#: squirrelmail/src/options_folder.php:155
 #: squirrelmail/plugins/administrator/defines.php:167
+#: squirrelmail/src/options_folder.php:155
 msgid "Only Unseen"
 msgstr "̤ÆɤΤß"
 
-#: squirrelmail/src/options_folder.php:156
 #: squirrelmail/plugins/administrator/defines.php:168
+#: squirrelmail/src/options_folder.php:156
 msgid "Unseen and Total"
 msgstr "̤Æɤȹç·×"
 
@@ -1034,116 +924,131 @@ msgstr "
 msgid "Memory Search"
 msgstr "¸¡º÷¤Îµ­²±"
 
-#: squirrelmail/src/options_folder.php:193
 #: squirrelmail/plugins/sent_subfolders/setup.php:102
+#: squirrelmail/src/options_folder.php:193
 msgid "Disabled"
 msgstr "̵¸ú"
 
-#: squirrelmail/src/options_highlight.php:72
-#: squirrelmail/plugins/filters/options.php:100
+#: squirrelmail/functions/page_header.php:223
+#: squirrelmail/plugins/filters/options.php:70
+#: squirrelmail/plugins/newmail/newmail_opt.php:37
+#: squirrelmail/plugins/translate/options.php:93
+#: squirrelmail/src/options.php:201 squirrelmail/src/options_highlight.php:64
+#: squirrelmail/src/options_identities.php:57
+#: squirrelmail/src/options_order.php:32 squirrelmail/src/read_body.php:523
+msgid "Options"
+msgstr "¥ª¥×¥·¥ç¥ó"
+
+#: squirrelmail/src/options.php:149 squirrelmail/src/options.php:301
+#: squirrelmail/src/options_highlight.php:64
+msgid "Message Highlighting"
+msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥Ï¥¤¥é¥¤¥Èɽ¼¨"
+
+#: squirrelmail/plugins/filters/options.php:99
+#: squirrelmail/src/options_highlight.php:71
 msgid "New"
 msgstr "¿·µ¬"
 
-#: squirrelmail/src/options_highlight.php:73
-#: squirrelmail/plugins/filters/options.php:101
+#: squirrelmail/plugins/filters/options.php:100
 #: squirrelmail/plugins/filters/spamoptions.php:180
 #: squirrelmail/plugins/mail_fetch/fetch.php:283
+#: squirrelmail/src/options_highlight.php:72
 msgid "Done"
 msgstr "´°Î»"
 
-#: squirrelmail/src/options_highlight.php:89
-#: squirrelmail/src/options_highlight.php:378
-#: squirrelmail/plugins/filters/options.php:131
+#: squirrelmail/plugins/filters/options.php:130
+#: squirrelmail/src/options_highlight.php:88
+#: squirrelmail/src/options_highlight.php:377
 msgid "To or Cc"
 msgstr "To ¤Þ¤¿¤Ï Cc"
 
-#: squirrelmail/src/options_highlight.php:92
+#: squirrelmail/src/options_highlight.php:91
 msgid "subject"
 msgstr ""
 
-#: squirrelmail/src/options_highlight.php:99
-#: squirrelmail/plugins/filters/options.php:191
+#: squirrelmail/plugins/filters/options.php:189
 #: squirrelmail/plugins/filters/spamoptions.php:179
+#: squirrelmail/src/options_highlight.php:98
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: squirrelmail/src/options_highlight.php:115
+#: squirrelmail/src/options_highlight.php:114
 msgid "No highlighting is defined"
 msgstr "¥Ï¥¤¥é¥¤¥Èɽ¼¨¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: squirrelmail/src/options_highlight.php:308
+#: squirrelmail/src/options_highlight.php:307
 msgid "Identifying name"
 msgstr "̾Á°"
 
-#: squirrelmail/src/options_highlight.php:321
+#: squirrelmail/src/options_highlight.php:320
 msgid "Color"
 msgstr "¿§"
 
-#: squirrelmail/src/options_highlight.php:324
+#: squirrelmail/src/options_highlight.php:323
 msgid "Dark Blue"
 msgstr "Ç»¤¤ÀÄ"
 
-#: squirrelmail/src/options_highlight.php:325
+#: squirrelmail/src/options_highlight.php:324
 msgid "Dark Green"
 msgstr "Ç»¤¤ÎÐ"
 
-#: squirrelmail/src/options_highlight.php:326
+#: squirrelmail/src/options_highlight.php:325
 msgid "Dark Yellow"
 msgstr "Ç»¤¤²«¿§"
 
-#: squirrelmail/src/options_highlight.php:327
+#: squirrelmail/src/options_highlight.php:326
 msgid "Dark Cyan"
 msgstr "Ç»¤¤¿å¿§"
 
-#: squirrelmail/src/options_highlight.php:328
+#: squirrelmail/src/options_highlight.php:327
 msgid "Dark Magenta"
 msgstr "Ç»¤¤»ç"
 
-#: squirrelmail/src/options_highlight.php:329
+#: squirrelmail/src/options_highlight.php:328
 msgid "Light Blue"
 msgstr "ÌÀ¤ë¤¤ÀÄ"
 
-#: squirrelmail/src/options_highlight.php:330
+#: squirrelmail/src/options_highlight.php:329
 msgid "Light Green"
 msgstr "ÌÀ¤ë¤¤ÎÐ"
 
-#: squirrelmail/src/options_highlight.php:331
+#: squirrelmail/src/options_highlight.php:330
 msgid "Light Yellow"
 msgstr "ÌÀ¤ë¤¤²«¿§"
 
-#: squirrelmail/src/options_highlight.php:332
+#: squirrelmail/src/options_highlight.php:331
 msgid "Light Cyan"
 msgstr "ÌÀ¤ë¤¤¿å¿§"
 
-#: squirrelmail/src/options_highlight.php:333
+#: squirrelmail/src/options_highlight.php:332
 msgid "Light Magenta"
 msgstr "ÌÀ¤ë¤¤»ç"
 
-#: squirrelmail/src/options_highlight.php:334
+#: squirrelmail/src/options_highlight.php:333
 msgid "Dark Gray"
 msgstr "Ç»¤¤³¥¿§"
 
-#: squirrelmail/src/options_highlight.php:335
+#: squirrelmail/src/options_highlight.php:334
 msgid "Medium Gray"
 msgstr "³¥¿§"
 
-#: squirrelmail/src/options_highlight.php:336
+#: squirrelmail/src/options_highlight.php:335
 msgid "Light Gray"
 msgstr "ÌÀ¤ë¤¤³¥¿§"
 
-#: squirrelmail/src/options_highlight.php:337
+#: squirrelmail/src/options_highlight.php:336
 msgid "White"
 msgstr "Çò"
 
-#: squirrelmail/src/options_highlight.php:339
+#: squirrelmail/src/options_highlight.php:338
 msgid "Other:"
 msgstr "¤½¤Î¾:"
 
-#: squirrelmail/src/options_highlight.php:341
+#: squirrelmail/src/options_highlight.php:340
 msgid "Ex: 63aa7f"
 msgstr "Îã: 63aa7f"
 
-#: squirrelmail/src/options_highlight.php:383
+#: squirrelmail/src/options_highlight.php:382
 msgid "Matches"
 msgstr "°ìÃ×"
 
@@ -1191,6 +1096,11 @@ msgstr "
 msgid "Move Up"
 msgstr "°ÜÆ°"
 
+#: squirrelmail/src/options.php:161 squirrelmail/src/options.php:317
+#: squirrelmail/src/options_order.php:32
+msgid "Index Order"
+msgstr "ɽ¼¨½ç¤ÎÀßÄê"
+
 #: squirrelmail/src/options_order.php:37
 msgid "Checkbox"
 msgstr "¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹"
@@ -1199,8 +1109,8 @@ msgstr "
 msgid "Flags"
 msgstr "¥Õ¥é¥°"
 
+#: squirrelmail/functions/mailbox_display.php:844
 #: squirrelmail/src/options_order.php:42
-#: squirrelmail/functions/mailbox_display.php:820
 msgid "Size"
 msgstr ""
 
@@ -1296,25 +1206,81 @@ msgstr "
 msgid "Signature Options"
 msgstr "½ð̾¥ª¥×¥·¥ç¥ó"
 
-#: squirrelmail/src/options_personal.php:181
-msgid "Use Signature"
-msgstr "½ð̾¤ò»È¤¦"
+#: squirrelmail/src/options_personal.php:181
+msgid "Use Signature"
+msgstr "½ð̾¤ò»È¤¦"
+
+#: squirrelmail/src/options_personal.php:188
+msgid "Prefix Signature with '-- ' Line"
+msgstr "½ð̾¤ÎÁ°¤Ë '--' ¤òÉÕ¤±¤ë¡£"
+
+#: squirrelmail/src/options.php:137 squirrelmail/src/options.php:285
+msgid "Personal Information"
+msgstr "¸Ä¿Í¾ðÊó"
+
+#: squirrelmail/src/options.php:143 squirrelmail/src/options.php:293
+msgid "Display Preferences"
+msgstr "ɽ¼¨¥ª¥×¥·¥ç¥ó"
+
+#: squirrelmail/src/options.php:155 squirrelmail/src/options.php:309
+msgid "Folder Preferences"
+msgstr "¥Õ¥©¥ë¥À¤ÎÀßÄê"
+
+#: squirrelmail/src/options.php:268
+msgid "Successfully Saved Options"
+msgstr "¥ª¥×¥·¥ç¥ó¤òÊݸ¤·¤Þ¤·¤¿¡£"
+
+#: squirrelmail/src/options.php:273
+msgid "Refresh Folder List"
+msgstr "¥ê¥Õ¥ì¥Ã¥·¥å"
+
+#: squirrelmail/src/options.php:275
+msgid "Refresh Page"
+msgstr "²èÌ̤ò¹¹¿·"
+
+#: squirrelmail/src/options.php:287
+msgid ""
+"This contains personal information about yourself such as your name, your "
+"email address, etc."
+msgstr "̾Á°¡¢¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ê¤É¤Î¸Ä¿Í¾ðÊó¤ÎÀßÄê¤ò¤·¤Þ¤¹¡£"
+
+#: squirrelmail/src/options.php:295
+msgid ""
+"You can change the way that SquirrelMail looks and displays information to "
+"you, such as the colors, the language, and other settings."
+msgstr "SquirrelMail¤Î²èÌÌɽ¼¨¤ÎÀßÄê¤ä¸À¸ì¡¢¤½¤Î¾¤ÎÁªÂò¤ò¤·¤Þ¤¹¡£"
+
+#: squirrelmail/src/options.php:303
+msgid ""
+"Based upon given criteria, incoming messages can have different background "
+"colors in the message list.  This helps to easily distinguish who the "
+"messages are from, especially for mailing lists."
+msgstr ""
+"¥á¥Ã¥»¡¼¥¸¤Î¼ïÎàËè¤ËÇطʤòÊѹ¹¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤¬Ã¯¤«¤é¤Îʪ¤«¡¢"
+"¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥á¥Ã¥»¡¼¥¸¤Ê¤Î¤«´Êñ¤Ëʬ¤«¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£"
+
+#: squirrelmail/src/options.php:311
+msgid ""
+"These settings change the way your folders are displayed and manipulated."
+msgstr "¥Õ¥©¥ë¥À¤ÎÀßÄê¤ÎÊѹ¹¤ò¤·¤Þ¤¹¡£"
 
-#: squirrelmail/src/options_personal.php:188
-msgid "Prefix Signature with '-- ' Line"
-msgstr "½ð̾¤ÎÁ°¤Ë '--' ¤òÉÕ¤±¤ë¡£"
+#: squirrelmail/src/options.php:319
+msgid ""
+"The order of the message index can be rearranged and changed to contain the "
+"headers in any order you want."
+msgstr "¥á¥Ã¥»¡¼¥¸°ìÍ÷¤Îɽ¼¨¹àÌܤνçÈÖ¤òÀßÄꤷ¤Þ¤¹¡£"
 
-#: squirrelmail/src/printer_friendly_bottom.php:64
+#: squirrelmail/src/printer_friendly_bottom.php:58
 msgid "Message not printable"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤Ç¤­¤Þ¤»¤ó"
 
-#: squirrelmail/src/printer_friendly_bottom.php:93
+#: squirrelmail/src/printer_friendly_bottom.php:87
 #: squirrelmail/src/printer_friendly_main.php:15
 #: squirrelmail/src/printer_friendly_top.php:22
 msgid "Printer Friendly"
 msgstr "°õºþÍÑ"
 
-#: squirrelmail/src/printer_friendly_bottom.php:108
+#: squirrelmail/src/printer_friendly_bottom.php:110
 msgid "CC"
 msgstr ""
 
@@ -1322,155 +1288,176 @@ msgstr ""
 msgid "Print"
 msgstr "°õºþ"
 
-#: squirrelmail/src/printer_friendly_top.php:39
-#: squirrelmail/plugins/newmail/newmail.php:33
-msgid "Close Window"
-msgstr "ÊĤ¸¤ë"
-
-#: squirrelmail/src/read_body.php:156
+#: squirrelmail/src/read_body.php:131
 msgid "View Printable Version"
 msgstr "°õºþÍѥС¼¥¸¥ç¥ó"
 
-#: squirrelmail/src/read_body.php:219
+#: squirrelmail/src/read_body.php:182
 msgid "Your message"
 msgstr "¤¢¤Ê¤¿¤Î¥á¥Ã¥»¡¼¥¸¡§"
 
-#: squirrelmail/src/read_body.php:222
+#: squirrelmail/src/read_body.php:185
 msgid "Sent:"
 msgstr "Á÷¿®ºÑ"
 
-#: squirrelmail/src/read_body.php:224
+#: squirrelmail/src/read_body.php:187
 #, c-format
 msgid "Was displayed on %s"
 msgstr "%s ¤ËÆɤޤì¤Þ¤·¤¿¡£"
 
-#: squirrelmail/src/read_body.php:256
+#: squirrelmail/src/read_body.php:217
 msgid "Read:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:426
-msgid "Viewing Full Header"
-msgstr "Á´¥Ø¥Ã¥Àɽ¼¨"
+#: squirrelmail/src/read_body.php:291
+msgid "less"
+msgstr "¾Êά"
+
+#: squirrelmail/src/read_body.php:293
+msgid "more"
+msgstr "Á´Éô"
+
+#: squirrelmail/functions/mime.php:408 squirrelmail/src/read_body.php:320
+msgid "Unknown sender"
+msgstr "Á÷¿®¼ÔÉÔÌÀ"
+
+#: squirrelmail/src/read_body.php:332
+msgid "Mailer"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:338 squirrelmail/src/read_body.php:357
+#: squirrelmail/src/read_body.php:360
+msgid "Read receipt"
+msgstr "¼õ¼èÄÌÃÎ"
+
+#: squirrelmail/src/read_body.php:338
+msgid "send"
+msgstr "Á÷¿®ºÑ"
+
+#: squirrelmail/src/read_body.php:349
+msgid ""
+"The message sender has requested a response to indicate that you have read "
+"this message. Would you like to send a receipt?"
+msgstr ""
+"¥á¥Ã¥»¡¼¥¸Á÷¿®¼Ô¤Ï¡¢¤¢¤Ê¤¿¤¬¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÆɤó¤À¤³¤È¤òÏ¢Íí¤¹¤ë¤³¤È¤òÍ׵ᤷ"
+"¤Þ¤·¤¿¡£¼õ¼èÄÌÃΤòÁ÷¿®¤·¤Þ¤¹¤«¡©"
+
+#: squirrelmail/src/read_body.php:357 squirrelmail/src/read_body.php:360
+msgid "requested"
+msgstr "Í×µá"
+
+#: squirrelmail/src/read_body.php:358
+msgid "Send read receipt now"
+msgstr "¼õ¼èÄÌÃΤòľ¤°¤ËÁ÷¿®¤¹¤ë"
 
-#: squirrelmail/src/read_body.php:721
+#: squirrelmail/src/read_body.php:397
+msgid "Search results"
+msgstr "¸¡º÷·ë²Ì"
+
+#: squirrelmail/src/read_body.php:401
 msgid "Message List"
 msgstr "¥á¥Ã¥»¡¼¥¸°ìÍ÷"
 
-#: squirrelmail/src/read_body.php:743
+#: squirrelmail/src/read_body.php:424
 msgid "Resume Draft"
 msgstr "ÊÔ½¸¤ò³¤±¤ë"
 
-#: squirrelmail/src/read_body.php:758
+#: squirrelmail/src/read_body.php:427
 msgid "Edit Message as New"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸"
 
-#: squirrelmail/src/read_body.php:804
-#: squirrelmail/functions/mailbox_display.php:728
+#: squirrelmail/src/read_body.php:464
+msgid "View Message"
+msgstr "¥á¥Ã¥»¡¼¥¸¤òɽ¼¨"
+
+#: squirrelmail/plugins/filters/options.php:206
+#: squirrelmail/src/read_body.php:470
+msgid "Up"
+msgstr "¢¬"
+
+#: squirrelmail/functions/mailbox_display.php:713
+#: squirrelmail/src/read_body.php:478 squirrelmail/src/read_body.php:480
 msgid "Forward"
 msgstr "žÁ÷"
 
-#: squirrelmail/src/read_body.php:819
+#: squirrelmail/src/read_body.php:488 squirrelmail/src/read_body.php:490
+msgid "Forward as Attachment"
+msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤È¤·¤ÆžÁ÷"
+
+#: squirrelmail/src/read_body.php:499 squirrelmail/src/read_body.php:501
 msgid "Reply"
 msgstr "ÊÖ¿®"
 
-#: squirrelmail/src/read_body.php:834
+#: squirrelmail/src/read_body.php:508 squirrelmail/src/read_body.php:510
 msgid "Reply All"
 msgstr "Á´°÷¤ËÊÖ¿®"
 
-#: squirrelmail/src/read_body.php:855 squirrelmail/src/read_body.php:858
-msgid "View Full Header"
-msgstr "¥Ø¥Ã¥À¤Îɽ¼¨"
-
-#: squirrelmail/src/read_body.php:926
-msgid "Mailer"
-msgstr ""
-
-#: squirrelmail/src/read_body.php:971 squirrelmail/src/read_body.php:983
-#: squirrelmail/src/read_body.php:994 squirrelmail/src/read_body.php:1016
-#: squirrelmail/src/read_body.php:1058 squirrelmail/src/read_body.php:1073
-msgid "Read receipt"
-msgstr "¼õ¼èÄÌÃÎ"
-
-#: squirrelmail/src/read_body.php:973 squirrelmail/src/read_body.php:1060
-msgid "send"
-msgstr "Á÷¿®ºÑ"
-
-#: squirrelmail/src/read_body.php:985 squirrelmail/src/read_body.php:996
-#: squirrelmail/src/read_body.php:1018 squirrelmail/src/read_body.php:1075
-msgid "requested"
-msgstr "Í×µá"
-
-#: squirrelmail/src/read_body.php:996 squirrelmail/src/read_body.php:1018
-#: squirrelmail/src/read_body.php:1075
-msgid "Send read receipt now"
-msgstr "¼õ¼èÄÌÃΤòľ¤°¤ËÁ÷¿®¤¹¤ë"
-
-#: squirrelmail/src/read_body.php:1008
-msgid ""
-"The message sender has requested a response to indicate that you have read "
-"this message. Would you like to send a receipt?"
-msgstr ""
-"¥á¥Ã¥»¡¼¥¸Á÷¿®¼Ô¤Ï¡¢¤¢¤Ê¤¿¤¬¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÆɤó¤À¤³¤È¤òÏ¢Íí¤¹¤ë¤³¤È¤òÍ׵ᤷ"
-"¤Þ¤·¤¿¡£¼õ¼èÄÌÃΤòÁ÷¿®¤·¤Þ¤¹¤«¡©"
+#: squirrelmail/src/read_body.php:670
+msgid "Attachments"
+msgstr "źÉÕ¥Õ¥¡¥¤¥ë"
 
-#: squirrelmail/src/redirect.php:64 squirrelmail/src/redirect.php:86
-#: squirrelmail/functions/auth.php:20
+#: squirrelmail/functions/auth.php:34 squirrelmail/src/redirect.php:65
+#: squirrelmail/src/redirect.php:87
 msgid "You must be logged in to access this page."
 msgstr "¤³¤Î¥Ú¡¼¥¸¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¥¢¥«¥¦¥ó¥È¤¬É¬ÍפǤ¹¡£"
 
-#: squirrelmail/src/redirect.php:82
+#: squirrelmail/src/redirect.php:83
 msgid "There was an error contacting the mail server."
 msgstr "¥á¡¼¥ë¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
-#: squirrelmail/src/redirect.php:84
+#: squirrelmail/src/redirect.php:85
 msgid "Contact your administrator for help."
 msgstr "´ÉÍý¼Ô¤ËÏ¢Íí¤ò¼è¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: squirrelmail/src/search.php:252
+#: squirrelmail/src/search.php:172
+msgid "Folder:"
+msgstr "¥Õ¥©¥ë¥À:"
+
+#: squirrelmail/src/search.php:283
 msgid "edit"
 msgstr "ÊÔ½¸"
 
-#: squirrelmail/src/search.php:259 squirrelmail/src/search.php:305
+#: squirrelmail/src/search.php:290 squirrelmail/src/search.php:335
 msgid "search"
 msgstr "¸¡º÷"
 
-#: squirrelmail/src/search.php:262
+#: squirrelmail/src/search.php:293
 msgid "delete"
 msgstr "ºï½ü"
 
-#: squirrelmail/src/search.php:274
+#: squirrelmail/src/search.php:304
 msgid "Recent Searches"
 msgstr "¸½ºß¤Î¸¡º÷"
 
-#: squirrelmail/src/search.php:297
+#: squirrelmail/src/search.php:327
 msgid "save"
 msgstr "Êݸ"
 
-#: squirrelmail/src/search.php:308
+#: squirrelmail/src/search.php:338
 msgid "forget"
 msgstr "ÇË´þ"
 
-#: squirrelmail/src/search.php:317
+#: squirrelmail/src/search.php:370
 msgid "Current Search"
 msgstr "¸½ºß¤Î¸¡º÷"
 
-#: squirrelmail/src/search.php:358
+#: squirrelmail/src/search.php:411
 msgid "Body"
 msgstr "ËÜʸ"
 
-#: squirrelmail/src/search.php:359
+#: squirrelmail/src/search.php:412
 msgid "Everywhere"
 msgstr "Á´ÂÎ"
 
-#: squirrelmail/src/search.php:390 squirrelmail/src/search.php:419
+#: squirrelmail/src/search.php:443 squirrelmail/src/search.php:473
 msgid "Search Results"
 msgstr "¸¡º÷·ë²Ì"
 
-#: squirrelmail/src/search.php:410
-msgid "No Messages found"
+#: squirrelmail/src/search.php:465 squirrelmail/src/search.php:480
+msgid "No Messages Found"
 msgstr "ɽ¼¨¤¹¤ë¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: squirrelmail/src/signout.php:76 squirrelmail/functions/page_header.php:205
+#: squirrelmail/functions/page_header.php:206 squirrelmail/src/signout.php:76
 msgid "Sign Out"
 msgstr "¥í¥°¥¢¥¦¥È"
 
@@ -1534,6 +1521,14 @@ msgstr "
 msgid "Title & Org. / Dept."
 msgstr "¸ª½ñ/½ê°¤Ê¤É"
 
+#: squirrelmail/src/view_header.php:81
+msgid "Viewing Full Header"
+msgstr "Á´¥Ø¥Ã¥Àɽ¼¨"
+
+#: squirrelmail/src/view_text.php:35
+msgid "Viewing a text attachment"
+msgstr "¥Æ¥­¥¹¥È¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤òɽ¼¨"
+
 #: squirrelmail/functions/abook_database.php:50
 #: squirrelmail/functions/abook_local_file.php:37
 #: squirrelmail/functions/addressbook.php:155
@@ -1558,9 +1553,9 @@ msgstr "
 #: squirrelmail/functions/abook_local_file.php:267
 #: squirrelmail/functions/abook_local_file.php:292
 #: squirrelmail/functions/abook_local_file.php:324
-#: squirrelmail/functions/addressbook.php:351
-#: squirrelmail/functions/addressbook.php:386
-#: squirrelmail/functions/addressbook.php:439
+#: squirrelmail/functions/addressbook.php:371
+#: squirrelmail/functions/addressbook.php:406
+#: squirrelmail/functions/addressbook.php:459
 msgid "Addressbook is read-only"
 msgstr "¥¢¥É¥ì¥¹Ä¢¤ÏÆɹþÀìÍѤǤ¹¡£"
 
@@ -1629,145 +1624,145 @@ msgstr "
 msgid "Error initializing LDAP server %s:"
 msgstr "%s ¤Î LDAP¥µ¡¼¥Ð¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£:"
 
-#: squirrelmail/functions/addressbook.php:329
-#: squirrelmail/functions/addressbook.php:416
+#: squirrelmail/functions/addressbook.php:349
+#: squirrelmail/functions/addressbook.php:436
 msgid "Invalid input data"
 msgstr "ÆþÎϥǡ¼¥¿¤¬°Û¾ï¤Ç¤¹¡£"
 
-#: squirrelmail/functions/addressbook.php:333
-#: squirrelmail/functions/addressbook.php:420
+#: squirrelmail/functions/addressbook.php:353
+#: squirrelmail/functions/addressbook.php:440
 msgid "Name is missing"
 msgstr "̾Á°¤¬ÆþÎϤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: squirrelmail/functions/addressbook.php:337
-#: squirrelmail/functions/addressbook.php:424
+#: squirrelmail/functions/addressbook.php:357
+#: squirrelmail/functions/addressbook.php:444
 msgid "E-mail address is missing"
 msgstr "¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬ÆþÎϤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: squirrelmail/functions/addressbook.php:345
-#: squirrelmail/functions/addressbook.php:429
+#: squirrelmail/functions/addressbook.php:365
+#: squirrelmail/functions/addressbook.php:449
 msgid "Nickname contains illegal characters"
 msgstr "¥Ë¥Ã¥¯¥Í¡¼¥à¤Ë»ÈÍѽÐÍè¤Ê¤¤Ê¸»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: squirrelmail/functions/attachment_common.php:107
-#: squirrelmail/functions/attachment_common.php:128
-#: squirrelmail/functions/attachment_common.php:143
-#: squirrelmail/functions/attachment_common.php:168
+#: squirrelmail/functions/attachment_common.php:105
+#: squirrelmail/functions/attachment_common.php:125
+#: squirrelmail/functions/attachment_common.php:142
+#: squirrelmail/functions/attachment_common.php:163
 msgid "view"
 msgstr "ɽ¼¨"
 
-#: squirrelmail/functions/attachment_common.php:185
+#: squirrelmail/functions/attachment_common.php:178
 msgid "Business Card"
 msgstr "̾»É"
 
-#: squirrelmail/functions/date.php:92
+#: squirrelmail/functions/date.php:113
 #: squirrelmail/plugins/calendar/calendar.php:59
 msgid "Sunday"
 msgstr "Æü"
 
-#: squirrelmail/functions/date.php:95
+#: squirrelmail/functions/date.php:116
 #: squirrelmail/plugins/calendar/calendar.php:60
 msgid "Monday"
 msgstr "·î"
 
-#: squirrelmail/functions/date.php:98
+#: squirrelmail/functions/date.php:119
 #: squirrelmail/plugins/calendar/calendar.php:61
 msgid "Tuesday"
 msgstr "²Ð"
 
-#: squirrelmail/functions/date.php:101
+#: squirrelmail/functions/date.php:122
 #: squirrelmail/plugins/calendar/calendar.php:62
 msgid "Wednesday"
 msgstr "¿å"
 
-#: squirrelmail/functions/date.php:104
+#: squirrelmail/functions/date.php:125
 #: squirrelmail/plugins/calendar/calendar.php:63
 msgid "Thursday"
 msgstr "ÌÚ"
 
-#: squirrelmail/functions/date.php:107
+#: squirrelmail/functions/date.php:128
 #: squirrelmail/plugins/calendar/calendar.php:64
 msgid "Friday"
 msgstr "¶â"
 
-#: squirrelmail/functions/date.php:110
+#: squirrelmail/functions/date.php:131
 #: squirrelmail/plugins/calendar/calendar.php:65
 msgid "Saturday"
 msgstr "ÅÚ"
 
-#: squirrelmail/functions/date.php:121
+#: squirrelmail/functions/date.php:142
 msgid "January"
 msgstr " 1"
 
-#: squirrelmail/functions/date.php:124
+#: squirrelmail/functions/date.php:145
 msgid "February"
 msgstr " 2"
 
-#: squirrelmail/functions/date.php:127
+#: squirrelmail/functions/date.php:148
 msgid "March"
 msgstr " 3"
 
-#: squirrelmail/functions/date.php:130
+#: squirrelmail/functions/date.php:151
 msgid "April"
 msgstr " 4"
 
-#: squirrelmail/functions/date.php:133
+#: squirrelmail/functions/date.php:154
 msgid "May"
 msgstr " 5"
 
-#: squirrelmail/functions/date.php:136
+#: squirrelmail/functions/date.php:157
 msgid "June"
 msgstr " 6"
 
-#: squirrelmail/functions/date.php:139
+#: squirrelmail/functions/date.php:160
 msgid "July"
 msgstr " 7"
 
-#: squirrelmail/functions/date.php:142
+#: squirrelmail/functions/date.php:163
 msgid "August"
 msgstr " 8"
 
-#: squirrelmail/functions/date.php:145
+#: squirrelmail/functions/date.php:166
 msgid "September"
 msgstr " 9"
 
-#: squirrelmail/functions/date.php:148
+#: squirrelmail/functions/date.php:169
 msgid "October"
 msgstr "10"
 
-#: squirrelmail/functions/date.php:151
+#: squirrelmail/functions/date.php:172
 msgid "November"
 msgstr "11"
 
-#: squirrelmail/functions/date.php:154
+#: squirrelmail/functions/date.php:175
 msgid "December"
 msgstr "12"
 
-#: squirrelmail/functions/date.php:183
+#: squirrelmail/functions/date.php:208
 msgid "D, F j, Y g:i a"
 msgstr "Yǯ F·î jÆü (D) g:i a"
 
-#: squirrelmail/functions/date.php:185
+#: squirrelmail/functions/date.php:210
 msgid "D, F j, Y G:i"
 msgstr "Yǯ F·î jÆü (D) G:i"
 
-#: squirrelmail/functions/date.php:207
+#: squirrelmail/functions/date.php:236
 msgid "g:i a"
 msgstr ""
 
-#: squirrelmail/functions/date.php:209
+#: squirrelmail/functions/date.php:238
 msgid "G:i"
 msgstr ""
 
-#: squirrelmail/functions/date.php:214
+#: squirrelmail/functions/date.php:243
 msgid "D, g:i a"
 msgstr "(D) g:i a"
 
-#: squirrelmail/functions/date.php:216
+#: squirrelmail/functions/date.php:245
 msgid "D, G:i"
 msgstr "(D) G:i"
 
-#: squirrelmail/functions/date.php:220
+#: squirrelmail/functions/date.php:249
 msgid "M j, Y"
 msgstr "Y/m/j"
 
@@ -1781,7 +1776,7 @@ msgid "Preference database error (%s). Exiting abnormally"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¥¨¥é¡¼ (%s)¡£ °Û¾ï½ªÎ»¤·¤Þ¤·¤¿¡£"
 
 #: squirrelmail/functions/display_messages.php:73
-#: squirrelmail/functions/imap_general.php:252
+#: squirrelmail/functions/imap_general.php:214
 msgid "Unknown user or password incorrect."
 msgstr "¥æ¡¼¥¶Ì¾¤«¥Ñ¥¹¥ï¡¼¥É¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
@@ -1805,137 +1800,135 @@ msgid ""
 "default preference file."
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤¬Â¸ºß¤·¤Þ¤»¤ó¡£ºÆ¥í¥°¥¤¥ó¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: squirrelmail/functions/file_prefs.php:162
+#: squirrelmail/functions/file_prefs.php:47
+#: squirrelmail/functions/file_prefs.php:107
+#, c-format
+msgid ""
+"Preference file, %s, could not be opened. Contact your system administrator "
+"to resolve this issue."
+msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¥¨¥é¡¼¤È¤È¤â¤Ë´ÉÍý¼Ô¤ËÏ¢Íí¤ò¼è¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
+
+#: squirrelmail/functions/file_prefs.php:175
 #, c-format
 msgid "Error opening %s"
 msgstr "¥ª¡¼¥×¥ó¥¨¥é¡¼ %s"
 
-#: squirrelmail/functions/file_prefs.php:165
+#: squirrelmail/functions/file_prefs.php:178
 msgid "Default preference file not found!"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£"
 
-#: squirrelmail/functions/file_prefs.php:166
 #: squirrelmail/functions/file_prefs.php:179
+#: squirrelmail/functions/file_prefs.php:192
 #: squirrelmail/functions/prefs.php:94
 msgid "Please contact your system administrator and report this error."
 msgstr "¤³¤Î¥¨¥é¡¼¤È¤È¤â¤Ë´ÉÍý¼Ô¤ËÏ¢Íí¤ò¼è¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: squirrelmail/functions/file_prefs.php:177
+#: squirrelmail/functions/file_prefs.php:190
 msgid "Could not create initial preference file!"
 msgstr "½é´üÀßÄê¥Õ¥¡¥¤¥ë¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: squirrelmail/functions/file_prefs.php:178
+#: squirrelmail/functions/file_prefs.php:191
 #, c-format
 msgid "%s should be writable by user %s"
 msgstr "%s ¤Ï ¥æ¡¼¥¶ %s ¤Ë¤è¤Ã¤Æ½ñ¤­¹þ¤ß²Äǽ¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
 
-#: squirrelmail/functions/imap_general.php:132
+#: squirrelmail/functions/file_prefs.php:209
+#: squirrelmail/functions/file_prefs.php:227
+#, c-format
+msgid ""
+"Signature file, %s, could not be opened. Contact your system administrator "
+"to resolve this issue."
+msgstr "½ð̾¥Õ¥¡¥¤¥ë %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¥¨¥é¡¼¤È¤È¤â¤Ë´ÉÍý¼Ô¤ËÏ¢Íí¤ò¼è¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
+
+#: squirrelmail/functions/i18n.php:751
 msgid ""
-"Please contact your system administrator and report the following error:"
-msgstr "´ÉÍý¼Ô¤Ë¼¡¤Î¥á¥Ã¥»¡¼¥¸¤È¤È¤â¤ËÏ¢Íí¤ò¼è¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
+"You need to have php4 installed with the multibyte string function enabled "
+"(using configure option --with-mbstring)."
+msgstr ""
 
-#: squirrelmail/functions/imap_general.php:163
-#: squirrelmail/functions/imap_messages.php:366
-#: squirrelmail/functions/imap_messages.php:374
-#: squirrelmail/functions/imap_messages.php:572
+#: squirrelmail/functions/imap_general.php:121
+#: squirrelmail/functions/imap_messages.php:427
+#: squirrelmail/functions/imap_messages.php:434
+#: squirrelmail/functions/imap_messages.php:445
+#: squirrelmail/functions/imap_messages.php:452
+#: squirrelmail/functions/imap_messages.php:652
+#: squirrelmail/functions/imap_messages.php:663
 #: squirrelmail/plugins/filters/filters.php:227
 msgid "ERROR : Could not complete request."
 msgstr "¥¨¥é¡¼: Í×µá¤ò´°Î»¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: squirrelmail/functions/imap_general.php:165
-#: squirrelmail/functions/imap_general.php:176
+#: squirrelmail/functions/imap_general.php:123
+#: squirrelmail/functions/imap_general.php:135
 msgid "Query:"
 msgstr "Ìä¹ç¤»:"
 
-#: squirrelmail/functions/imap_general.php:167
+#: squirrelmail/functions/imap_general.php:125
 #: squirrelmail/plugins/filters/filters.php:229
 msgid "Reason Given: "
 msgstr "Íýͳ:"
 
-#: squirrelmail/functions/imap_general.php:174
+#: squirrelmail/functions/imap_general.php:133
 #: squirrelmail/plugins/filters/filters.php:236
 msgid "ERROR : Bad or malformed request."
 msgstr "Error: ¥ê¥¯¥¨¥¹¥È¤Ë°Û¾ï¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: squirrelmail/functions/imap_general.php:178
+#: squirrelmail/functions/imap_general.php:137
 #: squirrelmail/plugins/filters/filters.php:238
 msgid "Server responded: "
 msgstr "¥µ¡¼¥Ð¤Î±þÅú:"
 
-#: squirrelmail/functions/imap_general.php:211
+#: squirrelmail/functions/imap_general.php:173
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr "IMAP¥µ¡¼¥Ð¡¼¤ÎÀܳ¤Ç¥¨¥é¡¼: %s"
 
-#: squirrelmail/functions/imap_general.php:227
+#: squirrelmail/functions/imap_general.php:189
 #, c-format
 msgid "Bad request: %s"
 msgstr "ÉÔÀµ¤ÊÍ×µá: %s"
 
-#: squirrelmail/functions/imap_general.php:229
+#: squirrelmail/functions/imap_general.php:191
 #, c-format
 msgid "Unknown error: %s"
 msgstr "¸¶°øÉÔÌÀ¤Î¥¨¥é¡¼: %s"
 
-#: squirrelmail/functions/imap_general.php:231
+#: squirrelmail/functions/imap_general.php:193
 msgid "Read data:"
 msgstr "Æɤó¤À¥Ç¡¼¥¿:"
 
-#: squirrelmail/functions/imap_messages.php:368
-#: squirrelmail/functions/imap_messages.php:574
+#: squirrelmail/functions/imap_messages.php:429
+#: squirrelmail/functions/imap_messages.php:447
+#: squirrelmail/functions/imap_messages.php:654
+#: squirrelmail/functions/imap_messages.php:665
 msgid "Unknown response from IMAP server: "
 msgstr "°Û¾ï¤Ê±þÅú¤¬ IMAP ¥µ¡¼¥Ð¡¼¤«¤é¤¢¤ê¤Þ¤·¤¿:"
 
-#: squirrelmail/functions/imap_messages.php:376
+#: squirrelmail/functions/imap_messages.php:436
+#: squirrelmail/functions/imap_messages.php:454
 msgid "Unknown message number in reply from server: "
 msgstr "ÉÔÀµ¤Ê¥á¥Ã¥»¡¼¥¸Èֹ椬¥µ¡¼¥Ð¤«¤éÊÖ¤µ¤ì¤Þ¤·¤¿¡§"
 
-#: squirrelmail/functions/imap_messages.php:396
-#: squirrelmail/functions/imap_messages.php:497
-#: squirrelmail/functions/imap_messages.php:775
-#: squirrelmail/functions/imap_messages.php:839
+#: squirrelmail/functions/imap_messages.php:476
+#: squirrelmail/functions/imap_messages.php:579
 #: squirrelmail/functions/imap_parse.php:183
 #: squirrelmail/functions/imap_parse.php:205
-#: squirrelmail/functions/mailbox_display.php:1141
+#: squirrelmail/functions/mailbox_display.php:1177
 msgid "(no subject)"
 msgstr ""
 
-#: squirrelmail/functions/imap_messages.php:397
+#: squirrelmail/functions/imap_messages.php:477
 msgid "Unknown Sender"
 msgstr "Á÷¿®¼ÔÉÔÌÀ"
 
-#: squirrelmail/functions/imap_messages.php:520
-msgid "No To Address"
-msgstr "°¸Àè̵¤·"
-
-#: squirrelmail/functions/imap_messages.php:842
 #: squirrelmail/functions/imap_parse.php:208
 msgid "(unknown sender)"
 msgstr "(Á÷¿®¼ÔÉÔÌÀ)"
 
-#: squirrelmail/functions/imap_search.php:98
-msgid "No Messages Found"
-msgstr "ɽ¼¨¤¹¤ë¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
-
-#: squirrelmail/functions/imap_search.php:206
-#: squirrelmail/functions/imap_search.php:214
-msgid "Found"
-msgstr "¤ß¤Ä¤«¤ê¤Þ¤·¤¿"
-
-#: squirrelmail/functions/imap_search.php:206
-#: squirrelmail/functions/imap_search.php:214
-msgid "messages"
-msgstr "¥á¥Ã¥»¡¼¥¸¤¬"
-
-#: squirrelmail/functions/imap_search.php:221
-msgid "Folder:"
-msgstr "¥Õ¥©¥ë¥À:"
-
-#: squirrelmail/functions/mailbox_display.php:196
+#: squirrelmail/functions/mailbox_display.php:203
 msgid "A"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:274
+#: squirrelmail/functions/mailbox_display.php:388
 msgid ""
 "Thread sorting is not supported by your IMAP server.<br>Please report this "
 "to the system administrator."
@@ -1943,7 +1936,7 @@ msgstr ""
 "¥¹¥ì¥Ã¥É¥½¡¼¥È¤Ï¤¢¤Ê¤¿¤ÎIMAP¥µ¡¼¥Ð¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£<br>¥·¥¹¥Æ¥à´É"
 "Íý¼Ô¤ËÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: squirrelmail/functions/mailbox_display.php:296
+#: squirrelmail/functions/mailbox_display.php:407
 msgid ""
 "Server-side sorting is not supported by your IMAP server.<br>Please report "
 "this to the system administrator."
@@ -1951,83 +1944,79 @@ msgstr ""
 "¥µ¡¼¥Ð¥µ¥¤¥É¥½¡¼¥Æ¥£¥ó¥°¤Ï¤¢¤Ê¤¿¤ÎIMAP¥µ¡¼¥Ð¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£<br>"
 "¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ËÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: squirrelmail/functions/mailbox_display.php:590
+#: squirrelmail/functions/mailbox_display.php:608
 msgid "THIS FOLDER IS EMPTY"
 msgstr "¤³¤Î¥Õ¥©¥ë¥À¤Ï¶õ¤Ç¤¹¡£"
 
-#: squirrelmail/functions/mailbox_display.php:697
-msgid "Move Selected To:"
+#: squirrelmail/functions/mailbox_display.php:706
+msgid "Move Selected To"
 msgstr "¥Á¥§¥Ã¥¯¤·¤¿¤â¤Î¤Î°ÜÆ°¡§"
 
-#: squirrelmail/functions/mailbox_display.php:702
+#: squirrelmail/functions/mailbox_display.php:707
 msgid "Transform Selected Messages"
 msgstr "¥Á¥§¥Ã¥¯¤·¤¿¤â¤Î¤Î¾õÂÖÊѹ¹"
 
-#: squirrelmail/functions/mailbox_display.php:727
-#: squirrelmail/plugins/delete_move_next/setup.php:245
-#: squirrelmail/plugins/delete_move_next/setup.php:269
+#: squirrelmail/functions/mailbox_display.php:712
+#: squirrelmail/plugins/delete_move_next/setup.php:253
+#: squirrelmail/plugins/delete_move_next/setup.php:277
 msgid "Move"
 msgstr "°ÜÆ°"
 
-#: squirrelmail/functions/mailbox_display.php:734
+#: squirrelmail/functions/mailbox_display.php:719
 msgid "Expunge"
 msgstr "ºï½ü¤¹¤ë"
 
-#: squirrelmail/functions/mailbox_display.php:735
+#: squirrelmail/functions/mailbox_display.php:720
 msgid "mailbox"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:737
+#: squirrelmail/functions/mailbox_display.php:723
 msgid "Read"
 msgstr "´ûÆÉ"
 
-#: squirrelmail/functions/mailbox_display.php:738
+#: squirrelmail/functions/mailbox_display.php:724
 msgid "Unread"
 msgstr "̤ÆÉ"
 
-#: squirrelmail/functions/mailbox_display.php:747
+#: squirrelmail/functions/mailbox_display.php:739
 msgid "Unthread View"
 msgstr "¥¹¥ì¥Ã¥É¤Ê¤·É½¼¨"
 
-#: squirrelmail/functions/mailbox_display.php:751
+#: squirrelmail/functions/mailbox_display.php:743
 msgid "Thread View"
 msgstr "¥¹¥ì¥Ã¥Éɽ¼¨"
 
-#: squirrelmail/functions/mailbox_display.php:874
+#: squirrelmail/functions/mailbox_display.php:900
 msgid "Toggle All"
 msgstr "Á´È¿Å¾"
 
-#: squirrelmail/functions/mailbox_display.php:898
+#: squirrelmail/functions/mailbox_display.php:924
 msgid "Unselect All"
 msgstr "Á´ÁªÂò²ò½ü"
 
-#: squirrelmail/functions/mailbox_display.php:900
+#: squirrelmail/functions/mailbox_display.php:926
 msgid "Select All"
 msgstr "Á´ÁªÂò"
 
-#: squirrelmail/functions/mailbox_display.php:917
+#: squirrelmail/functions/mailbox_display.php:943
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr "<b>%s</b>¡Á<b>%s</b>ɽ¼¨Ãæ(Á´%s·ï)"
 
-#: squirrelmail/functions/mailbox_display.php:920
+#: squirrelmail/functions/mailbox_display.php:946
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr "<b>%s</b>ɽ¼¨Ãæ(Á´1·ï)"
 
-#: squirrelmail/functions/mailbox_display.php:1104
+#: squirrelmail/functions/mailbox_display.php:1139
 msgid "Paginate"
 msgstr "¥Ú¡¼¥¸É½¼¨"
 
-#: squirrelmail/functions/mailbox_display.php:1111
+#: squirrelmail/functions/mailbox_display.php:1146
 msgid "Show All"
 msgstr "Á´É½¼¨"
 
-#: squirrelmail/functions/mime.php:449
-msgid "Error decoding mime structure.  Report this as a bug!"
-msgstr "mime¤Î¥Ç¥³¡¼¥É¥¨¥é¡¼¡£¤³¤Î¥Ð¥°¤òÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£"
-
-#: squirrelmail/functions/mime.php:522
+#: squirrelmail/functions/mime.php:127
 msgid ""
 "Body retrieval error. The reason for this is most probably that the message "
 "is malformed. Please help us making future versions better by submitting "
@@ -2036,19 +2025,19 @@ msgstr ""
 "Æɤ߽Ф·¥¨¥é¡¼¤Ç¤¹¡£Íýͳ¤Ï¥á¥Ã¥»¡¼¥¸¤Ë°Û¾ï¤¬¤¢¤ë¤¿¤á¤Ç¤¹¡£¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò³«"
 "ȯ¼Ô¤ËÏ¢Íí¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¾­Íè¤Î¥Ð¡¼¥¸¥ç¥ó¤ËÌò¤ËΩ¤Ä¤Ç¤·¤ç¤¦¡£"
 
-#: squirrelmail/functions/mime.php:524
+#: squirrelmail/functions/mime.php:129
 msgid "Submit message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®"
 
-#: squirrelmail/functions/mime.php:526
+#: squirrelmail/functions/mime.php:131
 msgid "Command:"
 msgstr "¥³¥Þ¥ó¥É:"
 
-#: squirrelmail/functions/mime.php:527
+#: squirrelmail/functions/mime.php:132
 msgid "Response:"
 msgstr "±þÅú:"
 
-#: squirrelmail/functions/mime.php:528
+#: squirrelmail/functions/mime.php:133
 #: squirrelmail/plugins/calendar/event_create.php:137
 #: squirrelmail/plugins/calendar/event_delete.php:47
 #: squirrelmail/plugins/calendar/event_edit.php:119
@@ -2056,27 +2045,23 @@ msgstr "
 msgid "Message:"
 msgstr "¥á¥Ã¥»¡¼¥¸:"
 
-#: squirrelmail/functions/mime.php:529
+#: squirrelmail/functions/mime.php:134
 msgid "FETCH line:"
 msgstr "¼è¤ê¹þ¤ó¤Ç¤¤¤ë¹Ô:"
 
-#: squirrelmail/functions/mime.php:866
+#: squirrelmail/functions/mime.php:366
 msgid "Hide Unsafe Images"
 msgstr "°ÂÁ´¤Ç¤Ê¤¤¥¤¥á¡¼¥¸¤ò±£¤¹"
 
-#: squirrelmail/functions/mime.php:868
+#: squirrelmail/functions/mime.php:368
 msgid "View Unsafe Images"
 msgstr "°ÂÁ´¤Ç¤Ê¤¤¥¤¥á¡¼¥¸¤Îɽ¼¨"
 
-#: squirrelmail/functions/mime.php:903
-msgid "Attachments"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë"
-
-#: squirrelmail/functions/mime.php:939 squirrelmail/functions/mime.php:1017
+#: squirrelmail/functions/mime.php:395
 msgid "download"
 msgstr "¥À¥¦¥ó¥í¡¼¥É"
 
-#: squirrelmail/functions/mime.php:1746 squirrelmail/functions/mime.php:2064
+#: squirrelmail/functions/mime.php:1176 squirrelmail/functions/mime.php:1497
 msgid "sec_remove_eng.png"
 msgstr "sec_remove_ja_JP.png"
 
@@ -2086,27 +2071,27 @@ msgid "Option Type '%s' Not Found"
 msgstr "¥ª¥×¥·¥ç¥ó¥¿¥¤¥× '%s' ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£"
 
 #: squirrelmail/functions/options.php:263
+#: squirrelmail/plugins/administrator/options.php:357
 #: squirrelmail/plugins/calendar/event_delete.php:62
 #: squirrelmail/plugins/calendar/event_edit.php:165
-#: squirrelmail/plugins/administrator/options.php:357
 msgid "Yes"
 msgstr ""
 
 #: squirrelmail/functions/options.php:268
+#: squirrelmail/plugins/administrator/options.php:358
 #: squirrelmail/plugins/calendar/event_delete.php:70
 #: squirrelmail/plugins/calendar/event_edit.php:173
-#: squirrelmail/plugins/administrator/options.php:358
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:199
+#: squirrelmail/functions/page_header.php:200
 msgid "Current Folder"
 msgstr "¸½ºß¤Î¥Õ¥©¥ë¥À"
 
-#: squirrelmail/functions/page_header.php:212
-#: squirrelmail/functions/page_header.php:215
-#: squirrelmail/functions/page_header.php:258
-#: squirrelmail/functions/page_header.php:285
+#: squirrelmail/functions/page_header.php:213
+#: squirrelmail/functions/page_header.php:216
+#: squirrelmail/functions/page_header.php:259
+#: squirrelmail/functions/page_header.php:286
 msgid "Compose"
 msgstr "¥á¥Ã¥»¡¼¥¸ºîÀ®"
 
@@ -2119,7 +2104,7 @@ msgstr "%s 
 msgid "Could not create hashed directory structure!"
 msgstr "¥Ï¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: squirrelmail/plugins/filters/filters.php:554
+#: squirrelmail/plugins/filters/filters.php:560
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "
 "is a pretty reliable list to scan spam from."
@@ -2127,7 +2112,7 @@ msgstr ""
 "Í­½þ - ¤³¤Î¥ê¥¹¥È¤ÏΩ¾Ú¤µ¤ì¤¿¥¹¥Ñ¥àÁ÷¿®¼Ô¤Î¥µ¡¼¥Ð¤ò´Þ¤à¡£¥¹¥Ñ¥à¤ò¥¹¥­¥ã¥ó¤¹¤ë"
 "¾å¤Ç¿®ÍêÀ­¤Î¹â¤¤¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:562
+#: squirrelmail/plugins/filters/filters.php:568
 msgid ""
 "COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to "
 "be relayed through their system will be banned with this.  Another good one "
@@ -2136,7 +2121,7 @@ msgstr ""
 "Í­½þ - ¥¹¥Ñ¥à¤òÃæ·Ñ¤µ¤»¤ë¤è¤¦¤Ë¡¢ÀßÄê(¤Þ¤¿¤Ï¸í¤Ã¤ÆÀßÄê)¤µ¤ì¤Æ¤¤¤ë¥µ¡¼¥Ð¤Ï¡¢¤³"
 "¤Á¤é¤Ç¶Ø»ß¤µ¤ì¤Þ¤¹¡£¤ª¿ä¤á¤Î°ì¤Ä¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:570
+#: squirrelmail/plugins/filters/filters.php:576
 msgid ""
 "COMMERCIAL - Dial-up users are often filtered out since they should use "
 "their ISP's mail servers to send mail.  Spammers typically get a dial-up "
@@ -2146,19 +2131,19 @@ msgstr ""
 "¥ë¥¿¤Ç¼è¤ê½ü¤«¤ì¤Þ¤¹¡£¥À¥¤¥ä¥ë¥¢¥«¥¦¥ó¥È¤ò¼èÆÀ¤·¡¢¤½¤³¤«¤éľÀÜ¥¹¥Ñ¥à¤òÁ÷¿®¤¹"
 "¤ë¤³¤È¤¬¡¢¥¹¥Ñ¥Þ¡¼¤Î¤¢¤ê¤¬¤Á¤Ê¼êË¡¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:578
+#: squirrelmail/plugins/filters/filters.php:584
 msgid "COMMERCIAL - RBL+ Blackhole entries."
 msgstr "Í­½þ - RBL+ ¥Ö¥é¥Ã¥¯¥Û¡¼¥ë¤Î¹àÌÜ"
 
-#: squirrelmail/plugins/filters/filters.php:586
+#: squirrelmail/plugins/filters/filters.php:592
 msgid "COMMERCIAL - RBL+ OpenRelay entries."
 msgstr "Í­½þ - RBL+ ¥ª¡¼¥×¥ó¥ê¥ì¡¼"
 
-#: squirrelmail/plugins/filters/filters.php:594
+#: squirrelmail/plugins/filters/filters.php:600
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr "Í­½þ - RBL+ ¥À¥¤¥ä¥ë¥¢¥Ã¥×¹àÌÜ"
 
-#: squirrelmail/plugins/filters/filters.php:603
+#: squirrelmail/plugins/filters/filters.php:609
 msgid ""
 "FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to "
 "include servers used by abuse@uunet.net auto-replies too."
@@ -2166,11 +2151,11 @@ msgstr ""
 "̵½þ - Osirusoft Relays - Osirusofts¤Ë¤è¤ë¡¢Î©¾Ú¤Ç¤­¤¿¥ª¡¼¥×¥ó¥ê¥ì¡¼¤Î¥ê¥¹"
 "¥È¡£abuse@uunet.net¤¬¼«Æ°ÊÖ¿®¤Ë»È¤¦¥µ¡¼¥Ð¤â´Þ¤Þ¤ì¤ë¤è¤¦¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:611
+#: squirrelmail/plugins/filters/filters.php:617
 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
 msgstr "̵½þ - Osirusoft Dialups - Osirusoft¤Î¥À¥¤¥ä¥ë¥¢¥Ã¥×¥¹¥Ñ¥à¸µ¤Î¥ê¥¹¥È"
 
-#: squirrelmail/plugins/filters/filters.php:619
+#: squirrelmail/plugins/filters/filters.php:625
 msgid ""
 "FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and "
 "have been manually added after multiple nominations. Use with caution. Seems "
@@ -2181,7 +2166,7 @@ msgstr ""
 "ȽÃǤ¬É¬ÍפǤ¹¡£°­ÍÑÊó¹ð¤ËÂФ¹¤ë¡¢¤¤¤¯¤Ä¤«¤ÎISP¤Ë¤è¤ë¼«Æ°ÊÖ¿®¤âÄϤó¤Ç¤·¤Þ¤¦¤è"
 "¤¦¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:627
+#: squirrelmail/plugins/filters/filters.php:633
 msgid ""
 "FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for "
 "other mail servers that are not secure."
@@ -2189,7 +2174,7 @@ msgstr ""
 "̵½þ - Osirusoft Smart Hosts - ¥»¥­¥å¥¢¤À¤¬¡¢¥»¥­¥å¥¢¤Ç¤Ï¤Ê¤¤¥á¡¼¥ë¥µ¡¼¥Ð¤ÎÃæ"
 "·Ñ¤ò¤·¤Æ¤·¤Þ¤¦¥Û¥¹¥È¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:635
+#: squirrelmail/plugins/filters/filters.php:641
 msgid ""
 "FREE - Osirusoft Spamware Developers - It is believed that these are IP "
 "ranges of companies that are known to produce spam software. Seems to catch "
@@ -2199,7 +2184,7 @@ msgstr ""
 "¤ë¤ÈÃΤé¤ì¤ë´ë¶È¤Î¤â¤Î¤À¤È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤ÎISP¤«¤é¤Îabuse¼«Æ°ÊÖ¿®¤òÊá"
 "¤Þ¤¨¤ë¤è¤¦¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:643
+#: squirrelmail/plugins/filters/filters.php:649
 msgid ""
 "FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
 "users in without confirmation."
@@ -2207,7 +2192,7 @@ msgstr ""
 "̵½þ - Osirusoft Ì¤³Îǧ¥ª¥×¥È¥¤¥ó¥µ¡¼¥Ð - ¥æ¡¼¥¶¤Ë¤è¤ë³Îǧ¤ò¤Ê¤·¤Ë¡¢ÅÐÏ¿¤¹¤ë"
 "¥ê¥¹¥È¥µ¡¼¥Ð¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:651
+#: squirrelmail/plugins/filters/filters.php:657
 msgid ""
 "FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail."
 "cgi scripts. (planned)."
@@ -2215,12 +2200,12 @@ msgstr ""
 "̵½þ - Osirusoft Insecure formmail.cgi scripts - ¥»¥­¥å¥¢¤Ç¤Ï¤Ê¤¤formmail cgi"
 "¤Î¥ê¥¹¥È¤Ç¤¹¡£(ͽÄê)"
 
-#: squirrelmail/plugins/filters/filters.php:659
+#: squirrelmail/plugins/filters/filters.php:665
 msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
 msgstr ""
 "̵½þ - Osirusoft Open Proxy Servers - ¥ª¡¼¥×¥ó¥×¥í¥¯¥·¥µ¡¼¥Ð¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:667
+#: squirrelmail/plugins/filters/filters.php:673
 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."
@@ -2228,38 +2213,38 @@ msgstr ""
 "̵½þ - ORDB¤ÏORBS¤¬Ìµ¤¯¤Ê¤Ã¤¿»þ¤ËÀ¸¤Þ¤ì¤Þ¤·¤¿¡£¤·¤«¤·¡¢ORBS¤è¤êfalse "
 "positives¤¬¾¯¤Ê¤¤¤è¤¦¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:675
+#: squirrelmail/plugins/filters/filters.php:681
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
 msgstr "̵½þ - Five-Ten-sg.com - Ä¾ÀܤΥ¹¥Ñ¥à¸»¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:683
+#: squirrelmail/plugins/filters/filters.php:689
 msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs."
 msgstr ""
 "̵½þ - Five-Ten-sg.com - ¥À¥¤¥ä¥ë¥¢¥Ã¥×¥ê¥¹¥È - Â¾¤Ë¤¤¤¯¤Ä¤«¤ÎDSL¤ÎIPs¤ò´Þ¤ß"
 "¤Þ¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:691
+#: squirrelmail/plugins/filters/filters.php:697
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
 msgstr ""
 "̵½þ -  Five-Ten-sg.com - ³Îǧ¤µ¤ì¤¿¥ª¥×¥È¥¤¥ó¤òÍøÍѤ·¤Ê¤¤ÂçÎ̥᡼¥é¡¼¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:699
+#: squirrelmail/plugins/filters/filters.php:705
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
 msgstr "̵½þ - Five-Ten-sg.com - Â¾¤ÎÍÍ¡¹¤Ê¥µ¡¼¥Ð¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:707
+#: squirrelmail/plugins/filters/filters.php:713
 msgid "FREE - Five-Ten-sg.com - Single Stage servers."
 msgstr "̵½þ - Five-Ten-sg.com - ¥·¥ó¥°¥ë¥¹¥Æ¡¼¥¸¥µ¡¼¥Ð"
 
-#: squirrelmail/plugins/filters/filters.php:715
+#: squirrelmail/plugins/filters/filters.php:721
 msgid "FREE - Five-Ten-sg.com - SPAM Support servers."
 msgstr "̵½þ - Five-Ten-sg.com - ¥¹¥Ñ¥à¤ò»Ù±ç¤¹¤ë¥µ¡¼¥Ð"
 
-#: squirrelmail/plugins/filters/filters.php:723
+#: squirrelmail/plugins/filters/filters.php:729
 msgid "FREE - Five-Ten-sg.com - Web Form IPs."
 msgstr "̵½þ - Five-Ten-sg.com - ¥¦¥§¥Ö¥Õ¥©¡¼¥à¤ÎIP"
 
-#: squirrelmail/plugins/filters/filters.php:731
+#: squirrelmail/plugins/filters/filters.php:737
 msgid ""
 "FREE - Dorkslayers appears to include only really bad open relays outside "
 "the US to avoid being sued. Interestingly enough, their website recommends "
@@ -2269,40 +2254,40 @@ msgstr ""
 "¥ì¡¼¤Î¤ß¤ò´Þ¤ß¤Þ¤¹¡£ÌÌÇò¤¤¤³¤È¤Ë¡¢Èà¤é¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ÏÈà¤é¤Î¥µ¡¼¥Ó¥¹¤òÍøÍÑ*¤·"
 "¤Ê¤¤*¤³¤È¤ò¿ä¤á¤ë¡£"
 
-#: squirrelmail/plugins/filters/filters.php:739
+#: squirrelmail/plugins/filters/filters.php:745
 msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
 msgstr "̵½þ - SPAMhaus - Îɤ¯ÃΤé¤ì¤ë¥¹¥Ñ¥à¸»¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:747
+#: squirrelmail/plugins/filters/filters.php:753
 #, c-format
 msgid ""
 "FREE, for now - SPAMCOP - An interesting solution that lists servers that "
 "have a very high spam to legit email ratio (85% or more)."
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:755
+#: squirrelmail/plugins/filters/filters.php:761
 msgid "FREE - dev.null.dk - I don't have any detailed info on this list."
 msgstr "̵½þ - dev.null.dk - ¤³¤Î¥ê¥¹¥È¤Ë´Ø¤·¤Æ¤ÏÆä˾ܤ·¤¤¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: squirrelmail/plugins/filters/filters.php:763
+#: squirrelmail/plugins/filters/filters.php:769
 msgid "FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."
 msgstr ""
 "̵½þ - visi.com - ¥ê¥ì¡¼Ëɻߥꥹ¥È¤Ç¤¹¡£Èó¾ï¤Ë¶¨ÎÏŪ¤Ê¥ª¡¼¥×¥ó¥ê¥ì¡¼¤Î¥ê¥¹¥È"
 "¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:771
+#: squirrelmail/plugins/filters/filters.php:777
 msgid "FREE - 2mbit.com Open Relays - Another list of Open Relays."
 msgstr "̵½þ - 2mbit.com Open Relays - ¤â¤¦°ì¤Ä¤Î¥ª¡¼¥×¥ó¥ê¥ì¡¼¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:779
+#: squirrelmail/plugins/filters/filters.php:785
 msgid "FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources."
 msgstr "̵½þ -  2mbit.com SPAM Source - Ä¾ÀܤΥ¹¥Ñ¥à¸»¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:787
+#: squirrelmail/plugins/filters/filters.php:793
 msgid "FREE - 2mbit.com SPAM ISPs - List of SPAM-friendly ISPs."
 msgstr "̵½þ - 2mbit.com SPAM ISPs - ¥¹¥Ñ¥à¤Ë¤¢¤Þ¤¤ISP¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:795
+#: squirrelmail/plugins/filters/filters.php:801
 msgid ""
 "FREE - Leadmon DUL - Another list of Dial-up or otherwise dynamically "
 "assigned IPs."
@@ -2310,7 +2295,7 @@ msgstr ""
 "̵½þ - Leadmon DUL - ¥À¥¤¥ä¥ë¥¢¥Ã¥×¤Þ¤¿¤Ï¾¤ËưŪ¤Ë³ä¤êÅö¤Æ¤é¤ì¤ëIP¤Î¥ê¥¹¥È¤Ç"
 "¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:803
+#: squirrelmail/plugins/filters/filters.php:809
 msgid ""
 "FREE - Leadmon SPAM Source - List of IPs Leadmon.net has received SPAM "
 "directly from."
@@ -2318,7 +2303,7 @@ msgstr ""
 "̵½þ - Leadmon Spam SOurce - Leadmon.net¤¬Ä¾ÀÜ¥¹¥Ñ¥à¤òÁ÷¤é¤ì¤¿¤³¤È¤Î¤¢¤ëIP¤Î"
 "¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:811
+#: squirrelmail/plugins/filters/filters.php:817
 msgid ""
 "FREE - Leadmon Bulk Mailers - Bulk mailers that do not require confirmed opt-"
 "in or that have allowed known spammers to become clients and abuse their "
@@ -2327,7 +2312,7 @@ msgstr ""
 "̵½þ - Leadmon Bulk Mailers - ¥ª¥×¥È¥¤¥ó¤òɬÍפȤ·¤Ê¤¤ÂçÎ̥᡼¥é¡¼¡¢¤Þ¤¿¤Ï´û"
 "ÃΤΥ¹¥Ñ¥Þ¡¼¤ò²ñ°÷¤Ë¤µ¤»¤Æ¥µ¡¼¥Ó¥¹¤ò°­ÍѤòµö¤¹¤â¤Î¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:819
+#: squirrelmail/plugins/filters/filters.php:825
 msgid ""
 "FREE - Leadmon Open Relays - Single Stage Open Relays that are not listed on "
 "other active RBLs."
@@ -2335,7 +2320,7 @@ msgstr ""
 "̵½þ - Leadmon Open Relays - Â¾¤Ë³èÌö¤·¤Æ¤¤¤ëRBL¤ËºÜ¤Ã¤Æ¤¤¤Ê¤¤¥·¥ó¥°¥ë¥¹¥Æ¡¼"
 "¥¸¤Î¥ª¡¼¥×¥ó¥ê¥ì¡¼¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:827
+#: squirrelmail/plugins/filters/filters.php:833
 msgid ""
 "FREE - Leadmon Multi-stage - Multi-Stage Open Relays that are not listed on "
 "other active RBLs and that have sent SPAM to Leadmon.net."
@@ -2344,7 +2329,7 @@ msgstr ""
 "¥ª¡¼¥×¥ó¥ê¥ì¡¼¤ÇLeadmon.net¤Ø¥¹¥Ñ¥à¤¬Á÷¤é¤ì¤¿¥Þ¥ë¥Á¥¹¥Æ¡¼¥¸¤Î¥ª¡¼¥×¥ó¥ê¥ì¡¼¤Ç"
 "¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:835
+#: squirrelmail/plugins/filters/filters.php:841
 msgid ""
 "FREE - Leadmon SpamBlock - Sites on this listing have sent Leadmon.net "
 "direct SPAM from IPs in netblocks where the entire block has no DNS "
@@ -2356,7 +2341,7 @@ msgstr ""
 "°ú¤¬ÀßÄꤵ¤ì¤Æ¤Ê¤¤¤â¤Î¤Ç¤¹¡£Leadmon.net¤Ø¥¹¥Ñ¥à¤òÁ÷¤Ã¤¿¤³¤È¤Î¤¢¤ë¿Íã¤ÎIP¥Ö"
 "¥í¥Ã¥¯¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:843
+#: squirrelmail/plugins/filters/filters.php:849
 msgid ""
 "FREE, for now - Not Just Another Blacklist - Both Open Relays and Direct "
 "SPAM Sources."
@@ -2364,21 +2349,21 @@ msgstr ""
 "̵½þ (º£¤Î¤È¤³¤í) - Ã±¤Ê¤ë¤â¤¦°ì¤Ä¤Î¥Ö¥é¥Ã¥¯¥ê¥¹¥È¤Ç¤Ï¤Ê¤¤ - ¥ª¡¼¥×¥ó¥ê¥ì¡¼¤È"
 "ľÀܤΥ¹¥Ñ¥à¸»¤ÎξÊý¤ò´Þ¤á¤Þ¤¹¡£"
 
-#: squirrelmail/plugins/filters/filters.php:851
+#: squirrelmail/plugins/filters/filters.php:857
 msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
 msgstr ""
 "̵½þ - (º£¤Î¤È¤³¤í) - Ã±¤Ê¤ë¤â¤¦°ì¤Ä¤Î¥Ö¥é¥Ã¥¯¥ê¥¹¥È¤Ç¤Ï¤Ê¤¤ - ¥À¥¤¥ä¥ë¥¢¥Ã¥×"
 "IP"
 
-#: squirrelmail/plugins/filters/filters.php:859
+#: squirrelmail/plugins/filters/filters.php:865
 msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:867
+#: squirrelmail/plugins/filters/filters.php:873
 msgid "FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"
 msgstr ""
 
-#: squirrelmail/plugins/filters/filters.php:875
+#: squirrelmail/plugins/filters/filters.php:881
 msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
 msgstr ""
 
@@ -2386,57 +2371,53 @@ msgstr ""
 msgid "Saved Scan type"
 msgstr "¥¹¥­¥ã¥ó¥¿¥¤¥×¤òÊݸ¤·¤Þ¤·¤¿¡£"
 
-#: squirrelmail/plugins/filters/options.php:71
+#: squirrelmail/plugins/filters/options.php:70
 msgid "Message Filtering"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥Õ¥£¥ë¥¿¥ê¥ó¥°"
 
-#: squirrelmail/plugins/filters/options.php:80
+#: squirrelmail/plugins/filters/options.php:79
 #: squirrelmail/plugins/filters/spamoptions.php:115
 msgid "What to Scan:"
 msgstr "¤É¤Î¥á¥Ã¥»¡¼¥¸¤ò¥¹¥­¥ã¥ó¤¹¤ë¤«:"
 
-#: squirrelmail/plugins/filters/options.php:87
+#: squirrelmail/plugins/filters/options.php:86
 #: squirrelmail/plugins/filters/spamoptions.php:122
 msgid "All messages"
 msgstr "Á´¥á¥Ã¥»¡¼¥¸"
 
-#: squirrelmail/plugins/filters/options.php:92
+#: squirrelmail/plugins/filters/options.php:91
 #: squirrelmail/plugins/filters/spamoptions.php:127
 msgid "Only unread messages"
 msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤À¤±"
 
-#: squirrelmail/plugins/filters/options.php:95
+#: squirrelmail/plugins/filters/options.php:94
 #: squirrelmail/plugins/filters/spamoptions.php:168
 msgid "Save"
 msgstr "Êݸ"
 
-#: squirrelmail/plugins/filters/options.php:115
+#: squirrelmail/plugins/filters/options.php:114
 msgid "Match:"
 msgstr "¹àÌÜ:"
 
-#: squirrelmail/plugins/filters/options.php:137
+#: squirrelmail/plugins/filters/options.php:136
 msgid "Header"
 msgstr "¥Ø¥Ã¥À"
 
-#: squirrelmail/plugins/filters/options.php:143
+#: squirrelmail/plugins/filters/options.php:142
 msgid "Contains:"
 msgstr "´Þ¤à:"
 
-#: squirrelmail/plugins/filters/options.php:153
-#: squirrelmail/plugins/delete_move_next/setup.php:241
-#: squirrelmail/plugins/delete_move_next/setup.php:265
+#: squirrelmail/plugins/delete_move_next/setup.php:249
+#: squirrelmail/plugins/delete_move_next/setup.php:273
+#: squirrelmail/plugins/filters/options.php:152
 msgid "Move to:"
 msgstr "°ÜÆ°"
 
-#: squirrelmail/plugins/filters/options.php:202
+#: squirrelmail/plugins/filters/options.php:200
 msgid "Down"
 msgstr "¢­"
 
-#: squirrelmail/plugins/filters/options.php:208
-msgid "Up"
-msgstr "¢¬"
-
-#: squirrelmail/plugins/filters/options.php:213
+#: squirrelmail/plugins/filters/options.php:211
 #, c-format
 msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr "<b>%s</b> ¤Ë <b>%s</b> ¤ò´Þ¤à¤â¤Î¤ò <b>%s</b> ¤Ë°ÜÆ°¤¹¤ë¡£"
@@ -2724,27 +2705,6 @@ msgstr "
 msgid "No errors found"
 msgstr "¥¨¥é¡¼¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
-msgid ""
-"Your personal dictionary has been <strong>encrypted</strong> and is now "
-"stored in an <strong>encrypted format</strong>."
-msgstr ""
-"¸Ä¿Í¼­½ñ¤Ï<strong>°Å¹æ²½</strong>¤µ¤ì¤Æ<strong>°Å¹æ</strong>¤ÇÊݸ¤µ¤ì¤Þ¤·"
-"¤¿¡£"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
-msgid ""
-"Your personal dictionary has been <strong>decrypted</strong> and is now "
-"stored as <strong>clear text</strong>."
-msgstr ""
-"¸Ä¿Í¼­½ñ<strong>Éü¹æ</strong>¤µ¤ì¤Æ<strong>¥¯¥ê¥¢¡¼¥Æ¥­¥¹¥È</strong>¤ÇÊݸ¤µ"
-"¤ì¤Þ¤·¤¿¡£"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
-msgid "Personal Dictionary Crypto Settings"
-msgstr "¸Ä¿Í¼­½ñ¤Î°Å¹æ²½¤ÎÀßÄê"
-
 #: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:33
 msgid "Your personal dictionary was erased."
 msgstr "¸Ä¿Í¼­½ñ¤Ï¾Ãµî¤µ¤ì¤Þ¤·¤¿¡£"
@@ -2792,6 +2752,27 @@ msgstr ""
 msgid "Dictionary re-encrypted"
 msgstr "¼­½ñ¤ÏºÆ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿¡£"
 
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
+msgid ""
+"Your personal dictionary has been <strong>encrypted</strong> and is now "
+"stored in an <strong>encrypted format</strong>."
+msgstr ""
+"¸Ä¿Í¼­½ñ¤Ï<strong>°Å¹æ²½</strong>¤µ¤ì¤Æ<strong>°Å¹æ</strong>¤ÇÊݸ¤µ¤ì¤Þ¤·"
+"¤¿¡£"
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
+msgid ""
+"Your personal dictionary has been <strong>decrypted</strong> and is now "
+"stored as <strong>clear text</strong>."
+msgstr ""
+"¸Ä¿Í¼­½ñ<strong>Éü¹æ</strong>¤µ¤ì¤Æ<strong>¥¯¥ê¥¢¡¼¥Æ¥­¥¹¥È</strong>¤ÇÊݸ¤µ"
+"¤ì¤Þ¤·¤¿¡£"
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
+msgid "Personal Dictionary Crypto Settings"
+msgstr "¸Ä¿Í¼­½ñ¤Î°Å¹æ²½¤ÎÀßÄê"
+
 #: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:28
 #: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:77
 msgid "Personal Dictionary"
@@ -2927,8 +2908,8 @@ msgid ""
 "message:"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Î¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤Ë¤É¤Î¼­½ñ¤ò»ÈÍѤ¹¤ë¤«ÁªÂò:"
 
-#: squirrelmail/plugins/squirrelspell/modules/init.mod:53
 #: squirrelmail/plugins/calendar/calendar.php:125
+#: squirrelmail/plugins/squirrelspell/modules/init.mod:53
 msgid "Go"
 msgstr ""
 
@@ -2996,78 +2977,78 @@ msgstr "̤
 msgid "SquirrelSpell Options Menu"
 msgstr "SquirrelSpell¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼"
 
-#: squirrelmail/plugins/translate/options.php:94
+#: squirrelmail/plugins/translate/options.php:93
 msgid "Translator"
 msgstr "ËÝÌõ"
 
-#: squirrelmail/plugins/translate/options.php:97
+#: squirrelmail/plugins/translate/options.php:96
 msgid "Your server options are as follows:"
 msgstr "¥µ¡¼¥Ð¥ª¥×¥·¥ç¥ó¤Ï°Ê²¼¤Î¤È¤ª¤ê:"
 
-#: squirrelmail/plugins/translate/options.php:102
+#: squirrelmail/plugins/translate/options.php:101
 msgid ""
 "13 language pairs, maximum of 1000 characters translated, powered by Systran"
 msgstr "13¼ïÎà¤Î¸À¸ì¤ÎÁȤ߹ç¤ï¤»¡£ºÇÂç1000ʸ»ú¤Þ¤Ç¤ÎÀ©¸Â¡£SystranÄ󶡡£"
 
-#: squirrelmail/plugins/translate/options.php:105
+#: squirrelmail/plugins/translate/options.php:104
 msgid ""
 "10 language pairs, maximum of 25 kilobytes translated, powered by Systran"
 msgstr "10¼ïÎà¤Î¸À¸ì¤ÎÁȤ߹ç¤ï¤»¡£À©¸ÂÉÔÌÀ¡£SystranÄ󶡡£"
 
-#: squirrelmail/plugins/translate/options.php:108
+#: squirrelmail/plugins/translate/options.php:107
 msgid "12 language pairs, no known limits, powered by Systran"
 msgstr "12¸À¸ì¤ÎÁȤ߹ç¤ï¤»¡£À©¸ÂÉÔÌÀ¡£SystranÄ󶡡£"
 
-#: squirrelmail/plugins/translate/options.php:111
+#: squirrelmail/plugins/translate/options.php:110
 msgid ""
 "767 language pairs, no known limits, powered by Translation Experts's "
 "InterTran"
 msgstr "767¸À¸ì¤ÎÁȤ߹ç¤ï¤»¡£À©¸ÂÉÔÌÀ¡£Translation Experts's InterTranÄ󶡡£"
 
-#: squirrelmail/plugins/translate/options.php:114
+#: squirrelmail/plugins/translate/options.php:113
 msgid ""
 "8 language pairs, no known limits, powered by GPLTrans (free, open source)"
 msgstr "8¸À¸ì¤ÎÁȤ߹ç¤ï¤»¡£À©¸ÂÉÔÌÀ¡£GPLTransÄó¶¡(free, open source)"
 
-#: squirrelmail/plugins/translate/options.php:120
+#: squirrelmail/plugins/translate/options.php:119
 msgid ""
 "You also decide if you want the translation box displayed, and where it will "
 "be located."
 msgstr "ËÝÌõ¥Ü¥Ã¥¯¥¹¤Îɽ¼¨¡¢°ÌÃÖ¡¢ËÝÌõ¤ò»ÈÍѤ¹¤ë¤«¤É¤¦¤«ÀßÄꤹ¤ë¡£"
 
-#: squirrelmail/plugins/translate/options.php:124
+#: squirrelmail/plugins/translate/options.php:123
 msgid "Select your translator:"
 msgstr "ËÝÌõ¥µ¥¤¥È¤ÎÁªÂò:"
 
-#: squirrelmail/plugins/translate/options.php:136
+#: squirrelmail/plugins/translate/options.php:135
 msgid "When reading:"
 msgstr "Æɤà¤È¤­:"
 
-#: squirrelmail/plugins/translate/options.php:141
+#: squirrelmail/plugins/translate/options.php:140
 msgid "Show translation box"
 msgstr "ËÝÌõ¥Ü¥Ã¥¯¥¹¤Îɽ¼¨"
 
-#: squirrelmail/plugins/translate/options.php:143
+#: squirrelmail/plugins/translate/options.php:142
 msgid "to the left"
 msgstr "º¸¤Ë"
 
-#: squirrelmail/plugins/translate/options.php:144
+#: squirrelmail/plugins/translate/options.php:143
 msgid "in the center"
 msgstr "Ãæ±û¤Ë"
 
-#: squirrelmail/plugins/translate/options.php:145
+#: squirrelmail/plugins/translate/options.php:144
 msgid "to the right"
 msgstr "±¦¤Ë"
 
-#: squirrelmail/plugins/translate/options.php:150
+#: squirrelmail/plugins/translate/options.php:149
 msgid "Translate inside the SquirrelMail frames"
 msgstr "ËÝÌõ·ë²Ì¤òSquirrelMail¤Î¥Õ¥ì¡¼¥à¤ÎÃæ¤Ë"
 
-#: squirrelmail/plugins/translate/options.php:153
+#: squirrelmail/plugins/translate/options.php:152
 msgid "When composing:"
 msgstr "¥á¡¼¥ëºîÀ®»þ:"
 
-#: squirrelmail/plugins/translate/options.php:157
+#: squirrelmail/plugins/translate/options.php:156
 msgid "Not yet functional, currently does nothing"
 msgstr "¸½ºß¤Ïµ¡Ç½¤·¤Þ¤»¤ó¡£"
 
@@ -3348,23 +3329,11 @@ msgstr "
 msgid "Latin"
 msgstr "¥é¥Æ¥ó¸ì"
 
-#: squirrelmail/plugins/newmail/newmail.php:20
-msgid "New Mail"
-msgstr "¿·Ãå¥á¡¼¥ë"
-
-#: squirrelmail/plugins/newmail/newmail.php:26
-msgid "SquirrelMail Notice:"
-msgstr "SquirrelMail ÄÌÃÎ:"
-
-#: squirrelmail/plugins/newmail/newmail.php:31
-msgid "You have new mail!"
-msgstr "¿·¤·¤¤¥á¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡ª"
-
-#: squirrelmail/plugins/newmail/newmail_opt.php:38
+#: squirrelmail/plugins/newmail/newmail_opt.php:37
 msgid "New Mail Notification"
 msgstr "¿·Ãå¥á¡¼¥ë¤ÎÄÌÃÎ"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:44
+#: squirrelmail/plugins/newmail/newmail_opt.php:43
 msgid ""
 "Select <b>Enable Media Playing</b> to turn on playing a media file when "
 "unseen mail is in your folders. When enabled, you can specify the media file "
@@ -3373,7 +3342,7 @@ msgstr ""
 "̤ÆɤΥá¥Ã¥»¡¼¥¸¤¬¥Õ¥©¥ë¥À¡¼¤Ë¤¢¤ë¤È¤­²»¤òºÆÀ¸¤¹¤ë¾ì¹ç¡¢<b>²»¤ÎºÆÀ¸¤òÍ­¸ú</b>"
 "¤òÁªÂò¤·¤Æ¤ª¤­¤Þ¤¹¡£"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:48
+#: squirrelmail/plugins/newmail/newmail_opt.php:47
 msgid ""
 "The <b>Check all boxes, not just INBOX</b> option will check ALL of your "
 "folders for unseen mail, not just the inbox for notification."
@@ -3381,7 +3350,7 @@ msgstr ""
 "<b>INBOX¤À¤±¤Ç¤Ê¤¯¡¢Á´¤Æ¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò³Îǧ¤¹¤ë</b>¥ª¥×¥·¥ç¥ó¤ÏÁ´¤Æ¤Î¥Õ¥©"
 "¥ë¥À¤ò¤Î̤ÆɤΥÁ¥§¥Ã¥¯¤ò¤·¤ÆÄÌÃΤ·¤Þ¤¹¡£"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:51
+#: squirrelmail/plugins/newmail/newmail_opt.php:50
 msgid ""
 "Selecting the <b>Show popup</b> option will enable the showing of a popup "
 "window when unseen mail is in your folders (requires JavaScript)."
@@ -3390,7 +3359,7 @@ msgstr ""
 "¥á¡¼¥ë¤¬¤¢¤ë»þ¤Ë¥Ý¥Ã¥×¥¢¥Ã¥×¥¦¥¤¥ó¥É¥¦¤¬³«¤­¤Þ¤¹¡£(JavaScript¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤"
 "¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£)"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:54
+#: squirrelmail/plugins/newmail/newmail_opt.php:53
 msgid ""
 "Use the <b>Check RECENT</b> to only check for messages that are recent. "
 "Recent messages are those that have just recently showed up and have not "
@@ -3398,7 +3367,7 @@ msgid ""
 "by sounds or popups for unseen mail."
 msgstr "¿·Ãå¥á¡¼¥ë¤¬¤¢¤ë¤È¤­¤Ë¥Ý¥Ã¥×¥¢¥Ã¥×¥¦¥¤¥ó¥É¥¦¤ò³«¤¯"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:57
+#: squirrelmail/plugins/newmail/newmail_opt.php:56
 msgid ""
 "Selecting the <b>Change title</b> option will change the title in some "
 "browsers to let you know when you have new mail (requires JavaScript, and "
@@ -3411,7 +3380,7 @@ msgstr ""
 "¾¤Î¥Ö¥é¥¦¥¶¤Ç¤Ï¥¨¥é¡¼¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢¤¢¤Ê¤¿¤¬¡Ö¥Á¥§¥Ã¥¯"
 "RECENT¡×¤òÍ­¸ú¤Ë¤Æ¤¤¤Æ¤â¡¢¿·Ãå¥á¡¼¥ë¤¬¤¢¤ë¤«¤É¤¦¤«ÃΤ餻¤Æ¤¯¤ì¤Þ¤¹¡£"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:61
+#: squirrelmail/plugins/newmail/newmail_opt.php:60
 msgid ""
 "Select from the list of <b>server files</b> the media file to play when new "
 "mail arrives.  Selecting <b>local media</b> will play the file specified in "
@@ -3423,56 +3392,72 @@ msgstr ""
 "¤¹¡£¡Ö¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ÎÁªÂò¡×¥Ü¥Ã¥¯¥¹¤Ç¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤¬»ØÄê"
 "¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥µ¡¼¥Ð¤Î¥Ç¥Õ¥©¥ë¥È¤ò»È¤¤¤Þ¤¹¡£"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:74
+#: squirrelmail/plugins/newmail/newmail_opt.php:73
 msgid "Enable Media Playing"
 msgstr "²»¤ÎºÆÀ¸¤òÍ­¸ú"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:84
+#: squirrelmail/plugins/newmail/newmail_opt.php:83
 msgid "Check all boxes, not just INBOX"
 msgstr "INBOX¤À¤±¤Ç¤Ê¤¯¡¢Á´¤Æ¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò³Îǧ¤¹¤ë"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:93
+#: squirrelmail/plugins/newmail/newmail_opt.php:92
 msgid "Count only messages that are RECENT"
 msgstr "ºÇ¿·¤Î¥á¥Ã¥»¡¼¥¸¤Î¿ô¤À¤±"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:102
+#: squirrelmail/plugins/newmail/newmail_opt.php:101
 msgid "Change title on supported browsers."
 msgstr "¥¿¥¤¥È¥ë¤ÎÊѹ¹¤¬²Äǽ¤Ê¥Ö¥é¥¦¥¶¤Ç¤Ï¥¿¥¤¥È¥ë¤òÊѹ¹¤¹¤ë¡£"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:102
-#: squirrelmail/plugins/newmail/newmail_opt.php:111
+#: squirrelmail/plugins/newmail/newmail_opt.php:101
+#: squirrelmail/plugins/newmail/newmail_opt.php:110
 msgid "requires JavaScript to work"
 msgstr "Javascript¤¬Æ°¤¯¤³¤È¤¬É¬ÍפǤ¹"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:111
+#: squirrelmail/plugins/newmail/newmail_opt.php:110
 msgid "Show popup window on new mail"
 msgstr "¿·Ãå¥á¡¼¥ë¤¬¤¢¤ë¤È¤­¤Ë¥Ý¥Ã¥×¥¢¥Ã¥×¥¦¥¤¥ó¥É¥¦¤ò³«¤¯"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:115
+#: squirrelmail/plugins/newmail/newmail_opt.php:114
 msgid "Select server file:"
 msgstr "¥µ¡¼¥Ð¥Õ¥¡¥¤¥ë¤ÎÁªÂò:"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:118
+#: squirrelmail/plugins/newmail/newmail_opt.php:117
 msgid "(local media)"
 msgstr "(¥í¡¼¥«¥ë¥á¥Ç¥£¥¢)"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:135
+#: squirrelmail/plugins/newmail/newmail_opt.php:134
 msgid "Try"
 msgstr "»î¤¹"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:143
+#: squirrelmail/plugins/newmail/newmail_opt.php:142
 msgid "Local Media File:"
 msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë:"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:147
+#: squirrelmail/plugins/newmail/newmail_opt.php:146
 msgid "Current File:"
 msgstr "¸½ºß¤Î¥Õ¥¡¥¤¥ë:"
 
-#: squirrelmail/plugins/newmail/setup.php:78
+#: squirrelmail/plugins/newmail/newmail.php:20
+msgid "New Mail"
+msgstr "¿·Ãå¥á¡¼¥ë"
+
+#: squirrelmail/plugins/newmail/newmail.php:26
+msgid "SquirrelMail Notice:"
+msgstr "SquirrelMail ÄÌÃÎ:"
+
+#: squirrelmail/plugins/newmail/newmail.php:31
+msgid "You have new mail!"
+msgstr "¿·¤·¤¤¥á¡¼¥ë¤¬¤¢¤ê¤Þ¤¹¡ª"
+
+#: squirrelmail/plugins/newmail/newmail.php:33
+msgid "Close Window"
+msgstr "ÊĤ¸¤ë"
+
+#: squirrelmail/plugins/newmail/setup.php:79
 msgid "NewMail Options"
 msgstr "¿·Ãå¥á¡¼¥ë¥ª¥×¥·¥ç¥ó"
 
-#: squirrelmail/plugins/newmail/setup.php:80
+#: squirrelmail/plugins/newmail/setup.php:81
 msgid ""
 "This configures settings for playing sounds and/or showing popup windows "
 "when new mail arrives."
@@ -3480,16 +3465,16 @@ msgstr ""
 "¤³¤³¤Ç¤Ï¿·Ãå¥á¡¼¥ë¤¬¤¢¤Ã¤¿¤È¤­¤Ë¡¢¥µ¥¦¥ó¥É¤òÌĤ餷¤¿¤ê¡¢¥Ý¥Ã¥×¥¢¥Ã¥×¥¦¥¤¥ó¥É"
 "¥¦¤òɽ¼¨¤¹¤ëÀßÄê¤ò¤·¤Þ¤¹¡£"
 
-#: squirrelmail/plugins/newmail/setup.php:129
+#: squirrelmail/plugins/newmail/setup.php:130
 msgid "New Mail Notification options saved"
 msgstr "¿·ÃåÄÌÃε¡Ç½¤ÎÀßÄ꤬Êݸ¤µ¤ì¤Þ¤·¤¿"
 
-#: squirrelmail/plugins/newmail/setup.php:202
+#: squirrelmail/plugins/newmail/setup.php:211
 #, c-format
 msgid "%s New Messages"
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸ %s ÄÌ"
 
-#: squirrelmail/plugins/newmail/setup.php:206
+#: squirrelmail/plugins/newmail/setup.php:215
 #, c-format
 msgid "%s New Message"
 msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸ %s ÄÌ"
@@ -3988,6 +3973,13 @@ msgstr "
 msgid "TODAY"
 msgstr "º£Æü"
 
+#: squirrelmail/plugins/calendar/day.php:37
+#: squirrelmail/plugins/calendar/event_create.php:101
+#: squirrelmail/plugins/calendar/event_delete.php:98
+#: squirrelmail/plugins/calendar/event_edit.php:204
+msgid "l, F j Y"
+msgstr "Yǯ F·î jÆü (D)"
+
 #: squirrelmail/plugins/calendar/day.php:89
 msgid "ADD"
 msgstr "ÄɲÃ"
@@ -4033,6 +4025,14 @@ msgstr "
 msgid "Event Has been added!"
 msgstr "¥¤¥Ù¥ó¥È¤ÏÄɲ䵤ì¤Þ¤·¤¿¡£"
 
+#: squirrelmail/plugins/calendar/event_create.php:125
+#: squirrelmail/plugins/calendar/event_delete.php:35
+#: squirrelmail/plugins/calendar/event_edit.php:37
+#: squirrelmail/plugins/calendar/event_edit.php:103
+#: squirrelmail/plugins/calendar/event_edit.php:127
+msgid "Date:"
+msgstr "ÆüÉÕ:"
+
 #: squirrelmail/plugins/calendar/event_create.php:129
 #: squirrelmail/plugins/calendar/event_delete.php:39
 #: squirrelmail/plugins/calendar/event_edit.php:52
@@ -4169,50 +4169,50 @@ msgstr ""
 msgid "Send Mail"
 msgstr "¥á¡¼¥ëÁ÷¿®"
 
-#: squirrelmail/plugins/listcommands/setup.php:33
+#: squirrelmail/plugins/listcommands/setup.php:31
 msgid "Post to List"
 msgstr "ML¤ËÅê¹Æ"
 
-#: squirrelmail/plugins/listcommands/setup.php:34
+#: squirrelmail/plugins/listcommands/setup.php:32
 msgid "Reply to List"
 msgstr "ML¤ËÊÖ¿®"
 
-#: squirrelmail/plugins/listcommands/setup.php:37
+#: squirrelmail/plugins/listcommands/setup.php:35
 msgid "List Archives"
 msgstr "¥¢¡¼¥«¥¤¥Ö"
 
-#: squirrelmail/plugins/listcommands/setup.php:38
+#: squirrelmail/plugins/listcommands/setup.php:36
 msgid "Contact Listowner"
 msgstr "ML´ÉÍý¼Ô¤ËÏ¢Íí"
 
-#: squirrelmail/plugins/listcommands/setup.php:115
-msgid "Mailing List:"
-msgstr ""
+#: squirrelmail/plugins/listcommands/setup.php:85
+msgid "Mailing List"
+msgstr "¥á¡¼¥ê¥ó¥°¥ê¥¹¥È"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:177
-#: squirrelmail/plugins/delete_move_next/setup.php:180
+#: squirrelmail/plugins/delete_move_next/setup.php:185
+#: squirrelmail/plugins/delete_move_next/setup.php:188
 msgid "Delete & Prev"
 msgstr "ºï½ü&Ìá¤ë"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:183
-#: squirrelmail/plugins/delete_move_next/setup.php:185
+#: squirrelmail/plugins/delete_move_next/setup.php:191
+#: squirrelmail/plugins/delete_move_next/setup.php:193
 msgid "Delete & Next"
 msgstr "ºï½ü&¼¡¤Ø"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:306
+#: squirrelmail/plugins/delete_move_next/setup.php:314
 msgid "Delete/Move/Next Buttons:"
 msgstr "ºï½ü¡¿°ÜÆ°¡¿¼¡¤Ø ¥Ü¥¿¥ó¡§"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:313
+#: squirrelmail/plugins/delete_move_next/setup.php:320
 msgid "Display at top"
 msgstr "¾å¤Ëɽ¼¨"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:319
-#: squirrelmail/plugins/delete_move_next/setup.php:331
+#: squirrelmail/plugins/delete_move_next/setup.php:326
+#: squirrelmail/plugins/delete_move_next/setup.php:338
 msgid "with move option"
 msgstr "°ÜÆ°¥ª¥×¥·¥ç¥óÉÕ¤­"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:325
+#: squirrelmail/plugins/delete_move_next/setup.php:332
 msgid "Display at bottom"
 msgstr "²¼¤Ëɽ¼¨"
 
@@ -4412,100 +4412,100 @@ msgstr "
 msgid "Default Charset"
 msgstr "¥Ç¥Õ¥©¥ë¥Èʸ»ú¥»¥Ã¥È"
 
-#: squirrelmail/plugins/administrator/defines.php:189
+#: squirrelmail/plugins/administrator/defines.php:190
 msgid "Data Directory"
 msgstr "¥Ç¡¼¥¿¥Ç¥£¥ì¥¯¥È¥ê"
 
-#: squirrelmail/plugins/administrator/defines.php:192
+#: squirrelmail/plugins/administrator/defines.php:193
 msgid "Temp Directory"
 msgstr "Temp¥Ç¥£¥ì¥¯¥È¥ê"
 
-#: squirrelmail/plugins/administrator/defines.php:195
+#: squirrelmail/plugins/administrator/defines.php:196
 msgid "Hash Level"
 msgstr "¥Ï¥Ã¥·¥å¥ì¥Ù¥ë"
 
-#: squirrelmail/plugins/administrator/defines.php:197
+#: squirrelmail/plugins/administrator/defines.php:198
 msgid "Hash Disabled"
 msgstr "¥Ï¥Ã¥·¥å̵¸ú"
 
-#: squirrelmail/plugins/administrator/defines.php:199
+#: squirrelmail/plugins/administrator/defines.php:200
 msgid "Moderate"
 msgstr "¥â¥Ç¥ì¡¼¥È"
 
-#: squirrelmail/plugins/administrator/defines.php:200
+#: squirrelmail/plugins/administrator/defines.php:201
 msgid "Medium"
 msgstr "Ãæ"
 
-#: squirrelmail/plugins/administrator/defines.php:202
+#: squirrelmail/plugins/administrator/defines.php:203
 msgid "Default Left Size"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Îº¸Â¦(¥Õ¥©¥ë¥À¤Ê¤É)¥Õ¥ì¡¼¥à¥µ¥¤¥º"
 
-#: squirrelmail/plugins/administrator/defines.php:205
+#: squirrelmail/plugins/administrator/defines.php:206
 msgid "Usernames in Lowercase"
 msgstr "¥æ¡¼¥¶¡¼Ì¾¤ò¾®Ê¸»ú¤Ë¸ÂÄê"
 
-#: squirrelmail/plugins/administrator/defines.php:207
+#: squirrelmail/plugins/administrator/defines.php:208
 msgid "Allow use of priority"
 msgstr "Í¥ÀèÅÙ¤ò»ÈÍÑ"
 
-#: squirrelmail/plugins/administrator/defines.php:209
+#: squirrelmail/plugins/administrator/defines.php:210
 msgid "Hide SM attributions"
 msgstr "SM¤Î¾ðÊó¤ò±£¤¹"
 
-#: squirrelmail/plugins/administrator/defines.php:211
+#: squirrelmail/plugins/administrator/defines.php:212
 msgid "Enable use of delivery receipts"
 msgstr "ÇÛÁ÷³Îǧ¤ò»ÈÍѤ¹¤ë"
 
-#: squirrelmail/plugins/administrator/defines.php:213
+#: squirrelmail/plugins/administrator/defines.php:214
 msgid "Allow editing of identities"
 msgstr "ID¤ÎÊÔ½¸¤ò²Äǽ¤Ë¤¹¤ë"
 
-#: squirrelmail/plugins/administrator/defines.php:215
+#: squirrelmail/plugins/administrator/defines.php:216
 msgid "Allow editing of full name"
 msgstr "̾Á°¤ÎÊÔ½¸¤ò²Äǽ¤Ë¤¹¤ë"
 
-#: squirrelmail/plugins/administrator/defines.php:218
-#: squirrelmail/plugins/administrator/defines.php:220
+#: squirrelmail/plugins/administrator/defines.php:219
+#: squirrelmail/plugins/administrator/defines.php:221
 msgid "Message of the Day"
 msgstr "º£Æü¤Î¥á¥Ã¥»¡¼¥¸"
 
-#: squirrelmail/plugins/administrator/defines.php:224
+#: squirrelmail/plugins/administrator/defines.php:225
 msgid "Database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹"
 
-#: squirrelmail/plugins/administrator/defines.php:226
+#: squirrelmail/plugins/administrator/defines.php:227
 msgid "Address book DSN"
 msgstr "¥¢¥É¥ì¥¹Ä¢DSN"
 
-#: squirrelmail/plugins/administrator/defines.php:229
+#: squirrelmail/plugins/administrator/defines.php:230
 msgid "Address book table"
 msgstr "¥¢¥É¥ì¥¹Ä¢¥Æ¡¼¥Ö¥ë̾"
 
-#: squirrelmail/plugins/administrator/defines.php:233
+#: squirrelmail/plugins/administrator/defines.php:234
 msgid "Preferences DSN"
 msgstr "ÀßÄêDSN"
 
-#: squirrelmail/plugins/administrator/defines.php:236
+#: squirrelmail/plugins/administrator/defines.php:237
 msgid "Preferences table"
 msgstr "ÀßÄê¥Æ¡¼¥Ö¥ë̾"
 
-#: squirrelmail/plugins/administrator/defines.php:240
+#: squirrelmail/plugins/administrator/defines.php:241
 msgid "Preferences username field"
 msgstr "ÀßÄê¥æ¡¼¥¶Ì¾¥Õ¥£¡¼¥ë¥É"
 
-#: squirrelmail/plugins/administrator/defines.php:244
+#: squirrelmail/plugins/administrator/defines.php:245
 msgid "Preferences key field"
 msgstr "ÀßÄꥭ¡¼¥Õ¥£¡¼¥ë¥É"
 
-#: squirrelmail/plugins/administrator/defines.php:248
+#: squirrelmail/plugins/administrator/defines.php:249
 msgid "Preferences value field"
 msgstr "ÀßÄêÃÍ¥Õ¥£¡¼¥ë¥É"
 
-#: squirrelmail/plugins/administrator/defines.php:253
+#: squirrelmail/plugins/administrator/defines.php:254
 msgid "Themes"
 msgstr "¥Æ¡¼¥Þ"
 
-#: squirrelmail/plugins/administrator/defines.php:255
+#: squirrelmail/plugins/administrator/defines.php:256
 msgid "Style Sheet URL (css)"
 msgstr "¥¹¥¿¥¤¥ë¥·¡¼¥ÈURL (css)"
 
@@ -4582,3 +4582,43 @@ msgstr "
 #: squirrelmail/po/independent_strings.txt:19
 msgid "Undelivered Message Headers"
 msgstr "ÇÛÁ÷ÉÔǽ¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À"
+
+#~ msgid "Viewing a message attachment"
+#~ msgstr "źÉդΥ¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤òɽ¼¨"
+
+#~ msgid "Save to:"
+#~ msgstr "°ÜÆ°"
+
+#~ msgid "Extract"
+#~ msgstr "¼è¤ê½Ð¤¹"
+
+#~ msgid "Enable request/confirm reading"
+#~ msgstr "¼õ¼èÄÌÃε¡Ç½¤ò»ÈÍѤ¹¤ë"
+
+#~ msgid "Use receive date for sort"
+#~ msgstr "¥½¡¼¥È¡Ê°ìÍ÷ɽ¼¨¡Ë¤Ë¼õ¿®ÆüÉÕ¤ò»ÈÍѤ¹¤ë"
+
+#~ msgid "Use References header for thread sort"
+#~ msgstr "References¥Ø¥Ã¥À¡¼¤Ç¥¹¥ì¥Ã¥É¤òʤÙÊѤ¨¤ë"
+
+#~ msgid "View Full Header"
+#~ msgstr "¥Ø¥Ã¥À¤Îɽ¼¨"
+
+#~ msgid "No Messages found"
+#~ msgstr "ɽ¼¨¤¹¤ë¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
+
+#~ msgid ""
+#~ "Please contact your system administrator and report the following error:"
+#~ msgstr "´ÉÍý¼Ô¤Ë¼¡¤Î¥á¥Ã¥»¡¼¥¸¤È¤È¤â¤ËÏ¢Íí¤ò¼è¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
+
+#~ msgid "No To Address"
+#~ msgstr "°¸Àè̵¤·"
+
+#~ msgid "Found"
+#~ msgstr "¤ß¤Ä¤«¤ê¤Þ¤·¤¿"
+
+#~ msgid "messages"
+#~ msgstr "¥á¥Ã¥»¡¼¥¸¤¬"
+
+#~ msgid "Error decoding mime structure.  Report this as a bug!"
+#~ msgstr "mime¤Î¥Ç¥³¡¼¥É¥¨¥é¡¼¡£¤³¤Î¥Ð¥°¤òÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤¡£"