瀏覽代碼

Text MDN fixed

philippe_mingo 23 年之前
父節點
當前提交
8bb53f6133
共有 5 個文件被更改,包括 251 次插入131 次删除
  1. 二進制
      locale/es_ES/LC_MESSAGES/squirrelmail.mo
  2. 115 58
      locale/es_ES/LC_MESSAGES/squirrelmail.po
  3. 109 54
      po/squirrelmail.po
  4. 17 17
      src/compose.php
  5. 10 2
      src/read_body.php

二進制
locale/es_ES/LC_MESSAGES/squirrelmail.mo


+ 115 - 58
locale/es_ES/LC_MESSAGES/squirrelmail.po

@@ -5,8 +5,8 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: $Id$\n"
 "Project-Id-Version: $Id$\n"
-"POT-Creation-Date: 2002-02-09 09:08+0100\n"
-"PO-Revision-Date: 2002-02-09 09:15GMT+1\n"
+"POT-Creation-Date: 2002-02-09 19:45+0100\n"
+"PO-Revision-Date: 2002-02-09 19:48GMT+1\n"
 "Last-Translator: Philippe Mingo <philippe@squirrelmail.org>\n"
 "Last-Translator: Philippe Mingo <philippe@squirrelmail.org>\n"
 "Language-Team: Spanish <squirrelmail-i18n@lists.sourceforge.net>\n"
 "Language-Team: Spanish <squirrelmail-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr "Origen"
 #: squirrelmail/functions/mailbox_display.php:570
 #: squirrelmail/functions/mailbox_display.php:570
 #: squirrelmail/plugins/filters/options.php:88
 #: squirrelmail/plugins/filters/options.php:88
 #: squirrelmail/src/addrbook_search_html.php:82
 #: squirrelmail/src/addrbook_search_html.php:82
-#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:132
+#: squirrelmail/src/compose.php:310 squirrelmail/src/download.php:132
 #: squirrelmail/src/download.php:139
 #: squirrelmail/src/download.php:139
 #: squirrelmail/src/options_highlight.php:325
 #: squirrelmail/src/options_highlight.php:325
 #: squirrelmail/src/printer_friendly_bottom.php:96
 #: squirrelmail/src/printer_friendly_bottom.php:96
@@ -194,18 +194,18 @@ msgstr "Agregar a %s"
 msgid "Draft Email Saved"
 msgid "Draft Email Saved"
 msgstr "Borrador Guardado"
 msgstr "Borrador Guardado"
 
 
-#: squirrelmail/src/compose.php:131 squirrelmail/src/compose.php:172
-#: squirrelmail/src/compose.php:183
+#: squirrelmail/src/compose.php:132 squirrelmail/src/compose.php:173
+#: squirrelmail/src/compose.php:184
 msgid "Could not move/copy file. File not attached"
 msgid "Could not move/copy file. File not attached"
 msgstr "No se puede mover/copiar el archivo. Archivo no adjuntado"
 msgstr "No se puede mover/copiar el archivo. Archivo no adjuntado"
 
 
-#: squirrelmail/src/compose.php:304
+#: squirrelmail/src/compose.php:305
 msgid "Original Message"
 msgid "Original Message"
 msgstr "Mensaje Original"
 msgstr "Mensaje Original"
 
 
 #: squirrelmail/functions/mailbox_display.php:586
 #: squirrelmail/functions/mailbox_display.php:586
 #: squirrelmail/plugins/filters/options.php:97
 #: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:130
+#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:130
 #: squirrelmail/src/download.php:135
 #: squirrelmail/src/download.php:135
 #: squirrelmail/src/options_highlight.php:334
 #: squirrelmail/src/options_highlight.php:334
 #: squirrelmail/src/options_order.php:40
 #: squirrelmail/src/options_order.php:40
@@ -216,7 +216,7 @@ msgstr "Asunto"
 
 
 #: squirrelmail/functions/mailbox_display.php:572
 #: squirrelmail/functions/mailbox_display.php:572
 #: squirrelmail/plugins/filters/options.php:85
 #: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:131
+#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:131
 #: squirrelmail/src/download.php:137
 #: squirrelmail/src/download.php:137
 #: squirrelmail/src/options_highlight.php:322
 #: squirrelmail/src/options_highlight.php:322
 #: squirrelmail/src/options_order.php:38
 #: squirrelmail/src/options_order.php:38
@@ -226,91 +226,97 @@ msgid "From"
 msgstr "De"
 msgstr "De"
 
 
 #: squirrelmail/functions/mailbox_display.php:580
 #: squirrelmail/functions/mailbox_display.php:580
-#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:133
+#: squirrelmail/src/compose.php:308 squirrelmail/src/download.php:133
 #: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
 #: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
 #: squirrelmail/src/printer_friendly_bottom.php:100
 #: squirrelmail/src/printer_friendly_bottom.php:100
 msgid "Date"
 msgid "Date"
 msgstr "Fecha"
 msgstr "Fecha"
 
 
 #: squirrelmail/plugins/listcommands/mailout.php:50
 #: squirrelmail/plugins/listcommands/mailout.php:50
-#: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:566
+#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:712
 msgid "From:"
 msgid "From:"
 msgstr "De:"
 msgstr "De:"
 
 
-#: squirrelmail/src/compose.php:489 squirrelmail/src/read_body.php:583
+#: squirrelmail/src/compose.php:492 squirrelmail/src/read_body.php:183
+#: squirrelmail/src/read_body.php:729
 msgid "To:"
 msgid "To:"
 msgstr "Para:"
 msgstr "Para:"
 
 
-#: squirrelmail/src/compose.php:497
+#: squirrelmail/src/compose.php:500
 msgid "CC:"
 msgid "CC:"
 msgstr "CC:"
 msgstr "CC:"
 
 
