From 70c4fd84882a44094cee3959f6750c97ad6d81b8 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Sun, 10 Feb 2002 08:58:51 +0000 Subject: [PATCH] This commit contains several syntax fix. - Pontus: Don't use tabs 8-) - Jason, please pay atention at the changes. Mostly internationalization stuff and " to ' changes. Also leave E_ALL only in PHP.INI into the reporting error options. That way you'll get on screen all the compilation warnings in order to remove them. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2405 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_search.php | 85 ++++----- locale/es_ES/LC_MESSAGES/squirrelmail.mo | Bin 70411 -> 70565 bytes locale/es_ES/LC_MESSAGES/squirrelmail.po | 210 +++++++++++++---------- po/squirrelmail.po | 202 ++++++++++++---------- src/compose.php | 34 ++-- src/search.php | 121 ++++++------- 6 files changed, 352 insertions(+), 300 deletions(-) diff --git a/functions/imap_search.php b/functions/imap_search.php index faddd3bf..37205c86 100644 --- a/functions/imap_search.php +++ b/functions/imap_search.php @@ -26,26 +26,28 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo $urlMailbox = urlencode($mailbox); - /* Construct the Search QuERY */ + /* + Construct the Search QuERY -# account for multiple search terms + account for multiple search terms + */ - $multi_search = array (); - $search_what = ereg_replace("[ ]{2,}", ' ', $search_what); - $multi_search = split (' ', $search_what); - if (count($multi_search)==1) { - $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"'; - } - else { - $search_string = ''; - $count = count($multi_search); - for ($x=0;$x<$count;$x++) { - $search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" '; - } - } - $search_string = trim($search_string); + $multi_search = array (); + $search_what = ereg_replace("[ ]{2,}", ' ', $search_what); + $multi_search = split (' ', $search_what); + if (count($multi_search)==1) { + $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"'; + } + else { + $search_string = ''; + $count = count($multi_search); + for ($x=0;$x<$count;$x++) { + $search_string = $search_string . ' ' . $search_where . ' "' . $multi_search[$x] . '" '; + } + } + $search_string = trim($search_string); -# now use $search_string in the imap search + /* now use $search_string in the imap search */ if (isset($languages[$squirrelmail_language]['CHARSET']) && $languages[$squirrelmail_language]['CHARSET']) { @@ -62,7 +64,9 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message); } - unset($messagelist); $msgs=""; $c = 0; + unset($messagelist); + $msgs = ''; + $c = 0; /* Keep going till we find the SEARCH responce */ while ($c < count( $readin )) { @@ -79,18 +83,15 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo /* If nothing is found * SEARCH should be the first error else echo errors */ if (isset($errors) && strstr($errors,"* SEARCH")) { - if ($search_all != "all") { - echo '
' . _("No Messages Found") . '
'; - return; - } - else { - return; - } + if ($search_all != "all") { + echo '
' . _("No Messages Found") . '
'; + return; + } + else { + return; + } } -// else if ($search_all == 'all') { -// return; -// } - else if (isset($errors)) { + else if (isset($errors)) { echo ""; } @@ -155,7 +156,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo $i = 0; $j = 0; while ($j < count($messagelist)) { - if (isset($messages[$j]["FLAG_DELETED"]) && $messages[$j]["FLAG_DELETED"] == true) { + if (isset($messages[$j]['FLAG_DELETED']) && $messages[$j]['FLAG_DELETED']) { $j++; continue; } @@ -170,16 +171,16 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo if (count($messagelist) > 0) { $j=0; - if (!isset ($msg)) { - $msg = ''; + if (!isset ($msg)) { + $msg = ''; } if ($search_all != 'all') { - if ( !isset( $start_msg ) ) { - $start_msg =0; - } - if ( !isset( $sort ) ) { - $sort = 0; - } + if ( !isset( $start_msg ) ) { + $start_msg =0; + } + if ( !isset( $sort ) ) { + $sort = 0; + } mail_message_listing_beginning( $imapConnection, "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what), $mailbox, @@ -194,16 +195,16 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo -1, '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . ''); } - echo "Folder: $mailbox"; + echo '' . _("Folder:") . " $mailbox"; while ($j < count($msgs)) { printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what); $j++; - echo ''; + echo ''; } echo ''; - $count_all = count($msgs); + $count_all = count($msgs); } - return $count_all; + return $count_all; } ?> diff --git a/locale/es_ES/LC_MESSAGES/squirrelmail.mo b/locale/es_ES/LC_MESSAGES/squirrelmail.mo index 4681a49431fead2693254e1c4fa9fcc5a7c30a4b..e582a575b0bd50d2e63b4174da0c2be70f93b461 100644 GIT binary patch delta 18263 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\n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -48,13 +48,13 @@ msgstr "Origen" #: squirrelmail/src/download.php:139 #: squirrelmail/src/options_highlight.php:325 #: squirrelmail/src/printer_friendly_bottom.php:96 -#: squirrelmail/src/search.php:339 +#: squirrelmail/src/search.php:344 msgid "To" msgstr "Para" #: squirrelmail/plugins/filters/options.php:91 #: squirrelmail/src/addrbook_search_html.php:84 -#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:338 +#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:343 msgid "Cc" msgstr "Cc" @@ -88,7 +88,10 @@ msgstr "Todos los libros de direcciones" #: squirrelmail/functions/page_header.php:130 #: squirrelmail/src/addrbook_search.php:191 #: squirrelmail/src/addrbook_search_html.php:151 -#: squirrelmail/src/search.php:202 +#: squirrelmail/src/search.php:178 squirrelmail/src/search.php:189 +#: squirrelmail/src/search.php:207 squirrelmail/src/search.php:348 +#: squirrelmail/src/search.php:373 squirrelmail/src/search.php:394 +#: squirrelmail/src/search.php:404 msgid "Search" msgstr "Buscar" @@ -210,7 +213,7 @@ msgstr "Mensaje Original" #: squirrelmail/src/options_highlight.php:334 #: squirrelmail/src/options_order.php:40 #: squirrelmail/src/printer_friendly_bottom.php:101 -#: squirrelmail/src/search.php:336 +#: squirrelmail/src/search.php:341 msgid "Subject" msgstr "Asunto" @@ -221,7 +224,7 @@ msgstr "Asunto" #: squirrelmail/src/options_highlight.php:322 #: squirrelmail/src/options_order.php:38 #: squirrelmail/src/printer_friendly_bottom.php:95 -#: squirrelmail/src/search.php:337 +#: squirrelmail/src/search.php:342 msgid "From" msgstr "De" @@ -233,90 +236,98 @@ msgid "Date" msgstr "Fecha" #: squirrelmail/plugins/listcommands/mailout.php:50 -#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:712 +#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:710 msgid "From:" msgstr "De:" -#: squirrelmail/src/compose.php:492 squirrelmail/src/read_body.php:183 -#: squirrelmail/src/read_body.php:729 +#: squirrelmail/src/compose.php:493 squirrelmail/src/read_body.php:181 +#: squirrelmail/src/read_body.php:727 msgid "To:" msgstr "Para:" -#: squirrelmail/src/compose.php:500 +#: squirrelmail/src/compose.php:501 msgid "CC:" msgstr "CC:" -#: squirrelmail/src/compose.php:508 +#: squirrelmail/src/compose.php:509 msgid "BCC:" msgstr "BCC:" -#: squirrelmail/src/compose.php:515 squirrelmail/src/read_body.php:184 -#: squirrelmail/src/read_body.php:683 +#: squirrelmail/src/compose.php:516 squirrelmail/src/read_body.php:182 +#: squirrelmail/src/read_body.php:681 msgid "Subject:" msgstr "Asunto:" -#: squirrelmail/src/compose.php:560 squirrelmail/src/compose.php:623 +#: squirrelmail/src/compose.php:561 squirrelmail/src/compose.php:644 msgid "Send" msgstr "Enviar" -#: squirrelmail/src/compose.php:566 +#: squirrelmail/src/compose.php:567 msgid "Attach:" msgstr "Adjunto:" -#: squirrelmail/src/compose.php:571 squirrelmail/src/options_order.php:126 +#: squirrelmail/src/compose.php:572 squirrelmail/src/options_order.php:126 msgid "Add" msgstr "Agregar" -#: squirrelmail/src/compose.php:587 +#: squirrelmail/src/compose.php:589 msgid "Delete selected attachments" msgstr "Borrar Adjuntos Seleccionados" -#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:613 -#: squirrelmail/src/compose.php:617 squirrelmail/src/compose.php:621 -msgid "Addresses" -msgstr "Direcciones" - -#: squirrelmail/src/compose.php:626 -msgid "Save Draft" -msgstr "Guardar Borrador" - -#: squirrelmail/src/compose.php:632 squirrelmail/src/read_body.php:759 +#: squirrelmail/src/compose.php:616 squirrelmail/src/read_body.php:757 msgid "Priority" msgstr "Prioridad" #: squirrelmail/plugins/administrator/defines.php:191 #: squirrelmail/plugins/calendar/functions.php:98 -#: squirrelmail/src/compose.php:633 squirrelmail/src/read_body.php:570 +#: squirrelmail/src/compose.php:617 squirrelmail/src/read_body.php:568 msgid "High" msgstr "Alta" #: squirrelmail/plugins/calendar/functions.php:97 -#: squirrelmail/src/compose.php:634 squirrelmail/src/read_body.php:583 +#: squirrelmail/src/compose.php:618 squirrelmail/src/read_body.php:581 msgid "Normal" msgstr "Normal" #: squirrelmail/plugins/administrator/defines.php:188 -#: squirrelmail/src/compose.php:635 squirrelmail/src/read_body.php:576 +#: squirrelmail/src/compose.php:619 squirrelmail/src/read_body.php:574 msgid "Low" msgstr "Baja" -#: squirrelmail/src/compose.php:642 -msgid "Confirm reading:" -msgstr "Confirmar lectura:" +#: squirrelmail/src/compose.php:625 +msgid "Receipt" +msgstr "Confirmación" -#: squirrelmail/src/compose.php:664 +#: squirrelmail/src/compose.php:626 +msgid "On read" +msgstr "De lectura" + +#: squirrelmail/src/compose.php:627 +msgid "On Delivery" +msgstr "De entrega" + +#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:634 +#: squirrelmail/src/compose.php:638 squirrelmail/src/compose.php:642 +msgid "Addresses" +msgstr "Direcciones" + +#: squirrelmail/src/compose.php:647 +msgid "Save Draft" +msgstr "Guardar Borrador" + +#: squirrelmail/src/compose.php:666 msgid "You have not filled in the \"To:\" field." msgstr "No ha completado el campo \"Para:\"" -#: squirrelmail/src/compose.php:749 +#: squirrelmail/src/compose.php:751 msgid "said" msgstr "dijo" -#: squirrelmail/src/compose.php:752 +#: squirrelmail/src/compose.php:754 msgid "quote" msgstr "cita" -#: squirrelmail/src/compose.php:752 +#: squirrelmail/src/compose.php:754 msgid "who" msgstr "quien" @@ -326,7 +337,7 @@ msgstr "Ver un texto adosado" #: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36 #: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35 -#: squirrelmail/src/read_body.php:306 squirrelmail/src/vcard.php:35 +#: squirrelmail/src/read_body.php:304 squirrelmail/src/vcard.php:35 #: squirrelmail/src/vcard.php:39 msgid "View message" msgstr "Ver el mensaje" @@ -415,7 +426,7 @@ msgstr "Borrar Carpeta" #: squirrelmail/plugins/mail_fetch/options.php:170 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76 #: squirrelmail/src/options_identities.php:305 -#: squirrelmail/src/read_body.php:619 +#: squirrelmail/src/read_body.php:617 msgid "Delete" msgstr "Borrar" @@ -482,7 +493,7 @@ msgstr "Tabla de Contenidos" #: squirrelmail/plugins/delete_move_next/setup.php:149 #: squirrelmail/plugins/delete_move_next/setup.php:151 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189 -#: squirrelmail/src/read_body.php:641 squirrelmail/src/read_body.php:643 +#: squirrelmail/src/read_body.php:639 squirrelmail/src/read_body.php:641 msgid "Previous" msgstr "Anterior" @@ -492,7 +503,7 @@ msgstr "Anterior" #: squirrelmail/plugins/delete_move_next/setup.php:154 #: squirrelmail/plugins/delete_move_next/setup.php:156 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196 -#: squirrelmail/src/read_body.php:647 squirrelmail/src/read_body.php:649 +#: squirrelmail/src/read_body.php:645 squirrelmail/src/read_body.php:647 msgid "Next" msgstr "Siguiente" @@ -508,7 +519,7 @@ msgstr "Viendo una imagen adjunta" #: squirrelmail/functions/page_header.php:103 #: squirrelmail/plugins/mail_fetch/options.php:137 #: squirrelmail/plugins/mail_fetch/options.php:214 -#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:305 +#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:310 msgid "INBOX" msgstr "ENTRADA" @@ -1186,52 +1197,56 @@ msgstr "Cerrar Ventana" msgid "View Printable Version" msgstr "Vista Preliminar" -#: squirrelmail/src/read_body.php:182 +#: squirrelmail/src/read_body.php:180 msgid "Your message" msgstr "Su mensaje" -#: squirrelmail/src/read_body.php:185 +#: squirrelmail/src/read_body.php:183 msgid "Sent:" msgstr "Enviado:" -#: squirrelmail/src/read_body.php:187 +#: squirrelmail/src/read_body.php:185 #, c-format msgid "Was displayed on %s" msgstr "Se mostró el %s" -#: squirrelmail/src/read_body.php:298 +#: squirrelmail/src/read_body.php:222 +msgid "Read:" +msgstr "Leído:" + +#: squirrelmail/src/read_body.php:296 msgid "Viewing Full Header" msgstr "Ver Encabezados Completos" -#: squirrelmail/src/read_body.php:434 +#: squirrelmail/src/read_body.php:432 msgid "more" msgstr "mas" -#: squirrelmail/src/read_body.php:435 +#: squirrelmail/src/read_body.php:433 msgid "less" msgstr "menos" -#: squirrelmail/src/read_body.php:611 +#: squirrelmail/src/read_body.php:609 msgid "Message List" msgstr "Lista de Mensajes" -#: squirrelmail/src/read_body.php:623 +#: squirrelmail/src/read_body.php:621 msgid "Resume Draft" msgstr "Recuperar Borrador" -#: squirrelmail/src/read_body.php:660 +#: squirrelmail/src/read_body.php:658 msgid "Forward" msgstr "Reenviar" -#: squirrelmail/src/read_body.php:665 +#: squirrelmail/src/read_body.php:663 msgid "Reply" msgstr "Responder" -#: squirrelmail/src/read_body.php:670 +#: squirrelmail/src/read_body.php:668 msgid "Reply All" msgstr "Responder a Todos" -#: squirrelmail/src/read_body.php:694 squirrelmail/src/read_body.php:697 +#: squirrelmail/src/read_body.php:692 squirrelmail/src/read_body.php:695 msgid "View Full Header" msgstr "Ver Encabezado Completo" @@ -1240,47 +1255,47 @@ msgstr "Ver Encabezado Completo" #: squirrelmail/plugins/calendar/event_edit.php:35 #: squirrelmail/plugins/calendar/event_edit.php:93 #: squirrelmail/plugins/calendar/event_edit.php:106 -#: squirrelmail/src/read_body.php:720 +#: squirrelmail/src/read_body.php:718 msgid "Date:" msgstr "Fecha:" -#: squirrelmail/src/read_body.php:774 +#: squirrelmail/src/read_body.php:772 msgid "Mailer" 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 +#: squirrelmail/src/read_body.php:810 squirrelmail/src/read_body.php:820 +#: squirrelmail/src/read_body.php:831 squirrelmail/src/read_body.php:843 +#: squirrelmail/src/read_body.php:868 squirrelmail/src/read_body.php:903 +#: squirrelmail/src/read_body.php:911 squirrelmail/src/read_body.php:925 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 +#: squirrelmail/src/read_body.php:813 squirrelmail/src/read_body.php:822 +#: squirrelmail/src/read_body.php:905 squirrelmail/src/read_body.php:913 msgid "send" msgstr "enviada" -#: squirrelmail/src/read_body.php:816 squirrelmail/src/read_body.php:907 +#: squirrelmail/src/read_body.php:814 squirrelmail/src/read_body.php:905 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 +#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845 +#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:927 msgid "requested" msgstr "solicitada" -#: squirrelmail/src/read_body.php:848 squirrelmail/src/read_body.php:873 -#: squirrelmail/src/read_body.php:930 +#: squirrelmail/src/read_body.php:846 squirrelmail/src/read_body.php:871 +#: squirrelmail/src/read_body.php:928 msgid "Send read receipt now" msgstr "Emitir confirmación de lectura" -#: squirrelmail/src/read_body.php:860 +#: squirrelmail/src/read_body.php:858 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?" +"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/src/redirect.php:64 @@ -1299,43 +1314,43 @@ msgstr "Se ha producido un error contactando con el servidor." msgid "Contact your administrator for help." msgstr "Contacte con su administrador." -#: squirrelmail/src/search.php:237 +#: squirrelmail/src/search.php:242 msgid "edit" msgstr "editar" -#: squirrelmail/src/search.php:244 squirrelmail/src/search.php:283 +#: squirrelmail/src/search.php:249 squirrelmail/src/search.php:288 msgid "search" msgstr "buscar" -#: squirrelmail/src/search.php:247 +#: squirrelmail/src/search.php:252 msgid "delete" msgstr "borrar" -#: squirrelmail/src/search.php:275 +#: squirrelmail/src/search.php:280 msgid "save" msgstr "guardar" -#: squirrelmail/src/search.php:286 +#: squirrelmail/src/search.php:291 msgid "forget" msgstr "olvidar" -#: squirrelmail/src/search.php:295 +#: squirrelmail/src/search.php:300 msgid "Current Search" msgstr "Búsqueda Actual" -#: squirrelmail/src/search.php:334 +#: squirrelmail/src/search.php:339 msgid "Body" msgstr "Cuerpo" -#: squirrelmail/src/search.php:335 +#: squirrelmail/src/search.php:340 msgid "Everywhere" msgstr "Todos lados" -#: squirrelmail/src/search.php:362 squirrelmail/src/search.php:391 +#: squirrelmail/src/search.php:367 squirrelmail/src/search.php:396 msgid "Search Results" msgstr "Resultado de la búsqueda" -#: squirrelmail/src/search.php:382 +#: squirrelmail/src/search.php:387 msgid "No Messages found" msgstr "No se encontraron mensajes" @@ -1649,7 +1664,7 @@ msgid "Preference database error (%s). Exiting abnormally" msgstr "Archivo de preferencias %s no encontrado. Saliendo anormalmente." #: squirrelmail/functions/display_messages.php:28 -#: squirrelmail/functions/imap_general.php:245 +#: squirrelmail/functions/imap_general.php:249 msgid "Unknown user or password incorrect." msgstr "Usuario o contraseña incorrecto." @@ -1711,36 +1726,41 @@ msgid "ERROR : Could not complete request." msgstr "ERROR: No se pudo completar el pedido." #: squirrelmail/functions/imap_general.php:158 +#: squirrelmail/functions/imap_general.php:169 +msgid "Query:" +msgstr "Consulta:" + +#: squirrelmail/functions/imap_general.php:160 #: squirrelmail/plugins/filters/filters.php:91 msgid "Reason Given: " msgstr "Razón dada: " -#: squirrelmail/functions/imap_general.php:165 +#: squirrelmail/functions/imap_general.php:167 #: squirrelmail/plugins/filters/filters.php:98 msgid "ERROR : Bad or malformed request." msgstr "ERROR: pedido erroneo o con formato erroneo." -#: squirrelmail/functions/imap_general.php:167 +#: squirrelmail/functions/imap_general.php:171 #: squirrelmail/plugins/filters/filters.php:100 msgid "Server responded: " msgstr "El servidor respondió: " -#: squirrelmail/functions/imap_general.php:204 +#: squirrelmail/functions/imap_general.php:208 #, c-format msgid "Error connecting to IMAP server: %s." msgstr "Error conectando al servidor IMAP: %s." -#: squirrelmail/functions/imap_general.php:220 +#: squirrelmail/functions/imap_general.php:224 #, c-format msgid "Bad request: %s" msgstr "Pedido Erroneo: %s" -#: squirrelmail/functions/imap_general.php:222 +#: squirrelmail/functions/imap_general.php:226 #, c-format msgid "Unknown error: %s" msgstr "Error desconocido: %s" -#: squirrelmail/functions/imap_general.php:224 +#: squirrelmail/functions/imap_general.php:228 msgid "Read data:" msgstr "Leer datos:" @@ -1778,20 +1798,24 @@ msgstr "Sin destinatario" msgid "(unknown sender)" msgstr "(remitente desconocido)" -#: squirrelmail/functions/imap_search.php:83 +#: squirrelmail/functions/imap_search.php:87 msgid "No Messages Found" msgstr "No se Encontraron Mensajes" -#: squirrelmail/functions/imap_search.php:187 -#: squirrelmail/functions/imap_search.php:195 +#: squirrelmail/functions/imap_search.php:188 +#: squirrelmail/functions/imap_search.php:196 msgid "Found" msgstr "Encontrado" -#: squirrelmail/functions/imap_search.php:187 -#: squirrelmail/functions/imap_search.php:195 +#: squirrelmail/functions/imap_search.php:188 +#: squirrelmail/functions/imap_search.php:196 msgid "messages" msgstr "mensajes" +#: squirrelmail/functions/imap_search.php:198 +msgid "Folder:" +msgstr "Carpeta:" + #: squirrelmail/functions/mailbox_display.php:156 msgid "A" msgstr "C" diff --git a/po/squirrelmail.po b/po/squirrelmail.po index a36ab947..53622a74 100644 --- a/po/squirrelmail.po +++ b/po/squirrelmail.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-02-09 19:45+0100\n" +"POT-Creation-Date: 2002-02-10 09:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,13 +48,13 @@ msgstr "" #: squirrelmail/src/download.php:139 #: squirrelmail/src/options_highlight.php:325 #: squirrelmail/src/printer_friendly_bottom.php:96 -#: squirrelmail/src/search.php:339 +#: squirrelmail/src/search.php:344 msgid "To" msgstr "" #: squirrelmail/plugins/filters/options.php:91 #: squirrelmail/src/addrbook_search_html.php:84 -#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:338 +#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:343 msgid "Cc" msgstr "" @@ -88,7 +88,10 @@ msgstr "" #: squirrelmail/functions/page_header.php:130 #: squirrelmail/src/addrbook_search.php:191 #: squirrelmail/src/addrbook_search_html.php:151 -#: squirrelmail/src/search.php:202 +#: squirrelmail/src/search.php:178 squirrelmail/src/search.php:189 +#: squirrelmail/src/search.php:207 squirrelmail/src/search.php:348 +#: squirrelmail/src/search.php:373 squirrelmail/src/search.php:394 +#: squirrelmail/src/search.php:404 msgid "Search" msgstr "" @@ -210,7 +213,7 @@ msgstr "" #: squirrelmail/src/options_highlight.php:334 #: squirrelmail/src/options_order.php:40 #: squirrelmail/src/printer_friendly_bottom.php:101 -#: squirrelmail/src/search.php:336 +#: squirrelmail/src/search.php:341 msgid "Subject" msgstr "" @@ -221,7 +224,7 @@ msgstr "" #: squirrelmail/src/options_highlight.php:322 #: squirrelmail/src/options_order.php:38 #: squirrelmail/src/printer_friendly_bottom.php:95 -#: squirrelmail/src/search.php:337 +#: squirrelmail/src/search.php:342 msgid "From" msgstr "" @@ -233,90 +236,98 @@ msgid "Date" msgstr "" #: squirrelmail/plugins/listcommands/mailout.php:50 -#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:712 +#: squirrelmail/src/compose.php:465 squirrelmail/src/read_body.php:710 msgid "From:" msgstr "" -#: squirrelmail/src/compose.php:492 squirrelmail/src/read_body.php:183 -#: squirrelmail/src/read_body.php:729 +#: squirrelmail/src/compose.php:493 squirrelmail/src/read_body.php:181 +#: squirrelmail/src/read_body.php:727 msgid "To:" msgstr "" -#: squirrelmail/src/compose.php:500 +#: squirrelmail/src/compose.php:501 msgid "CC:" msgstr "" -#: squirrelmail/src/compose.php:508 +#: squirrelmail/src/compose.php:509 msgid "BCC:" msgstr "" -#: squirrelmail/src/compose.php:515 squirrelmail/src/read_body.php:184 -#: squirrelmail/src/read_body.php:683 +#: squirrelmail/src/compose.php:516 squirrelmail/src/read_body.php:182 +#: squirrelmail/src/read_body.php:681 msgid "Subject:" msgstr "" -#: squirrelmail/src/compose.php:560 squirrelmail/src/compose.php:623 +#: squirrelmail/src/compose.php:561 squirrelmail/src/compose.php:644 msgid "Send" msgstr "" -#: squirrelmail/src/compose.php:566 +#: squirrelmail/src/compose.php:567 msgid "Attach:" msgstr "" -#: squirrelmail/src/compose.php:571 squirrelmail/src/options_order.php:126 +#: squirrelmail/src/compose.php:572 squirrelmail/src/options_order.php:126 msgid "Add" msgstr "" -#: squirrelmail/src/compose.php:587 +#: squirrelmail/src/compose.php:589 msgid "Delete selected attachments" msgstr "" -#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:613 -#: squirrelmail/src/compose.php:617 squirrelmail/src/compose.php:621 -msgid "Addresses" -msgstr "" - -#: squirrelmail/src/compose.php:626 -msgid "Save Draft" -msgstr "" - -#: squirrelmail/src/compose.php:632 squirrelmail/src/read_body.php:759 +#: squirrelmail/src/compose.php:616 squirrelmail/src/read_body.php:757 msgid "Priority" msgstr "" #: squirrelmail/plugins/administrator/defines.php:191 #: squirrelmail/plugins/calendar/functions.php:98 -#: squirrelmail/src/compose.php:633 squirrelmail/src/read_body.php:570 +#: squirrelmail/src/compose.php:617 squirrelmail/src/read_body.php:568 msgid "High" msgstr "" #: squirrelmail/plugins/calendar/functions.php:97 -#: squirrelmail/src/compose.php:634 squirrelmail/src/read_body.php:583 +#: squirrelmail/src/compose.php:618 squirrelmail/src/read_body.php:581 msgid "Normal" msgstr "" #: squirrelmail/plugins/administrator/defines.php:188 -#: squirrelmail/src/compose.php:635 squirrelmail/src/read_body.php:576 +#: squirrelmail/src/compose.php:619 squirrelmail/src/read_body.php:574 msgid "Low" msgstr "" -#: squirrelmail/src/compose.php:642 -msgid "Confirm reading:" +#: squirrelmail/src/compose.php:625 +msgid "Receipt" +msgstr "" + +#: squirrelmail/src/compose.php:626 +msgid "On read" +msgstr "" + +#: squirrelmail/src/compose.php:627 +msgid "On Delivery" +msgstr "" + +#: squirrelmail/functions/page_header.php:124 squirrelmail/src/compose.php:634 +#: squirrelmail/src/compose.php:638 squirrelmail/src/compose.php:642 +msgid "Addresses" +msgstr "" + +#: squirrelmail/src/compose.php:647 +msgid "Save Draft" msgstr "" -#: squirrelmail/src/compose.php:664 +#: squirrelmail/src/compose.php:666 msgid "You have not filled in the \"To:\" field." msgstr "" -#: squirrelmail/src/compose.php:749 +#: squirrelmail/src/compose.php:751 msgid "said" msgstr "" -#: squirrelmail/src/compose.php:752 +#: squirrelmail/src/compose.php:754 msgid "quote" msgstr "" -#: squirrelmail/src/compose.php:752 +#: squirrelmail/src/compose.php:754 msgid "who" msgstr "" @@ -326,7 +337,7 @@ msgstr "" #: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36 #: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35 -#: squirrelmail/src/read_body.php:306 squirrelmail/src/vcard.php:35 +#: squirrelmail/src/read_body.php:304 squirrelmail/src/vcard.php:35 #: squirrelmail/src/vcard.php:39 msgid "View message" msgstr "" @@ -415,7 +426,7 @@ msgstr "" #: squirrelmail/plugins/mail_fetch/options.php:170 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76 #: squirrelmail/src/options_identities.php:305 -#: squirrelmail/src/read_body.php:619 +#: squirrelmail/src/read_body.php:617 msgid "Delete" msgstr "" @@ -480,7 +491,7 @@ msgstr "" #: squirrelmail/plugins/delete_move_next/setup.php:149 #: squirrelmail/plugins/delete_move_next/setup.php:151 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189 -#: squirrelmail/src/read_body.php:641 squirrelmail/src/read_body.php:643 +#: squirrelmail/src/read_body.php:639 squirrelmail/src/read_body.php:641 msgid "Previous" msgstr "" @@ -490,7 +501,7 @@ msgstr "" #: squirrelmail/plugins/delete_move_next/setup.php:154 #: squirrelmail/plugins/delete_move_next/setup.php:156 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196 -#: squirrelmail/src/read_body.php:647 squirrelmail/src/read_body.php:649 +#: squirrelmail/src/read_body.php:645 squirrelmail/src/read_body.php:647 msgid "Next" msgstr "" @@ -506,7 +517,7 @@ msgstr "" #: squirrelmail/functions/page_header.php:103 #: squirrelmail/plugins/mail_fetch/options.php:137 #: squirrelmail/plugins/mail_fetch/options.php:214 -#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:305 +#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:310 msgid "INBOX" msgstr "" @@ -1171,52 +1182,56 @@ msgstr "" msgid "View Printable Version" msgstr "" -#: squirrelmail/src/read_body.php:182 +#: squirrelmail/src/read_body.php:180 msgid "Your message" msgstr "" -#: squirrelmail/src/read_body.php:185 +#: squirrelmail/src/read_body.php:183 msgid "Sent:" msgstr "" -#: squirrelmail/src/read_body.php:187 +#: squirrelmail/src/read_body.php:185 #, c-format msgid "Was displayed on %s" msgstr "" -#: squirrelmail/src/read_body.php:298 +#: squirrelmail/src/read_body.php:222 +msgid "Read:" +msgstr "" + +#: squirrelmail/src/read_body.php:296 msgid "Viewing Full Header" msgstr "" -#: squirrelmail/src/read_body.php:434 +#: squirrelmail/src/read_body.php:432 msgid "more" msgstr "" -#: squirrelmail/src/read_body.php:435 +#: squirrelmail/src/read_body.php:433 msgid "less" msgstr "" -#: squirrelmail/src/read_body.php:611 +#: squirrelmail/src/read_body.php:609 msgid "Message List" msgstr "" -#: squirrelmail/src/read_body.php:623 +#: squirrelmail/src/read_body.php:621 msgid "Resume Draft" msgstr "" -#: squirrelmail/src/read_body.php:660 +#: squirrelmail/src/read_body.php:658 msgid "Forward" msgstr "" -#: squirrelmail/src/read_body.php:665 +#: squirrelmail/src/read_body.php:663 msgid "Reply" msgstr "" -#: squirrelmail/src/read_body.php:670 +#: squirrelmail/src/read_body.php:668 msgid "Reply All" msgstr "" -#: squirrelmail/src/read_body.php:694 squirrelmail/src/read_body.php:697 +#: squirrelmail/src/read_body.php:692 squirrelmail/src/read_body.php:695 msgid "View Full Header" msgstr "" @@ -1225,41 +1240,41 @@ msgstr "" #: squirrelmail/plugins/calendar/event_edit.php:35 #: squirrelmail/plugins/calendar/event_edit.php:93 #: squirrelmail/plugins/calendar/event_edit.php:106 -#: squirrelmail/src/read_body.php:720 +#: squirrelmail/src/read_body.php:718 msgid "Date:" msgstr "" -#: squirrelmail/src/read_body.php:774 +#: squirrelmail/src/read_body.php:772 msgid "Mailer" 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 +#: squirrelmail/src/read_body.php:810 squirrelmail/src/read_body.php:820 +#: squirrelmail/src/read_body.php:831 squirrelmail/src/read_body.php:843 +#: squirrelmail/src/read_body.php:868 squirrelmail/src/read_body.php:903 +#: squirrelmail/src/read_body.php:911 squirrelmail/src/read_body.php:925 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 +#: squirrelmail/src/read_body.php:813 squirrelmail/src/read_body.php:822 +#: squirrelmail/src/read_body.php:905 squirrelmail/src/read_body.php:913 msgid "send" msgstr "" -#: squirrelmail/src/read_body.php:816 squirrelmail/src/read_body.php:907 +#: squirrelmail/src/read_body.php:814 squirrelmail/src/read_body.php:905 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 +#: squirrelmail/src/read_body.php:833 squirrelmail/src/read_body.php:845 +#: squirrelmail/src/read_body.php:870 squirrelmail/src/read_body.php:927 msgid "requested" msgstr "" -#: squirrelmail/src/read_body.php:848 squirrelmail/src/read_body.php:873 -#: squirrelmail/src/read_body.php:930 +#: squirrelmail/src/read_body.php:846 squirrelmail/src/read_body.php:871 +#: squirrelmail/src/read_body.php:928 msgid "Send read receipt now" msgstr "" -#: squirrelmail/src/read_body.php:860 +#: squirrelmail/src/read_body.php:858 msgid "" "The message sender has requested a response to indicate that you have read " "this message. Would you like to send a receipt?" @@ -1282,43 +1297,43 @@ msgstr "" msgid "Contact your administrator for help." msgstr "" -#: squirrelmail/src/search.php:237 +#: squirrelmail/src/search.php:242 msgid "edit" msgstr "" -#: squirrelmail/src/search.php:244 squirrelmail/src/search.php:283 +#: squirrelmail/src/search.php:249 squirrelmail/src/search.php:288 msgid "search" msgstr "" -#: squirrelmail/src/search.php:247 +#: squirrelmail/src/search.php:252 msgid "delete" msgstr "" -#: squirrelmail/src/search.php:275 +#: squirrelmail/src/search.php:280 msgid "save" msgstr "" -#: squirrelmail/src/search.php:286 +#: squirrelmail/src/search.php:291 msgid "forget" msgstr "" -#: squirrelmail/src/search.php:295 +#: squirrelmail/src/search.php:300 msgid "Current Search" msgstr "" -#: squirrelmail/src/search.php:334 +#: squirrelmail/src/search.php:339 msgid "Body" msgstr "" -#: squirrelmail/src/search.php:335 +#: squirrelmail/src/search.php:340 msgid "Everywhere" msgstr "" -#: squirrelmail/src/search.php:362 squirrelmail/src/search.php:391 +#: squirrelmail/src/search.php:367 squirrelmail/src/search.php:396 msgid "Search Results" msgstr "" -#: squirrelmail/src/search.php:382 +#: squirrelmail/src/search.php:387 msgid "No Messages found" msgstr "" @@ -1632,7 +1647,7 @@ msgid "Preference database error (%s). Exiting abnormally" msgstr "" #: squirrelmail/functions/display_messages.php:28 -#: squirrelmail/functions/imap_general.php:245 +#: squirrelmail/functions/imap_general.php:249 msgid "Unknown user or password incorrect." msgstr "" @@ -1692,36 +1707,41 @@ msgid "ERROR : Could not complete request." msgstr "" #: squirrelmail/functions/imap_general.php:158 +#: squirrelmail/functions/imap_general.php:169 +msgid "Query:" +msgstr "" + +#: squirrelmail/functions/imap_general.php:160 #: squirrelmail/plugins/filters/filters.php:91 msgid "Reason Given: " msgstr "" -#: squirrelmail/functions/imap_general.php:165 +#: squirrelmail/functions/imap_general.php:167 #: squirrelmail/plugins/filters/filters.php:98 msgid "ERROR : Bad or malformed request." msgstr "" -#: squirrelmail/functions/imap_general.php:167 +#: squirrelmail/functions/imap_general.php:171 #: squirrelmail/plugins/filters/filters.php:100 msgid "Server responded: " msgstr "" -#: squirrelmail/functions/imap_general.php:204 +#: squirrelmail/functions/imap_general.php:208 #, c-format msgid "Error connecting to IMAP server: %s." msgstr "" -#: squirrelmail/functions/imap_general.php:220 +#: squirrelmail/functions/imap_general.php:224 #, c-format msgid "Bad request: %s" msgstr "" -#: squirrelmail/functions/imap_general.php:222 +#: squirrelmail/functions/imap_general.php:226 #, c-format msgid "Unknown error: %s" msgstr "" -#: squirrelmail/functions/imap_general.php:224 +#: squirrelmail/functions/imap_general.php:228 msgid "Read data:" msgstr "" @@ -1759,20 +1779,24 @@ msgstr "" msgid "(unknown sender)" msgstr "" -#: squirrelmail/functions/imap_search.php:83 +#: squirrelmail/functions/imap_search.php:87 msgid "No Messages Found" msgstr "" -#: squirrelmail/functions/imap_search.php:187 -#: squirrelmail/functions/imap_search.php:195 +#: squirrelmail/functions/imap_search.php:188 +#: squirrelmail/functions/imap_search.php:196 msgid "Found" msgstr "" -#: squirrelmail/functions/imap_search.php:187 -#: squirrelmail/functions/imap_search.php:195 +#: squirrelmail/functions/imap_search.php:188 +#: squirrelmail/functions/imap_search.php:196 msgid "messages" msgstr "" +#: squirrelmail/functions/imap_search.php:198 +msgid "Folder:" +msgstr "" + #: squirrelmail/functions/mailbox_display.php:156 msgid "A" msgstr "" diff --git a/src/compose.php b/src/compose.php index 5f4a3f13..9a020574 100644 --- a/src/compose.php +++ b/src/compose.php @@ -603,30 +603,29 @@ function showInputForm () { } -function showComposeButtonRow() -{ +function showComposeButtonRow() { global $use_javascript_addr_book, $save_as_draft, - $default_use_priority, $mailprio, $default_use_mdn, - $data_dir, $username; - + $default_use_priority, $mailprio, $default_use_mdn, + $data_dir, $username; + echo " \n\n"; if ($default_use_priority) { if(!isset($mailprio)) { $mailprio = "3"; - } - echo _("Priority") .':"; + } + echo _("Priority") .': "; } $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn); if ($default_use_mdn) { - if ($mdn_user_support) { - echo "\n\t". _("Receipt") .': '. - ''. _("On read"). - ' '. _("On Delivery"); - } + if ($mdn_user_support) { + echo "\n\t". _("Receipt") .': '. + ''. _("On read"). + ' '. _("On Delivery"); + } } echo " \n \n"; @@ -653,8 +652,7 @@ function showComposeButtonRow() echo " \n\n"; } -function checkInput ($show) -{ +function checkInput ($show) { /* * I implemented the $show variable because the error messages * were getting sent before the page header. So, I check once diff --git a/src/search.php b/src/search.php index 12121f7c..bb98716a 100644 --- a/src/search.php +++ b/src/search.php @@ -56,19 +56,19 @@ function get_saved($pref_name, $username, $data_dir) { /* function to update recent pref arrays */ function update_recent($what, $where, $mailbox, $username, $data_dir) { - $what_array = get_recent("search_what", $username, $data_dir); - $where_array = get_recent("search_where", $username, $data_dir); - $folder_array = get_recent("search_folder", $username, $data_dir); - $dupe = "no"; + $what_array = get_recent('search_what', $username, $data_dir); + $where_array = get_recent('search_where', $username, $data_dir); + $folder_array = get_recent('search_folder', $username, $data_dir); + $dupe = 'no'; for ($i=0;$i\n". "\n"; /* update the recent and saved searches from the pref files */ -$what_array = get_recent("search_what", $username, $data_dir); -$where_array = get_recent("search_where", $username, $data_dir); -$folder_array = get_recent("search_folder", $username, $data_dir); +$what_array = get_recent('search_what', $username, $data_dir); +$where_array = get_recent('search_where', $username, $data_dir); +$folder_array = get_recent('search_folder', $username, $data_dir); $recent_count = getPref($data_dir, $username, 'search_memory', 0); -$saved_what_array = get_saved("saved_what", $username, $data_dir); -$saved_where_array = get_saved("saved_where", $username, $data_dir); -$saved_folder_array = get_saved("saved_folder", $username, $data_dir); +$saved_what_array = get_saved('saved_what', $username, $data_dir); +$saved_where_array = get_saved('saved_where', $username, $data_dir); +$saved_folder_array = get_saved('saved_folder', $username, $data_dir); $saved_count = count($saved_what_array); $count_all = 0; @@ -303,7 +308,7 @@ for ($i = 0; $i < count($boxes); $i++) { $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']); if( $box2 == 'INBOX' ) { $box2 = _("INBOX"); - } + } if ($mailbox == $box) { echo " \n"; } @@ -340,7 +345,7 @@ s_opt( 'TO', $where, _("To") ); echo " \n" . " \n". " \n". - " \n". + " \n". " \n". " \n". "\n". @@ -352,7 +357,7 @@ do_hook('search_after_form'); /* search all folders option still in the works. returns a table for each - folder it finds a match in. + folder it finds a match in. */ if ($search_all == 'all') { @@ -365,7 +370,7 @@ if ($search_all == 'all') { if (!in_array('noselect', $boxes[$x]['flags'])) { $mailbox = $boxes[$x]['unformatted']; } - if (($submit == "Search" || $submit == "Search_no_update") && !empty($what)) { + if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) { sqimap_mailbox_select($imapConnection, $mailbox); $count_all = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all); array_push($perbox_count, $count_all); @@ -386,7 +391,7 @@ if ($search_all == 'all') { /* search one folder option */ else { - if (($submit == 'Search' || $submit == 'Search_no_update') && !empty($what)) { + if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) { echo '
' . _("Search Results") . "
\n"; @@ -396,11 +401,11 @@ else { } /* must have search terms to search */ -if ($submit == 'Search' && empty($what)) { +if ($submit == _("Search") && empty($what)) { echo "
Please enter something to search for
\n"; } -do_hook("search_bottom"); +do_hook('search_bottom'); sqimap_logout ($imapConnection); echo ''; -- 2.25.1