From 3b7d68e6fc4b4f9cd72948030a5dd8207af213fc Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 4 Feb 2002 14:58:45 +0000
Subject: [PATCH] Some intl. fix

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2357 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mailbox_display.php            |   5 +-
 functions/page_header.php                |   2 +-
 locale/es_ES/LC_MESSAGES/squirrelmail.mo | Bin 68671 -> 69402 bytes
 locale/es_ES/LC_MESSAGES/squirrelmail.po | 698 +++++++++++++----------
 po/squirrelmail.po                       |  28 +-
 src/search.php                           |   9 +-
 6 files changed, 416 insertions(+), 326 deletions(-)

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 65d0ae30..fd546af2 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -522,9 +522,12 @@ function mail_message_listing_beginning
 
     $boxes = sqimap_mailbox_list($imapConnection);
     for ($i = 0; $i < count($boxes); $i++) {
-        if (!in_array("noselect", $boxes[$i]['flags'])) {
+        if (!in_array('noselect', $boxes[$i]['flags'])) {
             $box = $boxes[$i]['unformatted'];
             $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            if( $box2 == 'INBOX' ) {
+                $box2 = _("INBOX");
+            }
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
         }
     }
diff --git a/functions/page_header.php b/functions/page_header.php
index d2f2ec99..808ce0bb 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -103,7 +103,7 @@ function checkForm() {
 
     /** Here is the header and wrapping table **/
     $shortBoxName = readShortMailboxName($mailbox, $delimiter);
-    if ( $shorBoxName == 'INBOX' ) {
+    if ( $shortBoxName == 'INBOX' ) {
         $shortBoxName = _("INBOX");
     }
     echo "<A NAME=pagetop></A>\n"
diff --git a/locale/es_ES/LC_MESSAGES/squirrelmail.mo b/locale/es_ES/LC_MESSAGES/squirrelmail.mo
index 50c1c0f9ee4f3c28703c84d756d59cd81c8e6231..ea5ff06c1c318ac62ac2bbc952a935629bd7ba9c 100644
GIT binary patch
delta 18580
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
UI3X>Gti-|T-Kl&hhgX~b0~5hij{pDw

delta 17885
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
PBXeetl`{@z_GtKj3=+it

diff --git a/locale/es_ES/LC_MESSAGES/squirrelmail.po b/locale/es_ES/LC_MESSAGES/squirrelmail.po
index 9dd9443f..fcf6c814 100644
--- a/locale/es_ES/LC_MESSAGES/squirrelmail.po
+++ b/locale/es_ES/LC_MESSAGES/squirrelmail.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $Id$\n"
-"POT-Creation-Date: 2002-01-31 09:30+0100\n"
+"POT-Creation-Date: 2002-02-04 15:51+0100\n"
 "PO-Revision-Date: 2002-01-19 12:19CET\n"
 "Last-Translator: Philippe Mingo <philippe@squirrelmail.org>\n"
 "Language-Team: Spanish <squirrelmail-i18n@lists.sourceforge.net>\n"
@@ -41,20 +41,20 @@ msgstr "Informaci
 msgid "Source"
 msgstr "Origen"
 
-#: squirrelmail/functions/mailbox_display.php:565
+#: squirrelmail/functions/mailbox_display.php:567
 #: squirrelmail/plugins/filters/options.php:88
 #: squirrelmail/src/addrbook_search_html.php:82
 #: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:132
 #: squirrelmail/src/download.php:139
 #: squirrelmail/src/options_highlight.php:325
 #: squirrelmail/src/printer_friendly_bottom.php:96
-#: squirrelmail/src/search.php:297
+#: squirrelmail/src/search.php:331
 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:296
+#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:330
 msgid "Cc"
 msgstr "Cc"
 
@@ -85,14 +85,14 @@ msgstr "en"
 msgid "All address books"
 msgstr "Todos los libros de direcciones"
 
-#: squirrelmail/functions/page_header.php:131
-#: squirrelmail/src/addrbook_search.php:190
+#: squirrelmail/functions/page_header.php:134
+#: squirrelmail/src/addrbook_search.php:191
 #: squirrelmail/src/addrbook_search_html.php:151
-#: squirrelmail/src/search.php:191
+#: squirrelmail/src/search.php:196
 msgid "Search"
 msgstr "Buscar"
 
-#: squirrelmail/src/addrbook_search.php:191
+#: squirrelmail/src/addrbook_search.php:192
 #: squirrelmail/src/addrbook_search_html.php:152
 msgid "List all"
 msgstr "Listar todos"
@@ -118,9 +118,12 @@ msgstr "No se encontr
 msgid "Return"
 msgstr "Volver"
 
+#: squirrelmail/plugins/newmail/testsound.php:33
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:412
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
 #: squirrelmail/src/addrbook_search.php:194
-msgid "Close window"
-msgstr "Cerrar Ventana"
+msgid "Close"
+msgstr "Cerrar"
 
 #: squirrelmail/src/addressbook.php:39 squirrelmail/src/addressbook.php:285
 msgid "Nickname"
@@ -200,29 +203,29 @@ msgstr "No se puede mover/copiar el archivo. Archivo no adjuntado"
 msgid "Original Message"
 msgstr "Mensaje Original"
 
-#: squirrelmail/functions/mailbox_display.php:581
+#: squirrelmail/functions/mailbox_display.php:583
 #: squirrelmail/plugins/filters/options.php:97
 #: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:130
 #: squirrelmail/src/download.php:135
 #: squirrelmail/src/options_highlight.php:334
 #: squirrelmail/src/options_order.php:40
 #: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/search.php:294
+#: squirrelmail/src/search.php:328
 msgid "Subject"
 msgstr "Asunto"
 
-#: squirrelmail/functions/mailbox_display.php:567
+#: squirrelmail/functions/mailbox_display.php:569
 #: squirrelmail/plugins/filters/options.php:85
 #: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:131
 #: squirrelmail/src/download.php:137
 #: squirrelmail/src/options_highlight.php:322
 #: squirrelmail/src/options_order.php:38
 #: squirrelmail/src/printer_friendly_bottom.php:95
-#: squirrelmail/src/search.php:295
+#: squirrelmail/src/search.php:329
 msgid "From"
 msgstr "De"
 
-#: squirrelmail/functions/mailbox_display.php:575
+#: squirrelmail/functions/mailbox_display.php:577
 #: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:133
 #: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
 #: squirrelmail/src/printer_friendly_bottom.php:100
@@ -266,7 +269,7 @@ msgstr "Agregar"
 msgid "Delete selected attachments"
 msgstr "Borrar Adjuntos Seleccionados"
 
-#: squirrelmail/functions/page_header.php:125 squirrelmail/src/compose.php:609
+#: squirrelmail/functions/page_header.php:128 squirrelmail/src/compose.php:609
 #: squirrelmail/src/compose.php:613 squirrelmail/src/compose.php:617
 msgid "Addresses"
 msgstr "Direcciones"
@@ -279,7 +282,7 @@ msgstr "Guardar Borrador"
 msgid "Priority"
 msgstr "Prioridad"
 
-#: squirrelmail/plugins/administrator/defines.php:174
+#: squirrelmail/plugins/administrator/defines.php:189
 #: squirrelmail/plugins/calendar/functions.php:98
 #: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
 msgid "High"
@@ -290,7 +293,7 @@ msgstr "Alta"
 msgid "Normal"
 msgstr "Normal"
 
-#: squirrelmail/plugins/administrator/defines.php:171
+#: squirrelmail/plugins/administrator/defines.php:186
 #: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
 msgid "Low"
 msgstr "Baja"
@@ -322,20 +325,20 @@ msgstr "Ver un texto adosado"
 msgid "View message"
 msgstr "Ver el mensaje"
 
-#: squirrelmail/functions/mime.php:624 squirrelmail/src/download.php:41
+#: squirrelmail/functions/mime.php:623 squirrelmail/src/download.php:41
 #: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:196
 msgid "Download this as a file"
 msgstr "Bajar este mensaje como un archivo"
 
-#: squirrelmail/src/folders_create.php:25
+#: squirrelmail/src/folders_create.php:27
 msgid "Illegal folder name.  Please select a different name."
 msgstr "Nombre de Carpeta Invalido. Por favor, seleccione uno diferente."
 
-#: squirrelmail/src/folders_create.php:25
+#: squirrelmail/src/folders_create.php:27
 msgid "Click here to go back"
 msgstr "Pulse aquí para volver"
 
-#: squirrelmail/functions/page_header.php:127 squirrelmail/src/folders.php:29
+#: squirrelmail/functions/page_header.php:130 squirrelmail/src/folders.php:29
 #: squirrelmail/src/left_main.php:238
 msgid "Folders"
 msgstr "Carpetas"
@@ -400,10 +403,10 @@ msgstr "No se encontraron carpetas"
 msgid "Delete Folder"
 msgstr "Borrar Carpeta"
 
-#: squirrelmail/functions/mailbox_display.php:538
+#: squirrelmail/functions/mailbox_display.php:540
 #: squirrelmail/plugins/filters/options.php:154
-#: squirrelmail/plugins/mail_fetch/options.php:168
-#: squirrelmail/plugins/mail_fetch/options.php:175
+#: squirrelmail/plugins/mail_fetch/options.php:163
+#: 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:473
@@ -436,16 +439,16 @@ msgstr "Renombrar una carpeta"
 msgid "New name:"
 msgstr "Nuevo nombre:"
 
-#: squirrelmail/functions/options.php:404
+#: squirrelmail/functions/options.php:414
 #: squirrelmail/plugins/filters/options.php:138
 #: squirrelmail/plugins/newmail/newmail_opt.php:133
-#: squirrelmail/plugins/translate/options.php:163
+#: squirrelmail/plugins/translate/options.php:160
 #: squirrelmail/src/folders_rename_getname.php:51
 #: squirrelmail/src/options_highlight.php:347
 msgid "Submit"
 msgstr "Enviar"
 
-#: squirrelmail/functions/page_header.php:133
+#: squirrelmail/functions/page_header.php:136
 #: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:91
 msgid "Help"
 msgstr "Ayuda"
@@ -467,9 +470,9 @@ msgstr "Algunos o todos los documentos de ayuda no fueron encontrados"
 msgid "Table of Contents"
 msgstr "Tabla de Contenidos"
 
-#: squirrelmail/functions/mailbox_display.php:735
-#: squirrelmail/functions/mailbox_display.php:738
-#: squirrelmail/functions/mailbox_display.php:741
+#: squirrelmail/functions/mailbox_display.php:743
+#: squirrelmail/functions/mailbox_display.php:746
+#: squirrelmail/functions/mailbox_display.php:749
 #: squirrelmail/plugins/delete_move_next/setup.php:149
 #: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/src/help.php:187 squirrelmail/src/help.php:191
@@ -477,9 +480,9 @@ msgstr "Tabla de Contenidos"
 msgid "Previous"
 msgstr "Anterior"
 
-#: squirrelmail/functions/mailbox_display.php:736
-#: squirrelmail/functions/mailbox_display.php:739
-#: squirrelmail/functions/mailbox_display.php:742
+#: squirrelmail/functions/mailbox_display.php:744
+#: squirrelmail/functions/mailbox_display.php:747
+#: squirrelmail/functions/mailbox_display.php:750
 #: squirrelmail/plugins/delete_move_next/setup.php:154
 #: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/src/help.php:195 squirrelmail/src/help.php:198
@@ -495,6 +498,9 @@ msgstr "Arriba"
 msgid "Viewing an image attachment"
 msgstr "Viendo una imagen adjunta"
 
+#: squirrelmail/functions/page_header.php:107
+#: squirrelmail/plugins/mail_fetch/options.php:137
+#: squirrelmail/plugins/mail_fetch/options.php:214
 #: squirrelmail/src/left_main.php:73
 msgid "INBOX"
 msgstr "ENTRADA"
@@ -530,7 +536,7 @@ msgid "Name:"
 msgstr "Nombre:"
 
 #: squirrelmail/plugins/mail_fetch/options.php:126
-#: squirrelmail/plugins/mail_fetch/options.php:207
+#: squirrelmail/plugins/mail_fetch/options.php:202
 #: squirrelmail/src/login.php:129
 msgid "Password:"
 msgstr "Clave:"
@@ -549,7 +555,7 @@ msgstr "Opciones Generales de Visualizaci
 msgid "Theme"
 msgstr "Tema"
 
-#: squirrelmail/plugins/administrator/defines.php:40
+#: squirrelmail/plugins/administrator/defines.php:42
 #: squirrelmail/src/options_display.php:51
 #: squirrelmail/src/options_display.php:80
 msgid "Default"
@@ -676,7 +682,7 @@ msgstr "Ubicaci
 msgid "Do not use Trash"
 msgstr "No usar papelera"
 
-#: squirrelmail/plugins/administrator/defines.php:115
+#: squirrelmail/plugins/administrator/defines.php:125
 #: squirrelmail/src/options_folder.php:67
 msgid "Trash Folder"
 msgstr "Papelera"
@@ -685,7 +691,7 @@ msgstr "Papelera"
 msgid "Do not use Sent"
 msgstr "No usar Elementos enviados"
 
-#: squirrelmail/plugins/administrator/defines.php:118
+#: squirrelmail/plugins/administrator/defines.php:128
 #: squirrelmail/src/options_folder.php:78
 msgid "Sent Folder"
 msgstr "Elementos enviados"
@@ -694,7 +700,7 @@ msgstr "Elementos enviados"
 msgid "Do not use Drafts"
 msgstr "No usar borrador"
 
-#: squirrelmail/plugins/administrator/defines.php:121
+#: squirrelmail/plugins/administrator/defines.php:131
 #: squirrelmail/src/options_folder.php:89
 msgid "Draft Folder"
 msgstr "Borradores"
@@ -715,7 +721,7 @@ msgstr "Izquierda"
 msgid "Right"
 msgstr "Derecha"
 
-#: squirrelmail/plugins/administrator/defines.php:43
+#: squirrelmail/plugins/administrator/defines.php:45
 #: squirrelmail/src/options_folder.php:111
 msgid "pixels"
 msgstr "pixels"
@@ -744,14 +750,17 @@ msgstr "Actualizar Carpetas"
 msgid "Enable Unread Message Notification"
 msgstr "Activar Notificación de Nuevos Mensajes"
 
+#: squirrelmail/plugins/administrator/defines.php:152
 #: squirrelmail/src/options_folder.php:145
 msgid "No Notification"
 msgstr "No Advertir"
 
+#: squirrelmail/plugins/administrator/defines.php:153
 #: squirrelmail/src/options_folder.php:146
 msgid "Only INBOX"
 msgstr "Solo Bandeja de entrada"
 
+#: squirrelmail/plugins/administrator/defines.php:154
 #: squirrelmail/src/options_folder.php:147
 msgid "All Folders"
 msgstr "Todas las carpetas"
@@ -760,10 +769,12 @@ msgstr "Todas las carpetas"
 msgid "Unread Message Notification Type"
 msgstr "Tipo de Notificación de Nuevos Mensajes"
 
+#: squirrelmail/plugins/administrator/defines.php:157
 #: squirrelmail/src/options_folder.php:155
 msgid "Only Unseen"
 msgstr "Solo Nuevos"
 
+#: squirrelmail/plugins/administrator/defines.php:158
 #: squirrelmail/src/options_folder.php:156
 msgid "Unseen and Total"
 msgstr "No leídos y total"
@@ -801,17 +812,18 @@ msgstr "Memorizar B
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: squirrelmail/functions/page_header.php:129
+#: squirrelmail/functions/page_header.php:132
 #: squirrelmail/plugins/filters/options.php:62
 #: squirrelmail/plugins/newmail/newmail_opt.php:34
-#: squirrelmail/plugins/translate/options.php:97
+#: squirrelmail/plugins/spamcop/options.php:28
+#: squirrelmail/plugins/translate/options.php:94
 #: squirrelmail/src/options.php:165 squirrelmail/src/options_highlight.php:62
 #: squirrelmail/src/options_identities.php:44
 #: squirrelmail/src/options_order.php:31
 msgid "Options"
 msgstr "Opciones"
 
-#: squirrelmail/src/options.php:113 squirrelmail/src/options.php:267
+#: squirrelmail/src/options.php:113 squirrelmail/src/options.php:268
 #: squirrelmail/src/options_highlight.php:62
 msgid "Message Highlighting"
 msgstr "Resaltado de Mensajes"
@@ -822,14 +834,14 @@ msgid "New"
 msgstr "Nuevo"
 
 #: squirrelmail/plugins/filters/options.php:65
-#: squirrelmail/plugins/filters/spamoptions.php:149
+#: squirrelmail/plugins/filters/spamoptions.php:148
 #: squirrelmail/plugins/mail_fetch/fetch.php:225
 #: squirrelmail/src/options_highlight.php:67
 msgid "Done"
 msgstr "Listo"
 
 #: squirrelmail/plugins/filters/options.php:152
-#: squirrelmail/plugins/filters/spamoptions.php:148
+#: squirrelmail/plugins/filters/spamoptions.php:147
 #: squirrelmail/src/options_highlight.php:74
 msgid "Edit"
 msgstr "Editar"
@@ -962,7 +974,7 @@ msgstr "Ponerla por omisi
 msgid "Move Up"
 msgstr "Mover Arriba"
 
-#: squirrelmail/src/options.php:125 squirrelmail/src/options.php:283
+#: squirrelmail/src/options.php:125 squirrelmail/src/options.php:284
 #: squirrelmail/src/options_order.php:31
 msgid "Index Order"
 msgstr "Orden de índice"
@@ -975,7 +987,7 @@ msgstr "Checkbox"
 msgid "Flags"
 msgstr "Indicadores"
 
-#: squirrelmail/functions/mailbox_display.php:587
+#: squirrelmail/functions/mailbox_display.php:589
 #: squirrelmail/src/options_order.php:42
 msgid "Size"
 msgstr "Tamaño"
@@ -1073,15 +1085,15 @@ msgstr "Preceder firma con '-- '"
 msgid "Signature"
 msgstr "Firma"
 
-#: squirrelmail/src/options.php:101 squirrelmail/src/options.php:251
+#: squirrelmail/src/options.php:101 squirrelmail/src/options.php:252
 msgid "Personal Information"
 msgstr "Información Personal"
 
-#: squirrelmail/src/options.php:107 squirrelmail/src/options.php:259
+#: squirrelmail/src/options.php:107 squirrelmail/src/options.php:260
 msgid "Display Preferences"
 msgstr "Preferencias de Pantalla"
 
-#: squirrelmail/src/options.php:119 squirrelmail/src/options.php:275
+#: squirrelmail/src/options.php:119 squirrelmail/src/options.php:276
 msgid "Folder Preferences"
 msgstr "Preferencias de Carpetas"
 
@@ -1089,15 +1101,15 @@ msgstr "Preferencias de Carpetas"
 msgid "Successfully Saved Options"
 msgstr "Opciones Actualizadas"
 
-#: squirrelmail/src/options.php:239
+#: squirrelmail/src/options.php:240
 msgid "Refresh Folder List"
 msgstr "Actualizar Carpetas"
 
-#: squirrelmail/src/options.php:241
+#: squirrelmail/src/options.php:242
 msgid "Refresh Page"
 msgstr "Actualizar Página"
 
-#: squirrelmail/src/options.php:253
+#: squirrelmail/src/options.php:254
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
@@ -1105,7 +1117,7 @@ msgstr ""
 "Esta opción contiene su información personal, como su nombre, su dirección "
 "de correo electrónico, etc..."
 
-#: squirrelmail/src/options.php:261
+#: squirrelmail/src/options.php:262
 msgid ""
 "You can change the way that SquirrelMail looks and displays information to "
 "you, such as the colors, the language, and other settings."
@@ -1113,7 +1125,7 @@ msgstr ""
 "Puede cambiar el aspecto SquirreMail y la forma de mostrarla información, "
 "como el idioma, los colores, y otras configuraciones."
 
-#: squirrelmail/src/options.php:269
+#: squirrelmail/src/options.php:270
 msgid ""
 "Based upon given criteria, incoming messages can have different background "
 "colors in the message list.  This helps to easily distinguish who the "
@@ -1124,14 +1136,14 @@ msgstr ""
 "distinguir fácilmente de quien provienen. (Especialmente para listas de "
 "correo)."
 
-#: squirrelmail/src/options.php:277
+#: squirrelmail/src/options.php:278
 msgid ""
 "These settings change the way your folders are displayed and manipulated."
 msgstr ""
 "Estas opciones cambian la forma en la que se muestran y manipulan las "
 "carpetas."
 
-#: squirrelmail/src/options.php:285
+#: squirrelmail/src/options.php:286
 msgid ""
 "The order of the message index can be rearranged and changed to contain the "
 "headers in any order you want."
@@ -1201,7 +1213,7 @@ msgstr "Responder a Todos"
 msgid "View Full Header"
 msgstr "Ver Encabezado Completo"
 
-#: squirrelmail/plugins/calendar/event_create.php:107
+#: squirrelmail/plugins/calendar/event_create.php:112
 #: squirrelmail/plugins/calendar/event_delete.php:32
 #: squirrelmail/plugins/calendar/event_edit.php:35
 #: squirrelmail/plugins/calendar/event_edit.php:93
@@ -1231,15 +1243,47 @@ 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:292
+#: squirrelmail/src/search.php:232
+msgid "edit"
+msgstr "editar"
+
+#: squirrelmail/src/search.php:239 squirrelmail/src/search.php:278
+msgid "search"
+msgstr "buscar"
+
+#: squirrelmail/src/search.php:242
+msgid "delete"
+msgstr "borrar"
+
+#: squirrelmail/src/search.php:270
+msgid "save"
+msgstr "guardar"
+
+#: squirrelmail/src/search.php:281
+msgid "forget"
+msgstr "olvidar"
+
+#: squirrelmail/src/search.php:290
+msgid "Current Search"
+msgstr "Búsqueda Actual"
+
+#: squirrelmail/src/search.php:326
 msgid "Body"
 msgstr "Cuerpo"
 
-#: squirrelmail/src/search.php:293
+#: squirrelmail/src/search.php:327
 msgid "Everywhere"
 msgstr "Todos lados"
 
-#: squirrelmail/functions/page_header.php:117 squirrelmail/src/signout.php:72
+#: squirrelmail/src/search.php:354 squirrelmail/src/search.php:377
+msgid "Search Results"
+msgstr "Resultado de la búsqueda"
+
+#: squirrelmail/src/search.php:367
+msgid "No Messages found"
+msgstr "No se encontraron mensajes"
+
+#: squirrelmail/functions/page_header.php:120 squirrelmail/src/signout.php:72
 msgid "Sign Out"
 msgstr "Desconectarse"
 
@@ -1305,7 +1349,7 @@ msgstr "Puesto, Empr. / Dpto."
 
 #: squirrelmail/functions/abook_database.php:50
 #: squirrelmail/functions/abook_local_file.php:37
-#: squirrelmail/functions/addressbook.php:152
+#: squirrelmail/functions/addressbook.php:155
 msgid "Personal address book"
 msgstr "Libreta personal de direcciones"
 
@@ -1327,9 +1371,9 @@ msgstr "Error en base de datos: %s"
 #: squirrelmail/functions/abook_local_file.php:260
 #: squirrelmail/functions/abook_local_file.php:285
 #: squirrelmail/functions/abook_local_file.php:317
-#: squirrelmail/functions/addressbook.php:348
-#: squirrelmail/functions/addressbook.php:383
-#: squirrelmail/functions/addressbook.php:436
+#: squirrelmail/functions/addressbook.php:351
+#: squirrelmail/functions/addressbook.php:386
+#: squirrelmail/functions/addressbook.php:439
 msgid "Addressbook is read-only"
 msgstr "La libreta de direcciones es de solo lectura"
 
@@ -1380,41 +1424,41 @@ msgstr "No se pudo bloquear el archivo de datos"
 msgid "Write to addressbook failed"
 msgstr "Error escribiendo la libreta de direcciones"
 
-#: squirrelmail/functions/addressbook.php:70
+#: squirrelmail/functions/addressbook.php:73
 msgid "Error initializing addressbook database."
 msgstr "Error inicializando la base de datos de direcciones."
 
-#: squirrelmail/functions/addressbook.php:79
+#: squirrelmail/functions/addressbook.php:82
 #, c-format
 msgid "Error opening file %s"
 msgstr "Error abriendo el archivo %s"
 
-#: squirrelmail/functions/addressbook.php:89
+#: squirrelmail/functions/addressbook.php:92
 msgid "Error initializing global addressbook."
 msgstr "Error inicializando la libreta global de direcciones."
 
-#: squirrelmail/functions/addressbook.php:105
+#: squirrelmail/functions/addressbook.php:108
 #, c-format
 msgid "Error initializing LDAP server %s:"
 msgstr "Error inicializando el servidor LDAP %s:"
 
-#: squirrelmail/functions/addressbook.php:326
-#: squirrelmail/functions/addressbook.php:413
+#: squirrelmail/functions/addressbook.php:329
+#: squirrelmail/functions/addressbook.php:416
 msgid "Invalid input data"
 msgstr "Ingreso de datos invalido"
 
-#: squirrelmail/functions/addressbook.php:330
-#: squirrelmail/functions/addressbook.php:417
+#: squirrelmail/functions/addressbook.php:333
+#: squirrelmail/functions/addressbook.php:420
 msgid "Name is missing"
 msgstr "Falta el nombre"
 
-#: squirrelmail/functions/addressbook.php:334
-#: squirrelmail/functions/addressbook.php:421
+#: squirrelmail/functions/addressbook.php:337
+#: squirrelmail/functions/addressbook.php:424
 msgid "E-mail address is missing"
 msgstr "Falta la dirección de correo electrónico"
 
-#: squirrelmail/functions/addressbook.php:342
-#: squirrelmail/functions/addressbook.php:426
+#: squirrelmail/functions/addressbook.php:345
+#: squirrelmail/functions/addressbook.php:429
 msgid "Nickname contains illegal characters"
 msgstr "El apodo contiene caracteres no válidos"
 
@@ -1429,37 +1473,37 @@ msgid "Business Card"
 msgstr "Tarjeta de Visita"
 
 #: squirrelmail/functions/date.php:91
-#: squirrelmail/plugins/calendar/calendar.php:48
+#: squirrelmail/plugins/calendar/calendar.php:49
 msgid "Sunday"
 msgstr "Domingo"
 
 #: squirrelmail/functions/date.php:94
-#: squirrelmail/plugins/calendar/calendar.php:49
+#: squirrelmail/plugins/calendar/calendar.php:50
 msgid "Monday"
 msgstr "Lunes"
 
 #: squirrelmail/functions/date.php:97
-#: squirrelmail/plugins/calendar/calendar.php:50
+#: squirrelmail/plugins/calendar/calendar.php:51
 msgid "Tuesday"
 msgstr "Martes"
 
 #: squirrelmail/functions/date.php:100
-#: squirrelmail/plugins/calendar/calendar.php:51
+#: squirrelmail/plugins/calendar/calendar.php:52
 msgid "Wednesday"
 msgstr "Miércoles"
 
 #: squirrelmail/functions/date.php:103
-#: squirrelmail/plugins/calendar/calendar.php:52
+#: squirrelmail/plugins/calendar/calendar.php:53
 msgid "Thursday"
 msgstr "Jueves"
 
 #: squirrelmail/functions/date.php:106
-#: squirrelmail/plugins/calendar/calendar.php:53
+#: squirrelmail/plugins/calendar/calendar.php:54
 msgid "Friday"
 msgstr "Viernes"
 
 #: squirrelmail/functions/date.php:109
-#: squirrelmail/plugins/calendar/calendar.php:54
+#: squirrelmail/plugins/calendar/calendar.php:55
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -1539,34 +1583,17 @@ msgstr "D, G:i"
 msgid "M j, Y"
 msgstr "j/m/Y"
 
+#: squirrelmail/functions/db_prefs.php:52
 #: squirrelmail/functions/db_prefs.php:59
-#: squirrelmail/functions/db_prefs.php:66
-#: squirrelmail/functions/db_prefs.php:104
-#: squirrelmail/functions/db_prefs.php:107
-#: squirrelmail/functions/db_prefs.php:245
+#: squirrelmail/functions/db_prefs.php:102
+#: squirrelmail/functions/db_prefs.php:105
+#: squirrelmail/functions/db_prefs.php:243
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr "Archivo de preferencias %s no encontrado. Saliendo anormalmente."
 
-#: squirrelmail/functions/db_prefs.php:381
-#: squirrelmail/functions/prefs.php:269
-#, c-format
-msgid "Error creating directory %s."
-msgstr "Error creando el directorio %s."
-
-#: squirrelmail/functions/db_prefs.php:382
-#: squirrelmail/functions/prefs.php:270
-msgid "Could not create hashed directory structure!"
-msgstr "¡No pude crear la estructura de directorios!"
-
-#: squirrelmail/functions/db_prefs.php:383
-#: squirrelmail/functions/prefs.php:172 squirrelmail/functions/prefs.php:177
-#: squirrelmail/functions/prefs.php:271
-msgid "Please contact your system administrator and report this error."
-msgstr "Contacte con su administrador y comuníquele este error."
-
 #: squirrelmail/functions/display_messages.php:28
-#: squirrelmail/functions/imap_general.php:224
+#: squirrelmail/functions/imap_general.php:228
 msgid "Unknown user or password incorrect."
 msgstr "Usuario o contraseña incorrecto."
 
@@ -1589,7 +1616,35 @@ msgstr "Ejecutando SquirrelMail versi
 msgid "Click here to return to %s"
 msgstr "Pulse aquí para volver a %s"
 
-#: squirrelmail/functions/imap_general.php:136
+#: squirrelmail/functions/file_prefs.php:38
+#, c-format
+msgid ""
+"Preference file, %s, does not exist. Log out, and log back in to create a "
+"default preference file."
+msgstr ""
+"El archivo de preferencias, %s, no existe. Desconéctese y vuelva a ingresar "
+"para regenerar el archivo por omisión."
+
+#: squirrelmail/functions/file_prefs.php:162
+#: squirrelmail/functions/file_prefs.php:167
+msgid "Error opening "
+msgstr "Error abriendo "
+
+#: squirrelmail/functions/file_prefs.php:163
+msgid "Default preference file not found!"
+msgstr "¡No se encuentra el fichero de preferencias por omisión!"
+
+#: squirrelmail/functions/file_prefs.php:164
+#: squirrelmail/functions/file_prefs.php:169
+#: squirrelmail/functions/prefs.php:93
+msgid "Please contact your system administrator and report this error."
+msgstr "Contacte con su administrador y comuníquele este error."
+
+#: squirrelmail/functions/file_prefs.php:168
+msgid "Could not create initial preference file!"
+msgstr "¡No se pudo crear el fichero inicial de preferencias!"
+
+#: squirrelmail/functions/imap_general.php:140
 #: squirrelmail/functions/imap_messages.php:119
 #: squirrelmail/functions/imap_messages.php:127
 #: squirrelmail/functions/imap_messages.php:146
@@ -1599,37 +1654,37 @@ msgstr "Pulse aqu
 msgid "ERROR : Could not complete request."
 msgstr "ERROR: No se pudo completar el pedido."
 
-#: squirrelmail/functions/imap_general.php:138
+#: squirrelmail/functions/imap_general.php:142
 #: squirrelmail/plugins/filters/filters.php:91
 msgid "Reason Given: "
 msgstr "Razón dada: "
 
-#: squirrelmail/functions/imap_general.php:145
+#: squirrelmail/functions/imap_general.php:149
 #: 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:147
+#: squirrelmail/functions/imap_general.php:151
 #: squirrelmail/plugins/filters/filters.php:100
 msgid "Server responded: "
 msgstr "El servidor respondió: "
 
-#: squirrelmail/functions/imap_general.php:183
+#: squirrelmail/functions/imap_general.php:187
 #, c-format
 msgid "Error connecting to IMAP server: %s."
 msgstr "Error conectando al servidor IMAP: %s."
 
-#: squirrelmail/functions/imap_general.php:199
+#: squirrelmail/functions/imap_general.php:203
 #, c-format
 msgid "Bad request: %s"
 msgstr "Pedido Erroneo: %s"
 
-#: squirrelmail/functions/imap_general.php:201
+#: squirrelmail/functions/imap_general.php:205
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: squirrelmail/functions/imap_general.php:203
+#: squirrelmail/functions/imap_general.php:207
 msgid "Read data:"
 msgstr "Leer datos:"
 
@@ -1651,7 +1706,7 @@ msgstr "N
 #: squirrelmail/functions/imap_messages.php:195
 #: squirrelmail/functions/imap_messages.php:440
 #: squirrelmail/functions/imap_messages.php:495
-#: squirrelmail/functions/mailbox_display.php:894
+#: squirrelmail/functions/mailbox_display.php:902
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
@@ -1667,87 +1722,93 @@ msgstr "Sin destinatario"
 msgid "(unknown sender)"
 msgstr "(remitente desconocido)"
 
-#: squirrelmail/functions/imap_search.php:82
+#: squirrelmail/functions/imap_search.php:83
 msgid "No Messages Found"
 msgstr "No se Encontraron Mensajes"
 
-#: squirrelmail/functions/imap_search.php:172
+#: squirrelmail/functions/imap_search.php:181
+#: squirrelmail/functions/imap_search.php:189
 msgid "Found"
 msgstr "Encontrado"
 
-#: squirrelmail/functions/imap_search.php:172
+#: squirrelmail/functions/imap_search.php:181
+#: squirrelmail/functions/imap_search.php:189
 msgid "messages"
 msgstr "mensajes"
 
-#: squirrelmail/functions/mailbox_display.php:427
+#: squirrelmail/functions/mailbox_display.php:156
+msgid "A"
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:429
 msgid "THIS FOLDER IS EMPTY"
 msgstr "Esta Carpeta esta Vacía"
 
-#: squirrelmail/functions/mailbox_display.php:511
+#: squirrelmail/functions/mailbox_display.php:513
 msgid "Move Selected To:"
 msgstr "Mover seleccionados a:"
 
-#: squirrelmail/functions/mailbox_display.php:514
+#: squirrelmail/functions/mailbox_display.php:516
 msgid "Transform Selected Messages"
 msgstr "Marcar mensajes seleccionados como"
 
-#: squirrelmail/functions/mailbox_display.php:530
+#: squirrelmail/functions/mailbox_display.php:532
 msgid "Move"
 msgstr "Mover"
 
-#: squirrelmail/functions/mailbox_display.php:534
+#: squirrelmail/functions/mailbox_display.php:536
 msgid "Expunge"
 msgstr "Purgar"
 
-#: squirrelmail/functions/mailbox_display.php:534
+#: squirrelmail/functions/mailbox_display.php:536
 msgid "mailbox"
 msgstr "buzón"
 
-#: squirrelmail/functions/mailbox_display.php:536
+#: squirrelmail/functions/mailbox_display.php:538
 msgid "Read"
 msgstr "Leído"
 
-#: squirrelmail/functions/mailbox_display.php:537
+#: squirrelmail/functions/mailbox_display.php:539
 msgid "Unread"
 msgstr "No Leído"
 
-#: squirrelmail/functions/mailbox_display.php:633
+#: squirrelmail/functions/mailbox_display.php:635
 msgid "Toggle All"
 msgstr "Cambia Todos"
 
-#: squirrelmail/functions/mailbox_display.php:655
+#: squirrelmail/functions/mailbox_display.php:663
 msgid "Unselect All"
 msgstr "De-seleccionar Todos"
 
-#: squirrelmail/functions/mailbox_display.php:657
+#: squirrelmail/functions/mailbox_display.php:665
 msgid "Select All"
 msgstr "Seleccionar Todos"
 
-#: squirrelmail/functions/mailbox_display.php:674
+#: squirrelmail/functions/mailbox_display.php:682
 #, 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:676
+#: squirrelmail/functions/mailbox_display.php:684
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr "Viendo Mensaje: <b>%s</b> (total 1)"
 
-#: squirrelmail/functions/mailbox_display.php:861
+#: squirrelmail/functions/mailbox_display.php:869
 msgid "Paginate"
 msgstr "Paginar"
 
-#: squirrelmail/functions/mailbox_display.php:868
+#: squirrelmail/functions/mailbox_display.php:876
 msgid "Show All"
 msgstr "Todos"
 
-#: squirrelmail/functions/mime.php:370
+#: squirrelmail/functions/mime.php:369
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgstr ""
 "Se produjo un error al descodificar la estructura MIME. ¡Notifíquelo como un "
 "error del programa!"
 
-#: squirrelmail/functions/mime.php:431
+#: squirrelmail/functions/mime.php:430
 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 "
@@ -1757,33 +1818,33 @@ msgstr ""
 "el mensaje está mal formado. Por favor, ayúdenos a depurar versiones futuras "
 "enviando este mensaje al centro de desarrollo."
 
-#: squirrelmail/functions/mime.php:433
+#: squirrelmail/functions/mime.php:432
 msgid "Response:"
 msgstr "Contestación:"
 
-#: squirrelmail/functions/mime.php:434
-#: squirrelmail/plugins/calendar/event_create.php:113
+#: squirrelmail/functions/mime.php:433
+#: squirrelmail/plugins/calendar/event_create.php:118
 #: squirrelmail/plugins/calendar/event_delete.php:38
 #: squirrelmail/plugins/calendar/event_edit.php:101
 #: squirrelmail/plugins/calendar/event_edit.php:114
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: squirrelmail/functions/mime.php:435
+#: squirrelmail/functions/mime.php:434
 msgid "FETCH line:"
 msgstr "Recojer línea:"
 
-#: squirrelmail/functions/mime.php:653
+#: squirrelmail/functions/mime.php:652
 msgid "Attachments"
 msgstr "Ficheros adjuntos"
 
-#: squirrelmail/functions/mime.php:692
+#: squirrelmail/functions/mime.php:691
 msgid "download"
 msgstr "descargar"
 
-#: squirrelmail/functions/mime.php:979
+#: squirrelmail/functions/mime.php:978
 #: squirrelmail/plugins/calendar/event_create.php:53
-#: squirrelmail/plugins/calendar/event_create.php:111
+#: squirrelmail/plugins/calendar/event_create.php:116
 #: squirrelmail/plugins/calendar/event_delete.php:36
 #: squirrelmail/plugins/calendar/event_edit.php:71
 #: squirrelmail/plugins/calendar/event_edit.php:99
@@ -1791,57 +1852,45 @@ msgstr "descargar"
 msgid "Title:"
 msgstr "Título:"
 
-#: squirrelmail/functions/mime.php:1149
+#: squirrelmail/functions/mime.php:1148
 msgid "sec_remove_eng.png"
 msgstr "sec_remove_es_ES.png"
 
-#: squirrelmail/functions/options.php:167
+#: squirrelmail/functions/options.php:168
 #, c-format
 msgid "Option Type '%s' Not Found"
 msgstr "La opción %s no se ha encontrado"
 
-#: squirrelmail/functions/options.php:253
-#: squirrelmail/plugins/administrator/options.php:342
+#: squirrelmail/functions/options.php:263
+#: squirrelmail/plugins/administrator/options.php:357
 #: squirrelmail/plugins/calendar/event_delete.php:51
 #: squirrelmail/plugins/calendar/event_edit.php:134
 msgid "Yes"
 msgstr "Si"
 
-#: squirrelmail/functions/options.php:258
-#: squirrelmail/plugins/administrator/options.php:343
+#: squirrelmail/functions/options.php:268
+#: squirrelmail/plugins/administrator/options.php:358
 #: squirrelmail/plugins/calendar/event_delete.php:58
 #: squirrelmail/plugins/calendar/event_edit.php:141
 msgid "No"
 msgstr "No"
 
-#: squirrelmail/functions/page_header.php:111
+#: squirrelmail/functions/page_header.php:114
 msgid "Current Folder"
 msgstr "Carpeta Actual"
 
-#: squirrelmail/functions/page_header.php:123
+#: squirrelmail/functions/page_header.php:126
 msgid "Compose"
 msgstr "Componer"
 
-#: squirrelmail/functions/prefs.php:46
+#: squirrelmail/functions/prefs.php:91
 #, c-format
-msgid ""
-"Preference file, %s, does not exist. Log out, and log back in to create a "
-"default preference file."
-msgstr ""
-"El archivo de preferencias, %s, no existe. Desconéctese y vuelva a ingresar "
-"para regenerar el archivo por omisión."
-
-#: squirrelmail/functions/prefs.php:170 squirrelmail/functions/prefs.php:175
-msgid "Error opening "
-msgstr "Error abriendo "
-
-#: squirrelmail/functions/prefs.php:171
-msgid "Default preference file not found!"
-msgstr "¡No se encuentra el fichero de preferencias por omisión!"
+msgid "Error creating directory %s."
+msgstr "Error creando el directorio %s."
 
-#: squirrelmail/functions/prefs.php:176
-msgid "Could not create initial preference file!"
-msgstr "¡No se pudo crear el fichero inicial de preferencias!"
+#: squirrelmail/functions/prefs.php:92
+msgid "Could not create hashed directory structure!"
+msgstr "¡No pude crear la estructura de directorios!"
 
 #: squirrelmail/plugins/filters/filters.php:360
 msgid ""
@@ -2056,11 +2105,11 @@ msgstr "Arriba"
 msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr "Si <b>%s</b> contiene <b>%s</b> muévelo a <b>%s</b>"
 
-#: squirrelmail/plugins/filters/setup.php:78
+#: squirrelmail/plugins/filters/setup.php:90
 msgid "Message Filters"
 msgstr "Filtros de Mensajes"
 
-#: squirrelmail/plugins/filters/setup.php:80
+#: squirrelmail/plugins/filters/setup.php:92
 msgid ""
 "Filtering enables messages with different criteria to be automatically "
 "filtered into different folders for easier organization."
@@ -2068,11 +2117,11 @@ msgstr ""
 "El filtrado de mensajes permite organizar los mensajes en carpetas "
 "automáticamente."
 
-#: squirrelmail/plugins/filters/setup.php:86
+#: squirrelmail/plugins/filters/setup.php:98
 msgid "SPAM Filters"
 msgstr "Filtros de Correo Masivo (SPAM)"
 
-#: squirrelmail/plugins/filters/setup.php:88
+#: squirrelmail/plugins/filters/setup.php:100
 msgid ""
 "SPAM filters allow you to select from various DNS based blacklists to detect "
 "junk email in your INBOX and move it to another folder (like Trash)."
@@ -2138,33 +2187,33 @@ msgstr ""
 msgid "Save"
 msgstr "Guardar"
 
-#: squirrelmail/plugins/filters/spamoptions.php:150
+#: squirrelmail/plugins/filters/spamoptions.php:149
 #, c-format
 msgid "Spam is sent to <b>%s</b>"
 msgstr "Mandar SPAM a <b>%s</b>"
 
-#: squirrelmail/plugins/filters/spamoptions.php:150
+#: squirrelmail/plugins/filters/spamoptions.php:149
 msgid "[<i>not set yet</i>]"
 msgstr "[<i>no definido aún</i>]"
 
-#: squirrelmail/plugins/filters/spamoptions.php:152
+#: squirrelmail/plugins/filters/spamoptions.php:151
 #, c-format
 msgid "Spam scan is limited to <b>%s</b>"
 msgstr "La comprobación de mensajes se limita a <b>%s</b>"
 
-#: squirrelmail/plugins/filters/spamoptions.php:152
+#: squirrelmail/plugins/filters/spamoptions.php:151
 msgid "New Messages Only"
 msgstr "Solo mensajes nuevos"
 
-#: squirrelmail/plugins/filters/spamoptions.php:152
+#: squirrelmail/plugins/filters/spamoptions.php:151
 msgid "All Messages"
 msgstr "Todos los mensajes"
 
-#: squirrelmail/plugins/filters/spamoptions.php:162
+#: squirrelmail/plugins/filters/spamoptions.php:161
 msgid "ON"
 msgstr "ACTIVO"
 
-#: squirrelmail/plugins/filters/spamoptions.php:164
+#: squirrelmail/plugins/filters/spamoptions.php:163
 msgid "OFF"
 msgstr "INACTIVO"
 
@@ -2233,8 +2282,8 @@ msgstr "Debe hacer alguna elecci
 msgid ""
 "You can either delete your dictionary or type in the old password. Not both."
 msgstr ""
-"Puede borrar su diccionario o introducir la contraseña del"
-"diccionario antíguo."
+"Puede borrar su diccionario o introducir la contraseña deldiccionario "
+"antíguo."
 
 #: squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
 msgid "This will delete your personal dictionary file. Proceed?"
@@ -2263,8 +2312,8 @@ msgid ""
 "Your personal dictionary was erased. Please close this window and click "
 "\"Check Spelling\" button again to start your spellcheck over."
 msgstr ""
-"Su diccionario personal ha sido borrado. Por favor cierre esta"
-"ventana y pulse el botón de comprobar la ortografía de nuevo."
+"Su diccionario personal ha sido borrado. Por favor cierre estaventana y "
+"pulse el botón de comprobar la ortografía de nuevo."
 
 #: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:45
 #: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:77
@@ -2419,12 +2468,6 @@ msgstr "Cerrar y Cancelar"
 msgid "The spellcheck is not finished. Really close and discard changes?"
 msgstr "La comprobación no ha terminado aún. ¿Confirma la cancelación?"
 
-#: squirrelmail/plugins/newmail/testsound.php:33
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:412
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
-msgid "Close"
-msgstr "Cerrar"
-
 #: squirrelmail/plugins/squirrelspell/modules/check_me.mod:414
 msgid "No errors found"
 msgstr "No se encontraron errores"
@@ -2465,15 +2508,13 @@ msgstr "Por favor elija algo antes."
 msgid ""
 "This will encrypt your personal dictionary and store it in an encrypted "
 "format. Proceed?"
-msgstr ""
-"Esto cifrará su diccionario personal. ¿Continuamos?"
+msgstr "Esto cifrará su diccionario personal. ¿Continuamos?"
 
 #: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:30
 msgid ""
 "This will decrypt your personal dictionary and store it in a clear-text "
 "format. Proceed?"
-msgstr ""
-"Esto descifrará su diccionario personal. ¿Continuamos?"
+msgstr "Esto descifrará su diccionario personal. ¿Continuamos?"
 
 #: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:47
 msgid ""
@@ -2568,7 +2609,7 @@ msgstr ""
 "Por favor, seleccione el diccionario que desea usar para comprobar la "
 "ortografía de este mensaje."
 
-#: squirrelmail/plugins/calendar/calendar.php:112
+#: squirrelmail/plugins/calendar/calendar.php:113
 #: squirrelmail/plugins/squirrelspell/modules/init.mod:53
 msgid "Go"
 msgstr "Adelante"
@@ -2642,31 +2683,31 @@ msgstr "no disponible"
 msgid "SquirrelSpell Options Menu"
 msgstr "Menú de Opciones de SquirrelSpell"
 
-#: squirrelmail/plugins/translate/options.php:97
+#: squirrelmail/plugins/translate/options.php:94
 msgid "Translator"
 msgstr "Traductor"
 
-#: squirrelmail/plugins/translate/options.php:100
+#: squirrelmail/plugins/translate/options.php:97
 msgid "Your server options are as follows:"
 msgstr "Estas son sus opciones de servidor:"
 
-#: squirrelmail/plugins/translate/options.php:105
+#: squirrelmail/plugins/translate/options.php:102
 msgid ""
 "13 language pairs, maximum of 1000 characters translated, powered by Systran"
 msgstr ""
 "13 pares de idiomas, un máximo de 1000 caracteres traducidos, motor de "
 "Systran"
 
-#: squirrelmail/plugins/translate/options.php:108
+#: squirrelmail/plugins/translate/options.php:105
 msgid ""
 "10 language pairs, maximum of 25 kilobytes translated, powered by Systran"
 msgstr "10 pares de idiomas, máximo de 25 ks. traducidos, motor de Systran"
 
-#: squirrelmail/plugins/translate/options.php:111
+#: squirrelmail/plugins/translate/options.php:108
 msgid "12 language pairs, no known limits, powered by Systran"
 msgstr "12 pares de idiomas, no hay límites conocidos, motor de Systran"
 
-#: squirrelmail/plugins/translate/options.php:114
+#: squirrelmail/plugins/translate/options.php:111
 msgid ""
 "767 language pairs, no known limits, powered by Translation Experts's "
 "InterTran"
@@ -2674,14 +2715,14 @@ msgstr ""
 "767 pares de idiomas, no hay límites conocidos, motor InterTran de "
 "Translation Experts"
 
-#: squirrelmail/plugins/translate/options.php:117
+#: squirrelmail/plugins/translate/options.php:114
 msgid ""
 "8 language pairs, no known limits, powered by GPLTrans (free, open source)"
 msgstr ""
 "8 pares de idiomas, no hay límites conocidos, motor GPLTrans (gratuito, open "
 "source)"
 
-#: squirrelmail/plugins/translate/options.php:123
+#: squirrelmail/plugins/translate/options.php:120
 msgid ""
 "You also decide if you want the translation box displayed, and where it will "
 "be located."
@@ -2689,39 +2730,39 @@ msgstr ""
 "También puede decidir si quiere que se muestre el selector de traducción, y "
 "donde quiere que se sitúe"
 
-#: squirrelmail/plugins/translate/options.php:127
+#: squirrelmail/plugins/translate/options.php:124
 msgid "Select your translator:"
 msgstr "Seleccione su traductor:"
 
-#: squirrelmail/plugins/translate/options.php:139
+#: squirrelmail/plugins/translate/options.php:136
 msgid "When reading:"
 msgstr "Leyendo:"
 
-#: squirrelmail/plugins/translate/options.php:144
+#: squirrelmail/plugins/translate/options.php:141
 msgid "Show translation box"
 msgstr "Mostrar selector de traducción"
 
-#: squirrelmail/plugins/translate/options.php:146
+#: squirrelmail/plugins/translate/options.php:143
 msgid "to the left"
 msgstr "la izquierda"
 
-#: squirrelmail/plugins/translate/options.php:147
+#: squirrelmail/plugins/translate/options.php:144
 msgid "in the center"
 msgstr "en el centro"
 
-#: squirrelmail/plugins/translate/options.php:148
+#: squirrelmail/plugins/translate/options.php:145
 msgid "to the right"
 msgstr "a la derecha"
 
-#: squirrelmail/plugins/translate/options.php:153
+#: squirrelmail/plugins/translate/options.php:150
 msgid "Translate inside the SquirrelMail frames"
 msgstr "Traducir en el interior del marco de SquirrelMail"
 
-#: squirrelmail/plugins/translate/options.php:156
+#: squirrelmail/plugins/translate/options.php:153
 msgid "When composing:"
 msgstr "Redactando:"
 
-#: squirrelmail/plugins/translate/options.php:160
+#: squirrelmail/plugins/translate/options.php:157
 msgid "Not yet functional, currently does nothing"
 msgstr "Aún no funciona."
 
@@ -3473,94 +3514,94 @@ msgid "Encrypt passwords (informative only)"
 msgstr "Cifrar contraseñas (informativo)"
 
 #: squirrelmail/plugins/mail_fetch/options.php:119
-#: squirrelmail/plugins/mail_fetch/options.php:151
+#: squirrelmail/plugins/mail_fetch/options.php:146
 msgid "Add Server"
 msgstr "Añadir Servidor"
 
 #: squirrelmail/plugins/mail_fetch/options.php:123
-#: squirrelmail/plugins/mail_fetch/options.php:201
+#: squirrelmail/plugins/mail_fetch/options.php:196
 msgid "Server:"
 msgstr "Servidor:"
 
 #: squirrelmail/plugins/mail_fetch/options.php:124
-#: squirrelmail/plugins/mail_fetch/options.php:203
+#: squirrelmail/plugins/mail_fetch/options.php:198
 msgid "Alias:"
 msgstr "Descripción:"
 
 #: squirrelmail/plugins/mail_fetch/options.php:125
-#: squirrelmail/plugins/mail_fetch/options.php:205
+#: squirrelmail/plugins/mail_fetch/options.php:200
 msgid "Username:"
 msgstr "Nombre de Usuario"
 
 #: squirrelmail/plugins/mail_fetch/options.php:127
-#: squirrelmail/plugins/mail_fetch/options.php:209
+#: squirrelmail/plugins/mail_fetch/options.php:204
 msgid "Store in Folder:"
 msgstr "Carpeta de Destino:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:148
-#: squirrelmail/plugins/mail_fetch/options.php:233
+#: squirrelmail/plugins/mail_fetch/options.php:143
+#: squirrelmail/plugins/mail_fetch/options.php:224
 msgid "Leave Mail on Server"
 msgstr "Dejar el correo en el Servidor"
 
-#: squirrelmail/plugins/mail_fetch/options.php:149
-#: squirrelmail/plugins/mail_fetch/options.php:235
+#: squirrelmail/plugins/mail_fetch/options.php:144
+#: squirrelmail/plugins/mail_fetch/options.php:226
 msgid "Check mail during login"
 msgstr "Comprobar el correo a la entrada"
 
-#: squirrelmail/plugins/mail_fetch/options.php:150
-#: squirrelmail/plugins/mail_fetch/options.php:237
+#: squirrelmail/plugins/mail_fetch/options.php:145
+#: squirrelmail/plugins/mail_fetch/options.php:228
 msgid "Check mail during folder refresh"
 msgstr "Comprobar correo durante el refresco"
 
-#: squirrelmail/plugins/mail_fetch/options.php:157
-#: squirrelmail/plugins/mail_fetch/options.php:238
+#: squirrelmail/plugins/mail_fetch/options.php:152
+#: squirrelmail/plugins/mail_fetch/options.php:229
 msgid "Modify Server"
 msgstr "Modificar Servidor"
 
-#: squirrelmail/plugins/mail_fetch/options.php:161
+#: squirrelmail/plugins/mail_fetch/options.php:156
 msgid "Server Name:"
 msgstr "Nombre de Servidor:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:167
-#: squirrelmail/plugins/mail_fetch/options.php:190
+#: squirrelmail/plugins/mail_fetch/options.php:162
+#: squirrelmail/plugins/mail_fetch/options.php:185
 msgid "Modify"
 msgstr "Modificar"
 
-#: squirrelmail/plugins/mail_fetch/options.php:171
+#: squirrelmail/plugins/mail_fetch/options.php:166
 msgid "No-one server in use. Try to add."
 msgstr "No existen cuentas. Cree una,"
 
-#: squirrelmail/plugins/mail_fetch/options.php:177
-#: squirrelmail/plugins/mail_fetch/options.php:192
-#: squirrelmail/plugins/mail_fetch/options.php:243
+#: squirrelmail/plugins/mail_fetch/options.php:172
+#: squirrelmail/plugins/mail_fetch/options.php:187
+#: squirrelmail/plugins/mail_fetch/options.php:234
 msgid "Fetching Servers"
 msgstr "Servidores de Recogida"
 
-#: squirrelmail/plugins/mail_fetch/options.php:181
+#: squirrelmail/plugins/mail_fetch/options.php:176
 msgid "Confirm Deletion of a Server"
 msgstr "Confirme el borrado del servidor"
 
-#: squirrelmail/plugins/mail_fetch/options.php:185
+#: squirrelmail/plugins/mail_fetch/options.php:180
 msgid "Selected Server:"
 msgstr "Servidor Borrado:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:186
+#: squirrelmail/plugins/mail_fetch/options.php:181
 msgid "Confirm delete of selected server?"
 msgstr "¿Confirma el borrado del servidor?"
 
-#: squirrelmail/plugins/mail_fetch/options.php:187
+#: squirrelmail/plugins/mail_fetch/options.php:182
 msgid "Confirm Delete"
 msgstr "Confirmar Borrado"
 
-#: squirrelmail/plugins/mail_fetch/options.php:196
+#: squirrelmail/plugins/mail_fetch/options.php:191
 msgid "Mofify a Server"
 msgstr "Modificar un Servidor"
 
-#: squirrelmail/plugins/mail_fetch/options.php:246
+#: squirrelmail/plugins/mail_fetch/options.php:237
 msgid "Undefined Function"
 msgstr "Función no definida"
 
-#: squirrelmail/plugins/mail_fetch/options.php:248
+#: squirrelmail/plugins/mail_fetch/options.php:239
 msgid "Hey! Wath do You are looking for?"
 msgstr "¡Eh! ¿Qué estás buscando?"
 
@@ -3621,7 +3662,7 @@ msgstr "Anualmente"
 msgid "Base Sent Folder"
 msgstr "Carpeta Base de Mensajes Enviados"
 
-#: squirrelmail/plugins/calendar/calendar.php:74
+#: squirrelmail/plugins/calendar/calendar.php:75
 msgid "TODAY"
 msgstr "HOY"
 
@@ -3657,18 +3698,18 @@ msgstr "Prioridad:"
 msgid "Set Event"
 msgstr "Establecer Cita"
 
-#: squirrelmail/plugins/calendar/event_create.php:106
+#: squirrelmail/plugins/calendar/event_create.php:111
 msgid "Event Has been added!"
 msgstr "¡Cita Agregada!"
 
-#: squirrelmail/plugins/calendar/event_create.php:109
+#: squirrelmail/plugins/calendar/event_create.php:114
 #: squirrelmail/plugins/calendar/event_delete.php:34
 #: squirrelmail/plugins/calendar/event_edit.php:49
 #: squirrelmail/plugins/calendar/event_edit.php:95
 msgid "Time:"
 msgstr "Hora:"
 
-#: squirrelmail/plugins/calendar/event_create.php:116
+#: squirrelmail/plugins/calendar/event_create.php:121
 #: squirrelmail/plugins/calendar/event_delete.php:91
 #: squirrelmail/plugins/calendar/event_edit.php:189
 #: squirrelmail/plugins/calendar/functions.php:23
@@ -3846,264 +3887,284 @@ msgstr "activar mover"
 msgid "display at bottom"
 msgstr "mostrar abajo"
 
-#: squirrelmail/plugins/administrator/defines.php:46
+#: squirrelmail/plugins/administrator/defines.php:48
 msgid "Config File Version"
 msgstr "Versión de configuración"
 
-#: squirrelmail/plugins/administrator/defines.php:50
+#: squirrelmail/plugins/administrator/defines.php:51
+msgid "Squirrelmail Version"
+msgstr "Versión de Squirrelmail"
+
+#: squirrelmail/plugins/administrator/defines.php:54
+msgid "PHP Version"
+msgstr "Versión de PHP"
+
+#: squirrelmail/plugins/administrator/defines.php:58
 msgid "Organization Preferences"
 msgstr "Opciones de la Entidad"
 
-#: squirrelmail/plugins/administrator/defines.php:52
+#: squirrelmail/plugins/administrator/defines.php:60
 msgid "Organization Name"
 msgstr "Nombre de la entidad"
 
-#: squirrelmail/plugins/administrator/defines.php:55
+#: squirrelmail/plugins/administrator/defines.php:63
 msgid "Organization Logo"
 msgstr "Logotipo de la entidad"
 
-#: squirrelmail/plugins/administrator/defines.php:58
+#: squirrelmail/plugins/administrator/defines.php:66
 msgid "Organization Title"
 msgstr "Título de la entidad"
 
-#: squirrelmail/plugins/administrator/defines.php:61
+#: squirrelmail/plugins/administrator/defines.php:69
 msgid "Signout Page"
 msgstr "Página de desconexión"
 
-#: squirrelmail/plugins/administrator/defines.php:64
+#: squirrelmail/plugins/administrator/defines.php:72
 msgid "Default Language"
 msgstr "Idioma por omisión"
 
-#: squirrelmail/plugins/administrator/defines.php:68
+#: squirrelmail/plugins/administrator/defines.php:76
 msgid "Top Frame"
 msgstr "Marco superior"
 
-#: squirrelmail/plugins/administrator/defines.php:72
+#: squirrelmail/plugins/administrator/defines.php:81
 msgid "Server Settings"
 msgstr "Configuración de servidores"
 
-#: squirrelmail/plugins/administrator/defines.php:74
+#: squirrelmail/plugins/administrator/defines.php:83
 msgid "Mail Domain"
 msgstr "Dominio de correo"
 
-#: squirrelmail/plugins/administrator/defines.php:77
+#: squirrelmail/plugins/administrator/defines.php:86
 msgid "IMAP Server Address"
 msgstr "Dirección del servidor IMAP"
 
-#: squirrelmail/plugins/administrator/defines.php:80
+#: squirrelmail/plugins/administrator/defines.php:89
 msgid "IMAP Server Port"
 msgstr "Puerto del servidor IMAP"
 
-#: squirrelmail/plugins/administrator/defines.php:82
+#: squirrelmail/plugins/administrator/defines.php:91
 msgid "IMAP Server Type"
 msgstr "Tipo de servidor IMAP"
 
-#: squirrelmail/plugins/administrator/defines.php:84
+#: squirrelmail/plugins/administrator/defines.php:93
 msgid "Cyrus IMAP server"
 msgstr "Servidor IMAP Cyrus"
 
-#: squirrelmail/plugins/administrator/defines.php:85
+#: squirrelmail/plugins/administrator/defines.php:94
 msgid "University of Washington's IMAP server"
 msgstr "Servidor IMAP de la Universidad de Washington"
 
-#: squirrelmail/plugins/administrator/defines.php:86
+#: squirrelmail/plugins/administrator/defines.php:95
 msgid "Microsoft Exchange IMAP server"
 msgstr "Servidor IMAP Microsoft Exchange"
 
-#: squirrelmail/plugins/administrator/defines.php:87
+#: squirrelmail/plugins/administrator/defines.php:96
 msgid "Courier IMAP server"
 msgstr "Servidor IMAP Courier"
 
-#: squirrelmail/plugins/administrator/defines.php:88
+#: squirrelmail/plugins/administrator/defines.php:97
 msgid "Not one of the above servers"
 msgstr "Ninguno de los anteriores"
 
-#: squirrelmail/plugins/administrator/defines.php:89
+#: squirrelmail/plugins/administrator/defines.php:98
 msgid "IMAP Folder Delimiter"
 msgstr "Delimitador de carpetas IMAP"
 
-#: squirrelmail/plugins/administrator/defines.php:91
+#: squirrelmail/plugins/administrator/defines.php:100
 msgid "Use \"detect\" to auto-detect."
 msgstr "Escribe \"detect\" para su auto-detección."
 
-#: squirrelmail/plugins/administrator/defines.php:93
+#: squirrelmail/plugins/administrator/defines.php:103
 msgid "Use Sendmail"
 msgstr "¿Usar Sendmail?"
 
-#: squirrelmail/plugins/administrator/defines.php:95
+#: squirrelmail/plugins/administrator/defines.php:105
 msgid "Sendmail Path"
 msgstr "Ubicación de Sendmail"
 
-#: squirrelmail/plugins/administrator/defines.php:98
+#: squirrelmail/plugins/administrator/defines.php:108
 msgid "SMTP Server Address"
 msgstr "Dirección del servidor SMTP"
 
-#: squirrelmail/plugins/administrator/defines.php:101
+#: squirrelmail/plugins/administrator/defines.php:111
 msgid "SMTP Server Port"
 msgstr "Puerto del servidor SMTP"
 
-#: squirrelmail/plugins/administrator/defines.php:103
+#: squirrelmail/plugins/administrator/defines.php:113
 msgid "Authenticated SMTP"
 msgstr "¿Servidor SMTP con autentificación?"
 
-#: squirrelmail/plugins/administrator/defines.php:105
+#: squirrelmail/plugins/administrator/defines.php:115
 msgid "Invert Time"
 msgstr "¿Invertir la hora?"
 
-#: squirrelmail/plugins/administrator/defines.php:108
+#: squirrelmail/plugins/administrator/defines.php:118
 msgid "Folders Defaults"
 msgstr "Valores por Omisión para las Carpetas"
 
-#: squirrelmail/plugins/administrator/defines.php:110
+#: squirrelmail/plugins/administrator/defines.php:120
 msgid "Default Folder Prefix"
 msgstr "Prefijo de carpetas"
 
-#: squirrelmail/plugins/administrator/defines.php:113
+#: squirrelmail/plugins/administrator/defines.php:123
 msgid "Show Folder Prefix Option"
 msgstr "¿Permitir modificar el prefijo?"
 
-#: squirrelmail/plugins/administrator/defines.php:124
+#: squirrelmail/plugins/administrator/defines.php:134
 msgid "By default, move to trash"
 msgstr "¿Mover a la papelera por omisión?"
 
-#: squirrelmail/plugins/administrator/defines.php:126
+#: squirrelmail/plugins/administrator/defines.php:136
 msgid "By default, move to sent"
 msgstr "¿Mover a elementos enviados por omisión?"
 
-#: squirrelmail/plugins/administrator/defines.php:128
+#: squirrelmail/plugins/administrator/defines.php:138
 msgid "By default, save as draft"
 msgstr "¿Guardar borradores por omisión?"
 
-#: squirrelmail/plugins/administrator/defines.php:130
+#: squirrelmail/plugins/administrator/defines.php:140
 msgid "List Special Folders First"
 msgstr "¿Mostrar carpetas especiales al principio?"
 
-#: squirrelmail/plugins/administrator/defines.php:132
+#: squirrelmail/plugins/administrator/defines.php:142
 msgid "Show Special Folders Color"
 msgstr "¿Cambiar color de carpetas especiales?"
 
-#: squirrelmail/plugins/administrator/defines.php:134
+#: squirrelmail/plugins/administrator/defines.php:144
 msgid "Auto Expunge"
 msgstr "¿Purga Automática?"
 
-#: squirrelmail/plugins/administrator/defines.php:136
+#: squirrelmail/plugins/administrator/defines.php:146
 msgid "Default Sub. of INBOX"
 msgstr "¿Por debajo de INBOX por omisión?"
 
-#: squirrelmail/plugins/administrator/defines.php:138
+#: squirrelmail/plugins/administrator/defines.php:148
 msgid "Show 'Contain Sub.' Option"
 msgstr "¿Mostrar la opción de subcarpetas?"
 
-#: squirrelmail/plugins/administrator/defines.php:140
+#: squirrelmail/plugins/administrator/defines.php:150
 msgid "Default Unseen Notify"
 msgstr "Notificación de no leidos por omisión"
 
-#: squirrelmail/plugins/administrator/defines.php:142
+#: squirrelmail/plugins/administrator/defines.php:155
 msgid "Default Unseen Type"
 msgstr "Tipo de no leidos por omisión"
 
-#: squirrelmail/plugins/administrator/defines.php:144
+#: squirrelmail/plugins/administrator/defines.php:159
 msgid "Auto Create Special Folders"
 msgstr "¿Crear carpeta especiales automáticamente?"
 
-#: squirrelmail/plugins/administrator/defines.php:146
+#: squirrelmail/plugins/administrator/defines.php:161
 msgid "Default Javascript Adrressbook"
 msgstr "¿Usar Javasrcipt por omisión en la agenda?"
 
-#: squirrelmail/plugins/administrator/defines.php:149
+#: squirrelmail/plugins/administrator/defines.php:164
 msgid "General Options"
 msgstr "Opciones Generales"
 
-#: squirrelmail/plugins/administrator/defines.php:151
+#: squirrelmail/plugins/administrator/defines.php:166
 msgid "Default Charset"
 msgstr "Juego de caracteres por omisión"
 
-#: squirrelmail/plugins/administrator/defines.php:162
+#: squirrelmail/plugins/administrator/defines.php:177
 msgid "Data Directory"
 msgstr "Directorio de datos"
 
-#: squirrelmail/plugins/administrator/defines.php:165
+#: squirrelmail/plugins/administrator/defines.php:180
 msgid "Temp Directory"
 msgstr "Directorio temporal"
 
-#: squirrelmail/plugins/administrator/defines.php:168
+#: squirrelmail/plugins/administrator/defines.php:183
 msgid "Hash Level"
 msgstr "Nivel de fragmentación"
 
-#: squirrelmail/plugins/administrator/defines.php:170
+#: squirrelmail/plugins/administrator/defines.php:185
 msgid "Hash Disabled"
 msgstr "¿Desactivar fragmentación de directorio?"
 
-#: squirrelmail/plugins/administrator/defines.php:172
+#: squirrelmail/plugins/administrator/defines.php:187
 msgid "Moderate"
 msgstr "Moderada"
 
-#: squirrelmail/plugins/administrator/defines.php:173
+#: squirrelmail/plugins/administrator/defines.php:188
 msgid "Medium"
 msgstr "Media"
 
-#: squirrelmail/plugins/administrator/defines.php:175
+#: squirrelmail/plugins/administrator/defines.php:190
 msgid "Default Left Size"
 msgstr "Tamaño por omisión de lista de carpetas"
 
-#: squirrelmail/plugins/administrator/defines.php:178
+#: squirrelmail/plugins/administrator/defines.php:193
 msgid "Usernames in Lowercase"
 msgstr "¿Nombres de usuarios en minúsculas?"
 
-#: squirrelmail/plugins/administrator/defines.php:180
+#: squirrelmail/plugins/administrator/defines.php:195
 msgid "Allow use of priority"
 msgstr "¿Activar prioridades?"
 
-#: squirrelmail/plugins/administrator/defines.php:182
+#: squirrelmail/plugins/administrator/defines.php:197
 msgid "Hide SM attributions"
 msgstr "¿Esconder atributos de SM?"
 
-#: squirrelmail/plugins/administrator/defines.php:185
-#: squirrelmail/plugins/administrator/defines.php:187
+#: squirrelmail/plugins/administrator/defines.php:200
+#: squirrelmail/plugins/administrator/defines.php:202
 msgid "Message of the Day"
 msgstr "Mensaje del día"
 
-#: squirrelmail/plugins/administrator/defines.php:191
+#: squirrelmail/plugins/administrator/defines.php:206
 msgid "Database"
 msgstr "Base de datos"
 
-#: squirrelmail/plugins/administrator/defines.php:193
+#: squirrelmail/plugins/administrator/defines.php:208
 msgid "Address book DSN"
 msgstr "DSN de la libreta de direcciones"
 
-#: squirrelmail/plugins/administrator/defines.php:197
+#: squirrelmail/plugins/administrator/defines.php:211
+msgid "Address book table"
+msgstr "Tabla de la agenda"
+
+#: squirrelmail/plugins/administrator/defines.php:215
+msgid "Preferences DSN"
+msgstr "DSN de preferencias"
+
+#: squirrelmail/plugins/administrator/defines.php:218
+msgid "Preferences table"
+msgstr "Tabla de preferencias"
+
+#: squirrelmail/plugins/administrator/defines.php:223
 msgid "Themes"
 msgstr "Temas"
 
-#: squirrelmail/plugins/administrator/defines.php:199
+#: squirrelmail/plugins/administrator/defines.php:225
 msgid "Style Sheet URL (css)"
 msgstr "URL de la hoja de estilos (css)"
 
-#: squirrelmail/plugins/administrator/options.php:184
+#: squirrelmail/plugins/administrator/options.php:186
 msgid "Configuration Administrator"
 msgstr "Configuración del Sistema"
 
-#: squirrelmail/plugins/administrator/options.php:363
+#: squirrelmail/plugins/administrator/options.php:379
 msgid "Theme Name"
 msgstr "Nombre del tema"
 
-#: squirrelmail/plugins/administrator/options.php:364
+#: squirrelmail/plugins/administrator/options.php:380
 msgid "Theme Path"
 msgstr "Ubicación del tema"
 
-#: squirrelmail/plugins/administrator/options.php:401
+#: squirrelmail/plugins/administrator/options.php:418
 msgid "Plugins"
 msgstr "Añadidos (Plugins)"
 
-#: squirrelmail/plugins/administrator/options.php:446
+#: squirrelmail/plugins/administrator/options.php:480
 msgid "Change Settings"
 msgstr "Cambiar opciones"
 
-#: squirrelmail/plugins/administrator/setup.php:31
+#: squirrelmail/plugins/administrator/setup.php:30
 msgid "Administration"
 msgstr "Administración"
 
-#: squirrelmail/plugins/administrator/setup.php:33
+#: squirrelmail/plugins/administrator/setup.php:32
 msgid ""
 "This module allows administrators to manage SquirrelMail main configuration "
 "remotely."
@@ -4111,6 +4172,25 @@ msgstr ""
 "Este módulo permite configurar remotamente las opciones principales de "
 "Squirrelmail."
 
+#: squirrelmail/plugins/spamcop/setup.php:72
+#: squirrelmail/plugins/spamcop/setup.php:79
+msgid "Report as Spam"
+msgstr "Reportar como SPAM"
+
+#: squirrelmail/plugins/spamcop/setup.php:90
+msgid "SpamCop - Spam Reporting"
+msgstr "Reporte de SPAM - SpamCop"
+
+#: squirrelmail/plugins/spamcop/setup.php:92
+msgid ""
+"Help fight the battle against unsolicited email.  SpamCop reads the spam "
+"email and determines the correct addresses to send complaints to.  Quite "
+"fast, really smart, and easy to use."
+msgstr ""
+
+#~ msgid "Close window"
+#~ msgstr "Cerrar Ventana"
+
 #~ msgid "SECURITY BREACH ON DECK 5! CMDR TUVOK AND SECURITY TEAM REQUESTED."
 #~ msgstr ""
 #~ "Se ha producido un intento de intrusión no autorizado. Administrador del "
diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index c3cc99b3..fa0a08c7 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-04 15:24+0100\n"
+"POT-Creation-Date: 2002-02-04 15:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -468,9 +468,9 @@ msgstr ""
 msgid "Table of Contents"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:737
-#: squirrelmail/functions/mailbox_display.php:740
 #: squirrelmail/functions/mailbox_display.php:743
+#: squirrelmail/functions/mailbox_display.php:746
+#: squirrelmail/functions/mailbox_display.php:749
 #: squirrelmail/plugins/delete_move_next/setup.php:149
 #: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/src/help.php:187 squirrelmail/src/help.php:191
@@ -478,9 +478,9 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:738
-#: squirrelmail/functions/mailbox_display.php:741
 #: squirrelmail/functions/mailbox_display.php:744
+#: squirrelmail/functions/mailbox_display.php:747
+#: squirrelmail/functions/mailbox_display.php:750
 #: squirrelmail/plugins/delete_move_next/setup.php:154
 #: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/src/help.php:195 squirrelmail/src/help.php:198
@@ -1247,6 +1247,10 @@ msgstr ""
 msgid "forget"
 msgstr ""
 
+#: squirrelmail/src/search.php:290
+msgid "Current Search"
+msgstr ""
+
 #: squirrelmail/src/search.php:326
 msgid "Body"
 msgstr ""
@@ -1684,7 +1688,7 @@ msgstr ""
 #: squirrelmail/functions/imap_messages.php:195
 #: squirrelmail/functions/imap_messages.php:440
 #: squirrelmail/functions/imap_messages.php:495
-#: squirrelmail/functions/mailbox_display.php:896
+#: squirrelmail/functions/mailbox_display.php:902
 msgid "(no subject)"
 msgstr ""
 
@@ -1754,29 +1758,29 @@ msgstr ""
 msgid "Toggle All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:657
+#: squirrelmail/functions/mailbox_display.php:663
 msgid "Unselect All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:659
+#: squirrelmail/functions/mailbox_display.php:665
 msgid "Select All"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:676
+#: squirrelmail/functions/mailbox_display.php:682
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:678
+#: squirrelmail/functions/mailbox_display.php:684
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:863
+#: squirrelmail/functions/mailbox_display.php:869
 msgid "Paginate"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:870
+#: squirrelmail/functions/mailbox_display.php:876
 msgid "Show All"
 msgstr ""
 
diff --git a/src/search.php b/src/search.php
index cfd3c425..035cedc7 100644
--- a/src/search.php
+++ b/src/search.php
@@ -155,10 +155,10 @@ $boxes = sqimap_mailbox_list($imapConnection);
 //	set current mailbox to INBOX if none was selected or if page
 //	was called to search all folders.
 
-if ($mailbox == 'None' || $mailbox == "" ) {
+if ($mailbox == 'None' || $mailbox == '' ) {
     $mailbox = $boxes[0]['unformatted'];
 }
-if ($mailbox == "All Folders") {
+if ($mailbox == 'All Folders') {
     $search_all = "all";
 }
 
@@ -287,7 +287,7 @@ if ($recent_count > 0) {
 }
 
 /* Search Form */
-echo '<B>Current Search</B>'
+echo '<B>' . _("Current Search") . '</B>'
    . '<FORM ACTION="search.php" NAME=s>'
    . '   <TABLE WIDTH="95%" CELLPADDING=0 CELLSPACING=0>'
    . '     <TR>'
@@ -296,6 +296,9 @@ for ($i = 0; $i < count($boxes); $i++) {
     if (!in_array('noselect', $boxes[$i]['flags'])) {
         $box = $boxes[$i]['unformatted'];
         $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+        if( $box2 == 'INBOX' ) {
+            $box2 = _("INBOX");
+        }        
         if ($mailbox == $box) {
             echo "         <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
         }
-- 
2.25.1