-#: squirrelmail/src/compose.php:505
+#: squirrelmail/src/compose.php:508
 msgid "BCC:"
 msgid "BCC:"
 msgstr "BCC:"
 msgstr "BCC:"
 
 
-#: squirrelmail/src/compose.php:512 squirrelmail/src/read_body.php:537
+#: squirrelmail/src/compose.php:515 squirrelmail/src/read_body.php:184
+#: squirrelmail/src/read_body.php:683
 msgid "Subject:"
 msgid "Subject:"
 msgstr "Asunto:"
 msgstr "Asunto:"
 
 
-#: squirrelmail/src/compose.php:557 squirrelmail/src/compose.php:619
+#: squirrelmail/src/compose.php:560 squirrelmail/src/compose.php:623
 msgid "Send"
 msgid "Send"
 msgstr "Enviar"
 msgstr "Enviar"
 
 
-#: squirrelmail/src/compose.php:563
+#: squirrelmail/src/compose.php:566
 msgid "Attach:"
 msgid "Attach:"
 msgstr "Adjunto:"
 msgstr "Adjunto:"
 
 
-#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:126
+#: squirrelmail/src/compose.php:571 squirrelmail/src/options_order.php:126
 msgid "Add"
 msgid "Add"
 msgstr "Agregar"
 msgstr "Agregar"
 
 
-#: squirrelmail/src/compose.php:584
+#: squirrelmail/src/compose.php:587
 msgid "Delete selected attachments"
 msgid "Delete selected attachments"
 msgstr "Borrar Adjuntos Seleccionados"
 msgstr "Borrar Adjuntos Seleccionados"
 
 
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:609
-#: squirrelmail/src/compose.php:613 squirrelmail/src/compose.php:617
+#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:613
+#: squirrelmail/src/compose.php:617 squirrelmail/src/compose.php:621
 msgid "Addresses"
 msgid "Addresses"
 msgstr "Direcciones"
 msgstr "Direcciones"
 
 
-#: squirrelmail/src/compose.php:622
+#: squirrelmail/src/compose.php:626
 msgid "Save Draft"
 msgid "Save Draft"
 msgstr "Guardar Borrador"
 msgstr "Guardar Borrador"
 
 
-#: squirrelmail/src/compose.php:628 squirrelmail/src/read_body.php:613
+#: squirrelmail/src/compose.php:632 squirrelmail/src/read_body.php:759
 msgid "Priority"
 msgid "Priority"
 msgstr "Prioridad"
 msgstr "Prioridad"
 
 
 #: squirrelmail/plugins/administrator/defines.php:191
 #: squirrelmail/plugins/administrator/defines.php:191
 #: squirrelmail/plugins/calendar/functions.php:98
 #: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
+#: squirrelmail/src/compose.php:633 squirrelmail/src/read_body.php:570
 msgid "High"
 msgid "High"
 msgstr "Alta"
 msgstr "Alta"
 
 
 #: squirrelmail/plugins/calendar/functions.php:97
 #: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:630 squirrelmail/src/read_body.php:437
+#: squirrelmail/src/compose.php:634 squirrelmail/src/read_body.php:583
 msgid "Normal"
 msgid "Normal"
 msgstr "Normal"
 msgstr "Normal"
 
 
 #: squirrelmail/plugins/administrator/defines.php:188
 #: squirrelmail/plugins/administrator/defines.php:188
-#: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
+#: squirrelmail/src/compose.php:635 squirrelmail/src/read_body.php:576
 msgid "Low"
 msgid "Low"
 msgstr "Baja"
 msgstr "Baja"
 
 
-#: squirrelmail/src/compose.php:653
+#: squirrelmail/src/compose.php:642
+msgid "Confirm reading:"
+msgstr "Confirmar lectura:"
+
+#: squirrelmail/src/compose.php:664
 msgid "You have not filled in the \"To:\" field."
 msgid "You have not filled in the \"To:\" field."
 msgstr "No ha completado el campo \"Para:\""
 msgstr "No ha completado el campo \"Para:\""
 
 
-#: squirrelmail/src/compose.php:736
+#: squirrelmail/src/compose.php:749
 msgid "said"
 msgid "said"
 msgstr "dijo"
 msgstr "dijo"
 
 
-#: squirrelmail/src/compose.php:739
+#: squirrelmail/src/compose.php:752
 msgid "quote"
 msgid "quote"
 msgstr "cita"
 msgstr "cita"
 
 
-#: squirrelmail/src/compose.php:739
+#: squirrelmail/src/compose.php:752
 msgid "who"
 msgid "who"
 msgstr "quien"
 msgstr "quien"
 
 
@@ -320,7 +326,7 @@ msgstr "Ver un texto adosado"
 
 
 #: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
 #: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
 #: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
 #: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
-#: squirrelmail/src/read_body.php:162 squirrelmail/src/vcard.php:35
+#: squirrelmail/src/read_body.php:306 squirrelmail/src/vcard.php:35
 #: squirrelmail/src/vcard.php:39
 #: squirrelmail/src/vcard.php:39
 msgid "View message"
 msgid "View message"
 msgstr "Ver el mensaje"
 msgstr "Ver el mensaje"
@@ -409,7 +415,7 @@ msgstr "Borrar Carpeta"
 #: squirrelmail/plugins/mail_fetch/options.php:170
 #: squirrelmail/plugins/mail_fetch/options.php:170
 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
 #: squirrelmail/src/options_identities.php:305
 #: squirrelmail/src/options_identities.php:305
-#: squirrelmail/src/read_body.php:473
+#: squirrelmail/src/read_body.php:619
 msgid "Delete"
 msgid "Delete"
 msgstr "Borrar"
 msgstr "Borrar"
 
 
@@ -476,7 +482,7 @@ msgstr "Tabla de Contenidos"
 #: squirrelmail/plugins/delete_move_next/setup.php:149
 #: squirrelmail/plugins/delete_move_next/setup.php:149
 #: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:495 squirrelmail/src/read_body.php:497
+#: squirrelmail/src/read_body.php:641 squirrelmail/src/read_body.php:643
 msgid "Previous"
 msgid "Previous"
 msgstr "Anterior"
 msgstr "Anterior"
 
 
@@ -486,7 +492,7 @@ msgstr "Anterior"
 #: squirrelmail/plugins/delete_move_next/setup.php:154
 #: squirrelmail/plugins/delete_move_next/setup.php:154
 #: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:501 squirrelmail/src/read_body.php:503
+#: squirrelmail/src/read_body.php:647 squirrelmail/src/read_body.php:649
 msgid "Next"
 msgid "Next"
 msgstr "Siguiente"
 msgstr "Siguiente"
 
 
@@ -671,6 +677,10 @@ msgstr "Activar Enlace discreto en Vista Preliminar"
 msgid "Enable Printer Friendly Clean Display"
 msgid "Enable Printer Friendly Clean Display"
 msgstr "Limpiar Visualización en Vista Preliminar"
 msgstr "Limpiar Visualización en Vista Preliminar"
 
 
+#: squirrelmail/src/options_display.php:231
+msgid "Enable request/confirm reading"
+msgstr "¿Activar confirmación de lectura?"
+
 #: squirrelmail/src/options_folder.php:40
 #: squirrelmail/src/options_folder.php:40
 msgid "Special Folder Options"
 msgid "Special Folder Options"
 msgstr "Opciones de Carpetas Especiales"
 msgstr "Opciones de Carpetas Especiales"
@@ -1172,43 +1182,56 @@ msgstr "Imprimir"
 msgid "Close Window"
 msgid "Close Window"
 msgstr "Cerrar Ventana"
 msgstr "Cerrar Ventana"
 
 
-#: squirrelmail/src/read_body.php:102
+#: squirrelmail/src/read_body.php:104
 msgid "View Printable Version"
 msgid "View Printable Version"
 msgstr "Vista Preliminar"
 msgstr "Vista Preliminar"
 
 
-#: squirrelmail/src/read_body.php:154
+#: squirrelmail/src/read_body.php:182
+msgid "Your message"
+msgstr "Su mensaje"
+
+#: squirrelmail/src/read_body.php:185
+msgid "Sent:"
+msgstr "Enviado:"
+
+#: squirrelmail/src/read_body.php:187
+#, c-format
+msgid "Was displayed on %s"
+msgstr "Se mostró el %s"
+
+#: squirrelmail/src/read_body.php:298
 msgid "Viewing Full Header"
 msgid "Viewing Full Header"
 msgstr "Ver Encabezados Completos"
 msgstr "Ver Encabezados Completos"
 
 
-#: squirrelmail/src/read_body.php:290
+#: squirrelmail/src/read_body.php:434
 msgid "more"
 msgid "more"
 msgstr "mas"
 msgstr "mas"
 
 
-#: squirrelmail/src/read_body.php:291
+#: squirrelmail/src/read_body.php:435
 msgid "less"
 msgid "less"
 msgstr "menos"
 msgstr "menos"
 
 
-#: squirrelmail/src/read_body.php:465
+#: squirrelmail/src/read_body.php:611
 msgid "Message List"
 msgid "Message List"
 msgstr "Lista de Mensajes"
 msgstr "Lista de Mensajes"
 
 
-#: squirrelmail/src/read_body.php:477
+#: squirrelmail/src/read_body.php:623
 msgid "Resume Draft"
 msgid "Resume Draft"
 msgstr "Recuperar Borrador"
 msgstr "Recuperar Borrador"
 
 
-#: squirrelmail/src/read_body.php:514
+#: squirrelmail/src/read_body.php:660
 msgid "Forward"
 msgid "Forward"
 msgstr "Reenviar"
 msgstr "Reenviar"
 
 
-#: squirrelmail/src/read_body.php:519
+#: squirrelmail/src/read_body.php:665
 msgid "Reply"
 msgid "Reply"
 msgstr "Responder"
 msgstr "Responder"
 
 
-#: squirrelmail/src/read_body.php:524
+#: squirrelmail/src/read_body.php:670
 msgid "Reply All"
 msgid "Reply All"
 msgstr "Responder a Todos"
 msgstr "Responder a Todos"
 
 
-#: squirrelmail/src/read_body.php:548 squirrelmail/src/read_body.php:551
+#: squirrelmail/src/read_body.php:694 squirrelmail/src/read_body.php:697
 msgid "View Full Header"
 msgid "View Full Header"
 msgstr "Ver Encabezado Completo"
 msgstr "Ver Encabezado Completo"
 
 
@@ -1217,14 +1240,48 @@ msgstr "Ver Encabezado Completo"
 #: squirrelmail/plugins/calendar/event_edit.php:35
 #: squirrelmail/plugins/calendar/event_edit.php:35
 #: squirrelmail/plugins/calendar/event_edit.php:93
 #: squirrelmail/plugins/calendar/event_edit.php:93
 #: squirrelmail/plugins/calendar/event_edit.php:106
 #: squirrelmail/plugins/calendar/event_edit.php:106
-#: squirrelmail/src/read_body.php:574
+#: squirrelmail/src/read_body.php:720
 msgid "Date:"
 msgid "Date:"
 msgstr "Fecha:"
 msgstr "Fecha:"
 
 
-#: squirrelmail/src/read_body.php:628
+#: squirrelmail/src/read_body.php:774
 msgid "Mailer"
 msgid "Mailer"
 msgstr "Cliente"
 msgstr "Cliente"
 
 
+#: squirrelmail/src/read_body.php:812 squirrelmail/src/read_body.php:822
+#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845
+#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:905
+#: squirrelmail/src/read_body.php:913 squirrelmail/src/read_body.php:927
+msgid "Read receipt"
+msgstr "Confirmación de lectura"
+
+#: squirrelmail/src/read_body.php:815 squirrelmail/src/read_body.php:824
+#: squirrelmail/src/read_body.php:907 squirrelmail/src/read_body.php:915
+msgid "send"
+msgstr "enviada"
+
+#: squirrelmail/src/read_body.php:816 squirrelmail/src/read_body.php:907
+msgid "Remove MDN flag"
+msgstr "Eliminar señal de envio"
+
+#: squirrelmail/src/read_body.php:835 squirrelmail/src/read_body.php:847
+#: squirrelmail/src/read_body.php:872 squirrelmail/src/read_body.php:929
+msgid "requested"
+msgstr "solicitada"
+
+#: squirrelmail/src/read_body.php:848 squirrelmail/src/read_body.php:873
+#: squirrelmail/src/read_body.php:930
+msgid "Send read receipt now"
+msgstr "Emitir confirmación de lectura"
+
+#: squirrelmail/src/read_body.php:860
+msgid ""
+"The message sender has requested a response to indicate that you have read "
+"this message. Would you like to send a receipt?"
+msgstr ""
+"El emisor del mensaje ha solicitado una contestación que indique que ha leido este mensaje. "
+"¿Desea mandarla ahora?"
+
 #: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
 #: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
 #: squirrelmail/src/redirect.php:64
 #: squirrelmail/src/redirect.php:64
 msgid "You must be logged in to access this page."
 msgid "You must be logged in to access this page."
@@ -1592,7 +1649,7 @@ msgid "Preference database error (%s). Exiting abnormally"
 msgstr "Archivo de preferencias %s no encontrado. Saliendo anormalmente."
 msgstr "Archivo de preferencias %s no encontrado. Saliendo anormalmente."
 
 
 #: squirrelmail/functions/display_messages.php:28
 #: squirrelmail/functions/display_messages.php:28
-#: squirrelmail/functions/imap_general.php:228
+#: squirrelmail/functions/imap_general.php:245
 msgid "Unknown user or password incorrect."
 msgid "Unknown user or password incorrect."
 msgstr "Usuario o contraseña incorrecto."
 msgstr "Usuario o contraseña incorrecto."
 
 
@@ -1643,7 +1700,7 @@ msgstr "Contacte con su administrador y comun
 msgid "Could not create initial preference file!"
 msgid "Could not create initial preference file!"
 msgstr "¡No se pudo crear el fichero inicial de preferencias!"
 msgstr "¡No se pudo crear el fichero inicial de preferencias!"
 
 
-#: squirrelmail/functions/imap_general.php:140
+#: squirrelmail/functions/imap_general.php:156
 #: squirrelmail/functions/imap_messages.php:119
 #: squirrelmail/functions/imap_messages.php:119
 #: squirrelmail/functions/imap_messages.php:127
 #: squirrelmail/functions/imap_messages.php:127
 #: squirrelmail/functions/imap_messages.php:146
 #: squirrelmail/functions/imap_messages.php:146
@@ -1653,37 +1710,37 @@ msgstr "
 msgid "ERROR : Could not complete request."
 msgid "ERROR : Could not complete request."
 msgstr "ERROR: No se pudo completar el pedido."
 msgstr "ERROR: No se pudo completar el pedido."
 
 
-#: squirrelmail/functions/imap_general.php:142
+#: squirrelmail/functions/imap_general.php:158
 #: squirrelmail/plugins/filters/filters.php:91
 #: squirrelmail/plugins/filters/filters.php:91
 msgid "Reason Given: "
 msgid "Reason Given: "
 msgstr "Razón dada: "
 msgstr "Razón dada: "
 
 
-#: squirrelmail/functions/imap_general.php:149
+#: squirrelmail/functions/imap_general.php:165
 #: squirrelmail/plugins/filters/filters.php:98
 #: squirrelmail/plugins/filters/filters.php:98
 msgid "ERROR : Bad or malformed request."
 msgid "ERROR : Bad or malformed request."
 msgstr "ERROR: pedido erroneo o con formato erroneo."
 msgstr "ERROR: pedido erroneo o con formato erroneo."
 
 
-#: squirrelmail/functions/imap_general.php:151
+#: squirrelmail/functions/imap_general.php:167
 #: squirrelmail/plugins/filters/filters.php:100
 #: squirrelmail/plugins/filters/filters.php:100
 msgid "Server responded: "
 msgid "Server responded: "
 msgstr "El servidor respondió: "
 msgstr "El servidor respondió: "
 
 
-#: squirrelmail/functions/imap_general.php:187
+#: squirrelmail/functions/imap_general.php:204
 #, c-format
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgid "Error connecting to IMAP server: %s."
 msgstr "Error conectando al servidor IMAP: %s."
 msgstr "Error conectando al servidor IMAP: %s."
 
 
-#: squirrelmail/functions/imap_general.php:203
+#: squirrelmail/functions/imap_general.php:220
 #, c-format
 #, c-format
 msgid "Bad request: %s"
 msgid "Bad request: %s"
 msgstr "Pedido Erroneo: %s"
 msgstr "Pedido Erroneo: %s"
 
 
-#: squirrelmail/functions/imap_general.php:205
+#: squirrelmail/functions/imap_general.php:222
 #, c-format
 #, c-format
 msgid "Unknown error: %s"
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 msgstr "Error desconocido: %s"
 
 
-#: squirrelmail/functions/imap_general.php:207
+#: squirrelmail/functions/imap_general.php:224
 msgid "Read data:"
 msgid "Read data:"
 msgstr "Leer datos:"
 msgstr "Leer datos:"
 
 
@@ -1801,7 +1858,7 @@ msgstr "Paginar"
 msgid "Show All"
 msgid "Show All"
 msgstr "Todos"
 msgstr "Todos"
 
 
-#: squirrelmail/functions/mime.php:369
+#: squirrelmail/functions/mime.php:368
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgstr ""
 msgstr ""
 "Se produjo un error al descodificar la estructura MIME. ¡Notifíquelo como un "
 "Se produjo un error al descodificar la estructura MIME. ¡Notifíquelo como un "
@@ -1993,11 +2050,11 @@ msgstr "GRATUITO - Lista Osirusoft de Servidores \"Opt-In\" sin confirmar."
 msgid ""
 msgid ""
 "FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail."
 "FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail."
 "cgi scripts. (planned)."
 "cgi scripts. (planned)."
-msgstr ""
+msgstr "GRATUITO - Formularios inseguros de Osirusoft."
 
 
 #: squirrelmail/plugins/filters/filters.php:464
 #: squirrelmail/plugins/filters/filters.php:464
 msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
 msgid "FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."
-msgstr ""
+msgstr "GRATUITO - Lista de servidores Proxy abiertos de Osirusoft."
 
 
 #: squirrelmail/plugins/filters/filters.php:472
 #: squirrelmail/plugins/filters/filters.php:472
 msgid ""
 msgid ""
@@ -2059,7 +2116,7 @@ msgstr ""
 
 
 #: squirrelmail/plugins/filters/filters.php:560
 #: squirrelmail/plugins/filters/filters.php:560
 msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
 msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
-msgstr ""
+msgstr "GRATUITO - Lista de conocidos SPAMERS de SPAMHaus."
 
 
 #: squirrelmail/plugins/filters/filters.php:568
 #: squirrelmail/plugins/filters/filters.php:568
 #, c-format
 #, c-format

+ 109 - 54
po/squirrelmail.po

@@ -6,7 +6,7 @@
 msgid ""
 msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-09 09:08+0100\n"
+"POT-Creation-Date: 2002-02-09 19:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgstr ""
 #: squirrelmail/functions/mailbox_display.php:570
 #: squirrelmail/functions/mailbox_display.php:570
 #: squirrelmail/plugins/filters/options.php:88
 #: squirrelmail/plugins/filters/options.php:88
 #: squirrelmail/src/addrbook_search_html.php:82
 #: squirrelmail/src/addrbook_search_html.php:82
-#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:132
+#: squirrelmail/src/compose.php:310 squirrelmail/src/download.php:132
 #: squirrelmail/src/download.php:139
 #: squirrelmail/src/download.php:139
 #: squirrelmail/src/options_highlight.php:325
 #: squirrelmail/src/options_highlight.php:325
 #: squirrelmail/src/printer_friendly_bottom.php:96
 #: squirrelmail/src/printer_friendly_bottom.php:96
@@ -194,18 +194,18 @@ msgstr ""
 msgid "Draft Email Saved"
 msgid "Draft Email Saved"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:131 squirrelmail/src/compose.php:172
-#: squirrelmail/src/compose.php:183
+#: squirrelmail/src/compose.php:132 squirrelmail/src/compose.php:173
+#: squirrelmail/src/compose.php:184
 msgid "Could not move/copy file. File not attached"
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:304
+#: squirrelmail/src/compose.php:305
 msgid "Original Message"
 msgid "Original Message"
 msgstr ""
 msgstr ""
 
 
 #: squirrelmail/functions/mailbox_display.php:586
 #: squirrelmail/functions/mailbox_display.php:586
 #: squirrelmail/plugins/filters/options.php:97
 #: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:130
+#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:130
 #: squirrelmail/src/download.php:135
 #: squirrelmail/src/download.php:135
 #: squirrelmail/src/options_highlight.php:334
 #: squirrelmail/src/options_highlight.php:334
 #: squirrelmail/src/options_order.php:40
 #: squirrelmail/src/options_order.php:40
@@ -216,7 +216,7 @@ msgstr ""
 
 
 #: squirrelmail/functions/mailbox_display.php:572
 #: squirrelmail/functions/mailbox_display.php:572
 #: squirrelmail/plugins/filters/options.php:85
 #: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:131
+#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:131
 #: squirrelmail/src/download.php:137
 #: squirrelmail/src/download.php:137
 #: squirrelmail/src/options_highlight.php:322
 #: squirrelmail/src/options_highlight.php:322
 #: squirrelmail/src/options_order.php:38
 #: squirrelmail/src/options_order.php:38
@@ -226,91 +226,97 @@ msgid "From"
 msgstr ""
 msgstr ""
 
 
 #: squirrelmail/functions/mailbox_display.php:580
 #: squirrelmail/functions/mailbox_display.php:580
-#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:133
+#: squirrelmail/src/compose.php:308 squirrelmail/src/download.php:133
 #: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
 #: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
 #: squirrelmail/src/printer_friendly_bottom.php:100
 #: squirrelmail/src/printer_friendly_bottom.php:100
 msgid "Date"
 msgid "Date"
 msgstr ""
 msgstr ""
 
 
 #: squirrelmail/plugins/listcommands/mailout.php:50
 #: squirrelmail/plugins/listcommands/mailout.php:50
-#: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:566
+#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:712
 msgid "From:"
 msgid "From:"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:489 squirrelmail/src/read_body.php:583
+#: squirrelmail/src/compose.php:492 squirrelmail/src/read_body.php:183
+#: squirrelmail/src/read_body.php:729
 msgid "To:"
 msgid "To:"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:497
+#: squirrelmail/src/compose.php:500
 msgid "CC:"
 msgid "CC:"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:505
+#: squirrelmail/src/compose.php:508
 msgid "BCC:"
 msgid "BCC:"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:512 squirrelmail/src/read_body.php:537
+#: squirrelmail/src/compose.php:515 squirrelmail/src/read_body.php:184
+#: squirrelmail/src/read_body.php:683
 msgid "Subject:"
 msgid "Subject:"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:557 squirrelmail/src/compose.php:619
+#: squirrelmail/src/compose.php:560 squirrelmail/src/compose.php:623
 msgid "Send"
 msgid "Send"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:563
+#: squirrelmail/src/compose.php:566
 msgid "Attach:"
 msgid "Attach:"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:126
+#: squirrelmail/src/compose.php:571 squirrelmail/src/options_order.php:126
 msgid "Add"
 msgid "Add"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:584
+#: squirrelmail/src/compose.php:587
 msgid "Delete selected attachments"
 msgid "Delete selected attachments"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:609
-#: squirrelmail/src/compose.php:613 squirrelmail/src/compose.php:617
+#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:613
+#: squirrelmail/src/compose.php:617 squirrelmail/src/compose.php:621
 msgid "Addresses"
 msgid "Addresses"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:622
+#: squirrelmail/src/compose.php:626
 msgid "Save Draft"
 msgid "Save Draft"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:628 squirrelmail/src/read_body.php:613
+#: squirrelmail/src/compose.php:632 squirrelmail/src/read_body.php:759
 msgid "Priority"
 msgid "Priority"
 msgstr ""
 msgstr ""
 
 
 #: squirrelmail/plugins/administrator/defines.php:191
 #: squirrelmail/plugins/administrator/defines.php:191
 #: squirrelmail/plugins/calendar/functions.php:98
 #: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
+#: squirrelmail/src/compose.php:633 squirrelmail/src/read_body.php:570
 msgid "High"
 msgid "High"
 msgstr ""
 msgstr ""
 
 
 #: squirrelmail/plugins/calendar/functions.php:97
 #: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:630 squirrelmail/src/read_body.php:437
+#: squirrelmail/src/compose.php:634 squirrelmail/src/read_body.php:583
 msgid "Normal"
 msgid "Normal"
 msgstr ""
 msgstr ""
 
 
 #: squirrelmail/plugins/administrator/defines.php:188
 #: squirrelmail/plugins/administrator/defines.php:188
-#: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
+#: squirrelmail/src/compose.php:635 squirrelmail/src/read_body.php:576
 msgid "Low"
 msgid "Low"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:653
+#: squirrelmail/src/compose.php:642
+msgid "Confirm reading:"
+msgstr ""
+
+#: squirrelmail/src/compose.php:664
 msgid "You have not filled in the \"To:\" field."
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:736
+#: squirrelmail/src/compose.php:749
 msgid "said"
 msgid "said"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:739
+#: squirrelmail/src/compose.php:752
 msgid "quote"
 msgid "quote"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/compose.php:739
+#: squirrelmail/src/compose.php:752
 msgid "who"
 msgid "who"
 msgstr ""
 msgstr ""
 
 
@@ -320,7 +326,7 @@ msgstr ""
 
 
 #: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
 #: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
 #: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
 #: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
-#: squirrelmail/src/read_body.php:162 squirrelmail/src/vcard.php:35
+#: squirrelmail/src/read_body.php:306 squirrelmail/src/vcard.php:35
 #: squirrelmail/src/vcard.php:39
 #: squirrelmail/src/vcard.php:39
 msgid "View message"
 msgid "View message"
 msgstr ""
 msgstr ""
@@ -409,7 +415,7 @@ msgstr ""
 #: squirrelmail/plugins/mail_fetch/options.php:170
 #: squirrelmail/plugins/mail_fetch/options.php:170
 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
 #: squirrelmail/src/options_identities.php:305
 #: squirrelmail/src/options_identities.php:305
-#: squirrelmail/src/read_body.php:473
+#: squirrelmail/src/read_body.php:619
 msgid "Delete"
 msgid "Delete"
 msgstr ""
 msgstr ""
 
 
@@ -474,7 +480,7 @@ msgstr ""
 #: squirrelmail/plugins/delete_move_next/setup.php:149
 #: squirrelmail/plugins/delete_move_next/setup.php:149
 #: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:495 squirrelmail/src/read_body.php:497
+#: squirrelmail/src/read_body.php:641 squirrelmail/src/read_body.php:643
 msgid "Previous"
 msgid "Previous"
 msgstr ""
 msgstr ""
 
 
@@ -484,7 +490,7 @@ msgstr ""
 #: squirrelmail/plugins/delete_move_next/setup.php:154
 #: squirrelmail/plugins/delete_move_next/setup.php:154
 #: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:501 squirrelmail/src/read_body.php:503
+#: squirrelmail/src/read_body.php:647 squirrelmail/src/read_body.php:649
 msgid "Next"
 msgid "Next"
 msgstr ""
 msgstr ""
 
 
@@ -669,6 +675,10 @@ msgstr ""
 msgid "Enable Printer Friendly Clean Display"
 msgid "Enable Printer Friendly Clean Display"
 msgstr ""
 msgstr ""
 
 
+#: squirrelmail/src/options_display.php:231
+msgid "Enable request/confirm reading"
+msgstr ""
+
 #: squirrelmail/src/options_folder.php:40
 #: squirrelmail/src/options_folder.php:40
 msgid "Special Folder Options"
 msgid "Special Folder Options"
 msgstr ""
 msgstr ""
@@ -1157,43 +1167,56 @@ msgstr ""
 msgid "Close Window"
 msgid "Close Window"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:102
+#: squirrelmail/src/read_body.php:104
 msgid "View Printable Version"
 msgid "View Printable Version"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:154
+#: squirrelmail/src/read_body.php:182
+msgid "Your message"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:185
+msgid "Sent:"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:187
+#, c-format
+msgid "Was displayed on %s"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:298
 msgid "Viewing Full Header"
 msgid "Viewing Full Header"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:290
+#: squirrelmail/src/read_body.php:434
 msgid "more"
 msgid "more"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:291
+#: squirrelmail/src/read_body.php:435
 msgid "less"
 msgid "less"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:465
+#: squirrelmail/src/read_body.php:611
 msgid "Message List"
 msgid "Message List"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:477
+#: squirrelmail/src/read_body.php:623
 msgid "Resume Draft"
 msgid "Resume Draft"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:514
+#: squirrelmail/src/read_body.php:660
 msgid "Forward"
 msgid "Forward"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:519
+#: squirrelmail/src/read_body.php:665
 msgid "Reply"
 msgid "Reply"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:524
+#: squirrelmail/src/read_body.php:670
 msgid "Reply All"
 msgid "Reply All"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:548 squirrelmail/src/read_body.php:551
+#: squirrelmail/src/read_body.php:694 squirrelmail/src/read_body.php:697
 msgid "View Full Header"
 msgid "View Full Header"
 msgstr ""
 msgstr ""
 
 
@@ -1202,14 +1225,46 @@ msgstr ""
 #: squirrelmail/plugins/calendar/event_edit.php:35
 #: squirrelmail/plugins/calendar/event_edit.php:35
 #: squirrelmail/plugins/calendar/event_edit.php:93
 #: squirrelmail/plugins/calendar/event_edit.php:93
 #: squirrelmail/plugins/calendar/event_edit.php:106
 #: squirrelmail/plugins/calendar/event_edit.php:106
-#: squirrelmail/src/read_body.php:574
+#: squirrelmail/src/read_body.php:720
 msgid "Date:"
 msgid "Date:"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/src/read_body.php:628
+#: squirrelmail/src/read_body.php:774
 msgid "Mailer"
 msgid "Mailer"
 msgstr ""
 msgstr ""
 
 
+#: squirrelmail/src/read_body.php:812 squirrelmail/src/read_body.php:822
+#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845
+#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:905
+#: squirrelmail/src/read_body.php:913 squirrelmail/src/read_body.php:927
+msgid "Read receipt"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:815 squirrelmail/src/read_body.php:824
+#: squirrelmail/src/read_body.php:907 squirrelmail/src/read_body.php:915
+msgid "send"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:816 squirrelmail/src/read_body.php:907
+msgid "Remove MDN flag"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:835 squirrelmail/src/read_body.php:847
+#: squirrelmail/src/read_body.php:872 squirrelmail/src/read_body.php:929
+msgid "requested"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:848 squirrelmail/src/read_body.php:873
+#: squirrelmail/src/read_body.php:930
+msgid "Send read receipt now"
+msgstr ""
+
+#: squirrelmail/src/read_body.php:860
+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/functions/auth.php:33 squirrelmail/src/redirect.php:60
 #: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
 #: squirrelmail/src/redirect.php:64
 #: squirrelmail/src/redirect.php:64
 msgid "You must be logged in to access this page."
 msgid "You must be logged in to access this page."
@@ -1577,7 +1632,7 @@ msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 msgstr ""
 
 
 #: squirrelmail/functions/display_messages.php:28
 #: squirrelmail/functions/display_messages.php:28
-#: squirrelmail/functions/imap_general.php:228
+#: squirrelmail/functions/imap_general.php:245
 msgid "Unknown user or password incorrect."
 msgid "Unknown user or password incorrect."
 msgstr ""
 msgstr ""
 
 
@@ -1626,7 +1681,7 @@ msgstr ""
 msgid "Could not create initial preference file!"
 msgid "Could not create initial preference file!"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:140
+#: squirrelmail/functions/imap_general.php:156
 #: squirrelmail/functions/imap_messages.php:119
 #: squirrelmail/functions/imap_messages.php:119
 #: squirrelmail/functions/imap_messages.php:127
 #: squirrelmail/functions/imap_messages.php:127
 #: squirrelmail/functions/imap_messages.php:146
 #: squirrelmail/functions/imap_messages.php:146
@@ -1636,37 +1691,37 @@ msgstr ""
 msgid "ERROR : Could not complete request."
 msgid "ERROR : Could not complete request."
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:142
+#: squirrelmail/functions/imap_general.php:158
 #: squirrelmail/plugins/filters/filters.php:91
 #: squirrelmail/plugins/filters/filters.php:91
 msgid "Reason Given: "
 msgid "Reason Given: "
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:149
+#: squirrelmail/functions/imap_general.php:165
 #: squirrelmail/plugins/filters/filters.php:98
 #: squirrelmail/plugins/filters/filters.php:98
 msgid "ERROR : Bad or malformed request."
 msgid "ERROR : Bad or malformed request."
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:151
+#: squirrelmail/functions/imap_general.php:167
 #: squirrelmail/plugins/filters/filters.php:100
 #: squirrelmail/plugins/filters/filters.php:100
 msgid "Server responded: "
 msgid "Server responded: "
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:187
+#: squirrelmail/functions/imap_general.php:204
 #, c-format
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgid "Error connecting to IMAP server: %s."
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:203
+#: squirrelmail/functions/imap_general.php:220
 #, c-format
 #, c-format
 msgid "Bad request: %s"
 msgid "Bad request: %s"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:205
+#: squirrelmail/functions/imap_general.php:222
 #, c-format
 #, c-format
 msgid "Unknown error: %s"
 msgid "Unknown error: %s"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/imap_general.php:207
+#: squirrelmail/functions/imap_general.php:224
 msgid "Read data:"
 msgid "Read data:"
 msgstr ""
 msgstr ""
 
 
@@ -1784,7 +1839,7 @@ msgstr ""
 msgid "Show All"
 msgid "Show All"
 msgstr ""
 msgstr ""
 
 
-#: squirrelmail/functions/mime.php:369
+#: squirrelmail/functions/mime.php:368
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgstr ""
 msgstr ""
 
 

+ 17 - 17
src/compose.php

@@ -559,7 +559,7 @@ function showInputForm () {
         echo '   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT ' .
         echo '   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT ' .
              'NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n";
              'NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n";
     }
     }
-    
+
     /* This code is for attachments */
     /* This code is for attachments */
     echo '   <TR>' . "\n" .
     echo '   <TR>' . "\n" .
          '     <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
          '     <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
@@ -604,17 +604,18 @@ function showInputForm () {
 function showComposeButtonRow()
 function showComposeButtonRow()
 {
 {
     global $use_javascript_addr_book, $save_as_draft,
     global $use_javascript_addr_book, $save_as_draft,
-           $default_use_priority, $mailprio, $default_use_mdn;
+           $default_use_priority, $mailprio, $default_use_mdn,
+           $data_dir, $username;
 
 
     echo "   <TR><td>\n   </td><td>\n";
     echo "   <TR><td>\n   </td><td>\n";
     if ($use_javascript_addr_book) {
     if ($use_javascript_addr_book) {
-        echo "      <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
-        echo "         <input type=button value=\\\""._("Addresses").
-                              "\\\" onclick='javascript:open_abook();'>\");";
-        echo "         // --></SCRIPT><NOSCRIPT>\n";
-        echo "         <input type=submit name=\"html_addr_search\" value=\"".
-                              _("Addresses")."\">";
-        echo "      </NOSCRIPT>\n";
+        echo "      <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"".
+             "         <input type=button value=\\\""._("Addresses").
+                              "\\\" onclick='javascript:open_abook();'>\");".
+             "         // --></SCRIPT><NOSCRIPT>\n".
+             "         <input type=submit name=\"html_addr_search\" value=\"".
+                              _("Addresses")."\">".
+             "      </NOSCRIPT>\n";
     } else {
     } else {
         echo "      <input type=submit name=\"html_addr_search\" value=\"".
         echo "      <input type=submit name=\"html_addr_search\" value=\"".
                               _("Addresses")."\">";
                               _("Addresses")."\">";
@@ -628,16 +629,16 @@ function showComposeButtonRow()
         if(!isset($mailprio)) {
         if(!isset($mailprio)) {
             $mailprio = "3";
             $mailprio = "3";
         }
         }
-        echo "\n\t". _("Priority") .':<select name="mailprio">'.
-            "\n\t\t<option value=1".($mailprio=='1'?' selected':'').'>'. _("High") .'</option>'.
-            "\n\t\t<option value=3".($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'.
-            "\n\t\t<option value=5".($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'.
-            "\n\t</select>";
+        echo _("Priority") .':<select name="mailprio">'.
+             "<option value=1".($mailprio=='1'?' selected':'').'>'. _("High") .'</option>'.
+             "<option value=3".($mailprio=='3'?' selected':'').'>'. _("Normal") .'</option>'.
+             "<option value=5".($mailprio=='5'?' selected':'').'>'. _("Low").'</option>'.
+             "</select>";
     }
     }
 
 
     $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
     $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
     if ($default_use_mdn) {
     if ($default_use_mdn) {
-        if ($mdn_user_support) {    
+        if ($mdn_user_support) {
             echo _("Confirm reading:").
             echo _("Confirm reading:").
                 "<input type=\"checkbox\" name=\"request_mdn\" value=1>";
                 "<input type=\"checkbox\" name=\"request_mdn\" value=1>";
         }
         }
@@ -645,8 +646,7 @@ function showComposeButtonRow()
 
 
     do_hook('compose_button_row');
     do_hook('compose_button_row');
 
 
-    echo "   </TD>\n";
-    echo "   </TR>\n\n";
+    echo "   </TD></TR>\n\n";
 }
 }
 
 
 function checkInput ($show)
 function checkInput ($show)

+ 10 - 2
src/read_body.php

@@ -178,11 +178,19 @@ function SendMDN ( $recipient , $sender) {
 
 
     $subject = $header->subject;
     $subject = $header->subject;
     $now = getLongDateString( time() );
     $now = getLongDateString( time() );
+
+    $body = _("Your message") . "\r\n\r\n" .
+            "\t" . _("To:") . ' ' . $to . "\r\n" .
+            "\t" . _("Subject:") . ' ' . $subject . "\r\n" .
+            "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
+            "\r\n" .
+            sprintf( _("Was displayed on %s"), $now );
+/*
     $body = sprintf( _("This message sent on %s to %s with subject \"%s\" has been displayed on %s."),
     $body = sprintf( _("This message sent on %s to %s with subject \"%s\" has been displayed on %s."),
                       $senton, $to, $subject, $now ) .
                       $senton, $to, $subject, $now ) .
             "\r\n" .
             "\r\n" .
             _("This is no guarantee that the message has been read or understood.") . "\r\n";
             _("This is no guarantee that the message has been read or understood.") . "\r\n";
-
+*/
     // part2  (RFC2298)
     // part2  (RFC2298)
 
 
     $original_recipient = $to;
     $original_recipient = $to;
@@ -228,7 +236,7 @@ function ToggleMDNflag ( $set ) {
         $sg = '-';
         $sg = '-';
     }
     }
 
 
-    $cmd = 'STORE ' . $passed_id . ' ' . $cmd . 'FLAGS ($MDNSent)';
+    $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
     sqimap_mailbox_select($imapConnection, $mailbox);
     sqimap_mailbox_select($imapConnection, $mailbox);
     $read = sqimap_run_command ($imapConnection, $cmd, true, $response, $readmessage);
     $read = sqimap_run_command ($imapConnection, $cmd, true, $response, $readmessage);