From 65a5bae684ea2124d134d4ef3afd9aa408a0dca1 Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 30 Jan 2002 11:23:13 +0000
Subject: [PATCH] * Fixed intl. of addrbook_search_html.php * Added
 administrator's strings . * Translated administrator into spanish. * Added
 ldap define to administrator.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2291 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 locale/es_ES/LC_MESSAGES/squirrelmail.mo |  Bin 62853 -> 58135 bytes
 locale/es_ES/LC_MESSAGES/squirrelmail.po | 1225 +++++++++++++---------
 plugins/administrator/defines.php        |    1 +
 plugins/administrator/options.php        |    3 +
 po/squirrelmail.po                       |  895 ++++++++--------
 po/xgetpo                                |    2 +
 src/addrbook_search_html.php             |   11 +-
 7 files changed, 1147 insertions(+), 990 deletions(-)

diff --git a/locale/es_ES/LC_MESSAGES/squirrelmail.mo b/locale/es_ES/LC_MESSAGES/squirrelmail.mo
index 8c1aac0cdf1f26eb9d9058cadaa9547a5214592c..3be49b52200eeb0b21813a8ee78f875a7c595d0e 100644
GIT binary patch
delta 19630
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
G1^)-6M8N<6

delta 23897
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

diff --git a/locale/es_ES/LC_MESSAGES/squirrelmail.po b/locale/es_ES/LC_MESSAGES/squirrelmail.po
index 8e750e21..7bf1a883 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-24 14:55+0100\n"
+"POT-Creation-Date: 2002-01-30 11:58+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"
@@ -19,81 +19,102 @@ msgid "Address Book"
 msgstr "Libreta de Direcciones"
 
 #: squirrelmail/src/addrbook_search.php:98
-#: squirrelmail/src/addrbook_search_html.php:66
+#: squirrelmail/src/addrbook_search_html.php:67
 #: squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:85
 msgid "Name"
 msgstr "Nombre"
 
 #: squirrelmail/src/addrbook_search.php:99
-#: squirrelmail/src/addrbook_search_html.php:67
+#: squirrelmail/src/addrbook_search_html.php:68
 #: squirrelmail/src/addressbook.php:286
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
 #: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:68
+#: squirrelmail/src/addrbook_search_html.php:69
 #: squirrelmail/src/addressbook.php:287
 msgid "Info"
 msgstr "Información"
 
 #: squirrelmail/src/addrbook_search.php:103
-#: squirrelmail/src/addrbook_search_html.php:71
+#: squirrelmail/src/addrbook_search_html.php:72
 msgid "Source"
 msgstr "Origen"
 
-#: squirrelmail/src/addrbook_search_html.php:98
+#: squirrelmail/functions/mailbox_display.php:565
+#: 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:294
+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:293
+msgid "Cc"
+msgstr "Cc"
+
+#: squirrelmail/src/addrbook_search_html.php:86
+msgid "Bcc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:99
 msgid "Use Addresses"
 msgstr "Usar Direcciones"
 
-#: squirrelmail/src/addrbook_search_html.php:117
+#: squirrelmail/src/addrbook_search_html.php:118
 msgid "Address Book Search"
 msgstr "Buscar en la Agenda"
 
 #: squirrelmail/src/addrbook_search.php:173
-#: squirrelmail/src/addrbook_search_html.php:126
+#: squirrelmail/src/addrbook_search_html.php:127
 msgid "Search for"
 msgstr "Buscar por"
 
 #: squirrelmail/src/addrbook_search.php:179
-#: squirrelmail/src/addrbook_search_html.php:136
+#: squirrelmail/src/addrbook_search_html.php:137
 msgid "in"
 msgstr "en"
 
 #: squirrelmail/src/addrbook_search.php:180
-#: squirrelmail/src/addrbook_search_html.php:139
+#: squirrelmail/src/addrbook_search_html.php:140
 msgid "All address books"
 msgstr "Todos los libros de direcciones"
 
-#: squirrelmail/functions/page_header.php:128
+#: squirrelmail/functions/page_header.php:131
 #: squirrelmail/src/addrbook_search.php:190
-#: squirrelmail/src/addrbook_search_html.php:150
-#: squirrelmail/src/search.php:45 squirrelmail/src/search.php:124
+#: squirrelmail/src/addrbook_search_html.php:151
+#: squirrelmail/src/search.php:188
 msgid "Search"
 msgstr "Buscar"
 
 #: squirrelmail/src/addrbook_search.php:191
-#: squirrelmail/src/addrbook_search_html.php:151
+#: squirrelmail/src/addrbook_search_html.php:152
 msgid "List all"
 msgstr "Listar todos"
 
 #: squirrelmail/src/addrbook_search.php:213
-#: squirrelmail/src/addrbook_search_html.php:176
+#: squirrelmail/src/addrbook_search_html.php:177
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr "Imposible listar direcciones desde %s"
 
-#: squirrelmail/src/addrbook_search.php:236
-#: squirrelmail/src/addrbook_search_html.php:201
+#: squirrelmail/src/addrbook_search.php:239
+#: squirrelmail/src/addrbook_search_html.php:205
 msgid "Your search failed with the following error(s)"
 msgstr "La busqueda falló con los siguientes errores"
 
 #: squirrelmail/src/addrbook_search.php:159
-#: squirrelmail/src/addrbook_search.php:243
-#: squirrelmail/src/addrbook_search_html.php:206
+#: squirrelmail/src/addrbook_search.php:246
+#: squirrelmail/src/addrbook_search_html.php:210
 msgid "No persons matching your search was found"
 msgstr "No se encontró una persona con esos datos"
 
-#: squirrelmail/src/addrbook_search_html.php:219
+#: squirrelmail/src/addrbook_search_html.php:223
 msgid "Return"
 msgstr "Volver"
 
@@ -138,9 +159,9 @@ msgstr "Solo puede modificar una direcci
 msgid "Update address"
 msgstr "Actualizar Dirección"
 
-#: squirrelmail/functions/display_messages.php:20
-#: squirrelmail/functions/display_messages.php:71
-#: squirrelmail/functions/display_messages.php:87
+#: squirrelmail/functions/display_messages.php:25
+#: squirrelmail/functions/display_messages.php:76
+#: squirrelmail/functions/display_messages.php:92
 #: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:239
 msgid "ERROR"
 msgstr "ERROR"
@@ -184,9 +205,9 @@ msgstr "Mensaje Original"
 #: 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:57
-#: squirrelmail/src/printer_friendly_bottom.php:118
-#: squirrelmail/src/search.php:116
+#: squirrelmail/src/options_order.php:40
+#: squirrelmail/src/printer_friendly_bottom.php:101
+#: squirrelmail/src/search.php:291
 msgid "Subject"
 msgstr "Asunto"
 
@@ -195,29 +216,19 @@ msgstr "Asunto"
 #: 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:55
-#: squirrelmail/src/printer_friendly_bottom.php:112
-#: squirrelmail/src/search.php:117
+#: squirrelmail/src/options_order.php:38
+#: squirrelmail/src/printer_friendly_bottom.php:95
+#: squirrelmail/src/search.php:292
 msgid "From"
 msgstr "De"
 
 #: squirrelmail/functions/mailbox_display.php:575
 #: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:133
-#: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:56
-#: squirrelmail/src/printer_friendly_bottom.php:117
+#: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
+#: squirrelmail/src/printer_friendly_bottom.php:100
 msgid "Date"
 msgstr "Fecha"
 
-#: squirrelmail/functions/mailbox_display.php:565
-#: squirrelmail/plugins/filters/options.php:88
-#: 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:113
-#: squirrelmail/src/search.php:119
-msgid "To"
-msgstr "Para"
-
 #: squirrelmail/plugins/listcommands/mailout.php:50
 #: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:566
 msgid "From:"
@@ -247,7 +258,7 @@ msgstr "Enviar"
 msgid "Attach:"
 msgstr "Adjunto:"
 
-#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:143
+#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:126
 msgid "Add"
 msgstr "Agregar"
 
@@ -255,7 +266,7 @@ msgstr "Agregar"
 msgid "Delete selected attachments"
 msgstr "Borrar Adjuntos Seleccionados"
 
-#: squirrelmail/functions/page_header.php:122 squirrelmail/src/compose.php:609
+#: squirrelmail/functions/page_header.php:125 squirrelmail/src/compose.php:609
 #: squirrelmail/src/compose.php:613 squirrelmail/src/compose.php:617
 msgid "Addresses"
 msgstr "Direcciones"
@@ -268,6 +279,7 @@ msgstr "Guardar Borrador"
 msgid "Priority"
 msgstr "Prioridad"
 
+#: squirrelmail/plugins/administrator/defines.php:174
 #: squirrelmail/plugins/calendar/functions.php:98
 #: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
 msgid "High"
@@ -278,6 +290,7 @@ msgstr "Alta"
 msgid "Normal"
 msgstr "Normal"
 
+#: squirrelmail/plugins/administrator/defines.php:171
 #: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
 msgid "Low"
 msgstr "Baja"
@@ -309,7 +322,7 @@ msgstr "Ver un texto adosado"
 msgid "View message"
 msgstr "Ver el mensaje"
 
-#: squirrelmail/functions/mime.php:620 squirrelmail/src/download.php:41
+#: squirrelmail/functions/mime.php:624 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"
@@ -322,7 +335,7 @@ msgstr "Nombre de Carpeta Invalido. Por favor, seleccione uno diferente."
 msgid "Click here to go back"
 msgstr "Pulse aquí para volver"
 
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/folders.php:29
+#: squirrelmail/functions/page_header.php:127 squirrelmail/src/folders.php:29
 #: squirrelmail/src/left_main.php:234
 msgid "Folders"
 msgstr "Carpetas"
@@ -392,7 +405,7 @@ msgstr "Borrar Carpeta"
 #: squirrelmail/plugins/mail_fetch/options.php:168
 #: squirrelmail/plugins/mail_fetch/options.php:175
 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
-#: squirrelmail/src/options_identities.php:320
+#: squirrelmail/src/options_identities.php:305
 #: squirrelmail/src/read_body.php:473
 msgid "Delete"
 msgstr "Borrar"
@@ -415,11 +428,11 @@ msgstr "
 msgid "No folders were found to subscribe to!"
 msgstr "¡No hay carpetas a las que suscribirse!"
 
-#: squirrelmail/src/folders_rename_getname.php:42
+#: squirrelmail/src/folders_rename_getname.php:40
 msgid "Rename a folder"
 msgstr "Renombrar una carpeta"
 
-#: squirrelmail/src/folders_rename_getname.php:46
+#: squirrelmail/src/folders_rename_getname.php:44
 msgid "New name:"
 msgstr "Nuevo nombre:"
 
@@ -427,12 +440,12 @@ msgstr "Nuevo nombre:"
 #: squirrelmail/plugins/filters/options.php:138
 #: squirrelmail/plugins/newmail/newmail_opt.php:133
 #: squirrelmail/plugins/translate/options.php:163
-#: squirrelmail/src/folders_rename_getname.php:53
+#: squirrelmail/src/folders_rename_getname.php:51
 #: squirrelmail/src/options_highlight.php:347
 msgid "Submit"
 msgstr "Enviar"
 
-#: squirrelmail/functions/page_header.php:130
+#: squirrelmail/functions/page_header.php:133
 #: squirrelmail/plugins/listcommands/setup.php:32 squirrelmail/src/help.php:91
 msgid "Help"
 msgstr "Ayuda"
@@ -457,8 +470,8 @@ msgstr "Tabla de Contenidos"
 #: squirrelmail/functions/mailbox_display.php:735
 #: squirrelmail/functions/mailbox_display.php:738
 #: squirrelmail/functions/mailbox_display.php:741
-#: squirrelmail/plugins/delete_move_next/setup.php:148
-#: squirrelmail/plugins/delete_move_next/setup.php:150
+#: 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
 #: squirrelmail/src/read_body.php:495 squirrelmail/src/read_body.php:497
 msgid "Previous"
@@ -467,8 +480,8 @@ msgstr "Anterior"
 #: squirrelmail/functions/mailbox_display.php:736
 #: squirrelmail/functions/mailbox_display.php:739
 #: squirrelmail/functions/mailbox_display.php:742
-#: squirrelmail/plugins/delete_move_next/setup.php:153
-#: squirrelmail/plugins/delete_move_next/setup.php:155
+#: 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
 #: squirrelmail/src/read_body.php:501 squirrelmail/src/read_body.php:503
 msgid "Next"
@@ -532,6 +545,7 @@ msgstr "Opciones Generales de Visualizaci
 msgid "Theme"
 msgstr "Tema"
 
+#: squirrelmail/plugins/administrator/defines.php:40
 #: squirrelmail/src/options_display.php:51
 #: squirrelmail/src/options_display.php:80
 msgid "Default"
@@ -658,6 +672,7 @@ msgstr "Ubicaci
 msgid "Do not use Trash"
 msgstr "No usar papelera"
 
+#: squirrelmail/plugins/administrator/defines.php:115
 #: squirrelmail/src/options_folder.php:67
 msgid "Trash Folder"
 msgstr "Papelera"
@@ -666,6 +681,7 @@ msgstr "Papelera"
 msgid "Do not use Sent"
 msgstr "No usar Elementos enviados"
 
+#: squirrelmail/plugins/administrator/defines.php:118
 #: squirrelmail/src/options_folder.php:78
 msgid "Sent Folder"
 msgstr "Elementos enviados"
@@ -674,6 +690,7 @@ msgstr "Elementos enviados"
 msgid "Do not use Drafts"
 msgstr "No usar borrador"
 
+#: squirrelmail/plugins/administrator/defines.php:121
 #: squirrelmail/src/options_folder.php:89
 msgid "Draft Folder"
 msgstr "Borradores"
@@ -694,6 +711,7 @@ msgstr "Izquierda"
 msgid "Right"
 msgstr "Derecha"
 
+#: squirrelmail/plugins/administrator/defines.php:43
 #: squirrelmail/src/options_folder.php:111
 msgid "pixels"
 msgstr "pixels"
@@ -779,17 +797,17 @@ msgstr "Memorizar B
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: squirrelmail/functions/page_header.php:126
+#: squirrelmail/functions/page_header.php:129
 #: squirrelmail/plugins/filters/options.php:62
 #: squirrelmail/plugins/newmail/newmail_opt.php:34
 #: squirrelmail/plugins/translate/options.php:97
 #: squirrelmail/src/options.php:165 squirrelmail/src/options_highlight.php:62
-#: squirrelmail/src/options_identities.php:58
-#: squirrelmail/src/options_order.php:48
+#: 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:264
+#: squirrelmail/src/options.php:113 squirrelmail/src/options.php:267
 #: squirrelmail/src/options_highlight.php:62
 msgid "Message Highlighting"
 msgstr "Resaltado de Mensajes"
@@ -888,11 +906,6 @@ msgstr "Otro:"
 msgid "Ex: 63aa7f"
 msgstr "Eje: 63AA7F"
 
-#: squirrelmail/plugins/filters/options.php:91
-#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:118
-msgid "Cc"
-msgstr "Cc"
-
 #: squirrelmail/plugins/filters/options.php:94
 #: squirrelmail/src/options_highlight.php:331
 msgid "To or Cc"
@@ -902,68 +915,68 @@ msgstr "Para o CC"
 msgid "Matches"
 msgstr "Coincidencia"
 
-#: squirrelmail/src/options_identities.php:58
+#: squirrelmail/src/options_identities.php:44
 msgid "Advanced Identities"
 msgstr "Identidades Avanzadas"
 
-#: squirrelmail/src/options_identities.php:69
+#: squirrelmail/src/options_identities.php:55
 msgid "Default Identity"
 msgstr "Identidad por Omisión"
 
-#: squirrelmail/src/options_identities.php:80
+#: squirrelmail/src/options_identities.php:66
 #, c-format
 msgid "Alternate Identity %d"
 msgstr "Identidad alternativa %d"
 
-#: squirrelmail/src/options_identities.php:90
+#: squirrelmail/src/options_identities.php:76
 msgid "Add a New Identity"
 msgstr "Añadir una identidad"
 
-#: squirrelmail/src/options_identities.php:306
+#: squirrelmail/src/options_identities.php:291
 #: squirrelmail/src/options_personal.php:49
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: squirrelmail/src/options_identities.php:307
+#: squirrelmail/src/options_identities.php:292
 msgid "E-Mail Address"
 msgstr "Dirección de Correo Electrónico"
 
-#: squirrelmail/src/options_identities.php:308
+#: squirrelmail/src/options_identities.php:293
 #: squirrelmail/src/options_personal.php:65
 msgid "Reply To"
 msgstr "Responder a"
 
-#: squirrelmail/src/options_identities.php:315
+#: squirrelmail/src/options_identities.php:300
 msgid "Save / Update"
 msgstr "Guardar / Actualizar"
 
-#: squirrelmail/src/options_identities.php:318
+#: squirrelmail/src/options_identities.php:303
 msgid "Make Default"
 msgstr "Ponerla por omisión"
 
-#: squirrelmail/src/options_identities.php:324
+#: squirrelmail/src/options_identities.php:309
 msgid "Move Up"
 msgstr "Mover Arriba"
 
-#: squirrelmail/src/options.php:125 squirrelmail/src/options.php:280
-#: squirrelmail/src/options_order.php:48
+#: squirrelmail/src/options.php:125 squirrelmail/src/options.php:283
+#: squirrelmail/src/options_order.php:31
 msgid "Index Order"
 msgstr "Orden de índice"
 
-#: squirrelmail/src/options_order.php:54
+#: squirrelmail/src/options_order.php:37
 msgid "Checkbox"
 msgstr "Checkbox"
 
-#: squirrelmail/src/options_order.php:58
+#: squirrelmail/src/options_order.php:41
 msgid "Flags"
 msgstr "Indicadores"
 
 #: squirrelmail/functions/mailbox_display.php:587
-#: squirrelmail/src/options_order.php:59
+#: squirrelmail/src/options_order.php:42
 msgid "Size"
 msgstr "Tamaño"
 
-#: squirrelmail/src/options_order.php:102
+#: squirrelmail/src/options_order.php:85
 msgid ""
 "The index order is the order that the columns are arranged in the message "
 "index.  You can add, remove, and move columns around to customize them to "
@@ -972,19 +985,19 @@ msgstr ""
 "El orden del índice es como desea ordenar el índice de mensajes. Puede "
 "agregar, quitar y mover las columnas a su gusto."
 
-#: squirrelmail/src/options_order.php:111
+#: squirrelmail/src/options_order.php:94
 msgid "up"
 msgstr "arriba"
 
-#: squirrelmail/src/options_order.php:113
+#: squirrelmail/src/options_order.php:96
 msgid "down"
 msgstr "abajo"
 
-#: squirrelmail/src/options_order.php:118
+#: squirrelmail/src/options_order.php:101
 msgid "remove"
 msgstr "remover"
 
-#: squirrelmail/src/options_order.php:147
+#: squirrelmail/src/options_order.php:130
 msgid "Return to options page"
 msgstr "Volver a la pagina de opciones"
 
@@ -1056,31 +1069,31 @@ msgstr "Preceder firma con '-- '"
 msgid "Signature"
 msgstr "Firma"
 
-#: squirrelmail/src/options.php:101 squirrelmail/src/options.php:248
+#: squirrelmail/src/options.php:101 squirrelmail/src/options.php:251
 msgid "Personal Information"
 msgstr "Información Personal"
 
-#: squirrelmail/src/options.php:107 squirrelmail/src/options.php:256
+#: squirrelmail/src/options.php:107 squirrelmail/src/options.php:259
 msgid "Display Preferences"
 msgstr "Preferencias de Pantalla"
 
-#: squirrelmail/src/options.php:119 squirrelmail/src/options.php:272
+#: squirrelmail/src/options.php:119 squirrelmail/src/options.php:275
 msgid "Folder Preferences"
 msgstr "Preferencias de Carpetas"
 
-#: squirrelmail/src/options.php:232
+#: squirrelmail/src/options.php:235
 msgid "Successfully Saved Options"
 msgstr "Opciones Actualizadas"
 
-#: squirrelmail/src/options.php:236
+#: squirrelmail/src/options.php:239
 msgid "Refresh Folder List"
 msgstr "Actualizar Carpetas"
 
-#: squirrelmail/src/options.php:238
+#: squirrelmail/src/options.php:241
 msgid "Refresh Page"
 msgstr "Actualizar Página"
 
-#: squirrelmail/src/options.php:250
+#: squirrelmail/src/options.php:253
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
@@ -1088,7 +1101,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:258
+#: squirrelmail/src/options.php:261
 msgid ""
 "You can change the way that SquirrelMail looks and displays information to "
 "you, such as the colors, the language, and other settings."
@@ -1096,7 +1109,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:266
+#: squirrelmail/src/options.php:269
 msgid ""
 "Based upon given criteria, incoming messages can have different background "
 "colors in the message list.  This helps to easily distinguish who the "
@@ -1107,14 +1120,14 @@ msgstr ""
 "distinguir fácilmente de quien provienen. (Especialmente para listas de "
 "correo)."
 
-#: squirrelmail/src/options.php:274
+#: squirrelmail/src/options.php:277
 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:282
+#: squirrelmail/src/options.php:285
 msgid ""
 "The order of the message index can be rearranged and changed to contain the "
 "headers in any order you want."
@@ -1122,17 +1135,17 @@ msgstr ""
 "El orden del índice puede ser cambiado a gusto, ordenando por cualquiera de "
 "los encabezados."
 
-#: squirrelmail/src/printer_friendly_bottom.php:78
+#: squirrelmail/src/printer_friendly_bottom.php:61
 msgid "Message not printable"
 msgstr "Este mensaje no puede imprimirse"
 
-#: squirrelmail/src/printer_friendly_bottom.php:107
+#: squirrelmail/src/printer_friendly_bottom.php:90
 #: squirrelmail/src/printer_friendly_main.php:15
 #: squirrelmail/src/printer_friendly_top.php:21
 msgid "Printer Friendly"
 msgstr "Vista Preliminar"
 
-#: squirrelmail/src/printer_friendly_bottom.php:115
+#: squirrelmail/src/printer_friendly_bottom.php:98
 msgid "CC"
 msgstr "CC"
 
@@ -1197,12 +1210,12 @@ msgstr "Fecha:"
 msgid "Mailer"
 msgstr "Cliente"
 
-#: squirrelmail/functions/auth.php:29 squirrelmail/src/redirect.php:60
+#: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
 #: squirrelmail/src/redirect.php:64
 msgid "You must be logged in to access this page."
 msgstr "¡Necesita un nombre de usuario y contraseña válidos para acceder!."
 
-#: squirrelmail/functions/auth.php:30 squirrelmail/src/redirect.php:65
+#: squirrelmail/functions/auth.php:34 squirrelmail/src/redirect.php:65
 msgid "Go to the login page"
 msgstr "Ir a la página de entrada"
 
@@ -1214,23 +1227,23 @@ 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:114
+#: squirrelmail/src/search.php:289
 msgid "Body"
 msgstr "Cuerpo"
 
-#: squirrelmail/src/search.php:115
+#: squirrelmail/src/search.php:290
 msgid "Everywhere"
 msgstr "Todos lados"
 
-#: squirrelmail/functions/page_header.php:114 squirrelmail/src/signout.php:84
+#: squirrelmail/functions/page_header.php:117 squirrelmail/src/signout.php:72
 msgid "Sign Out"
 msgstr "Desconectarse"
 
-#: squirrelmail/src/signout.php:90
+#: squirrelmail/src/signout.php:78
 msgid "You have been successfully signed out."
 msgstr "Se ha desconectado correctamente."
 
-#: squirrelmail/src/signout.php:92
+#: squirrelmail/src/signout.php:80
 msgid "Click here to log back in."
 msgstr "Pulse aquí para volver a ingresar"
 
@@ -1287,7 +1300,7 @@ msgid "Title & Org. / Dept."
 msgstr "Puesto, Empr. / Dpto."
 
 #: squirrelmail/functions/abook_database.php:50
-#: squirrelmail/functions/abook_local_file.php:53
+#: squirrelmail/functions/abook_local_file.php:37
 #: squirrelmail/functions/addressbook.php:152
 msgid "Personal address book"
 msgstr "Libreta personal de direcciones"
@@ -1306,10 +1319,10 @@ msgstr "Error en base de datos: %s"
 #: squirrelmail/functions/abook_database.php:221
 #: squirrelmail/functions/abook_database.php:260
 #: squirrelmail/functions/abook_database.php:293
-#: squirrelmail/functions/abook_local_file.php:247
-#: squirrelmail/functions/abook_local_file.php:267
-#: squirrelmail/functions/abook_local_file.php:290
-#: squirrelmail/functions/abook_local_file.php:319
+#: squirrelmail/functions/abook_local_file.php:239
+#: 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
@@ -1317,49 +1330,49 @@ msgid "Addressbook is read-only"
 msgstr "La libreta de direcciones es de solo lectura"
 
 #: squirrelmail/functions/abook_database.php:231
-#: squirrelmail/functions/abook_local_file.php:252
+#: squirrelmail/functions/abook_local_file.php:244
 #, c-format
 msgid "User '%s' already exist"
 msgstr "Usuario '%s'ya existe"
 
 #: squirrelmail/functions/abook_database.php:303
-#: squirrelmail/functions/abook_local_file.php:324
+#: squirrelmail/functions/abook_local_file.php:323
 #, c-format
 msgid "User '%s' does not exist"
 msgstr "El usuario '%s' no existe"
 
-#: squirrelmail/functions/abook_global_file.php:51
+#: squirrelmail/functions/abook_global_file.php:35
 msgid "Global address book"
 msgstr "Libro de direcciones Global"
 
-#: squirrelmail/functions/abook_global_file.php:71
-#: squirrelmail/functions/abook_local_file.php:94
+#: squirrelmail/functions/abook_global_file.php:56
+#: squirrelmail/functions/abook_local_file.php:83
 msgid "No such file or directory"
 msgstr "No se encontró el archivo o directorio"
 
-#: squirrelmail/functions/abook_global_file.php:81
-#: squirrelmail/functions/abook_local_file.php:114
-#: squirrelmail/functions/abook_local_file.php:150
+#: squirrelmail/functions/abook_global_file.php:69
+#: squirrelmail/functions/abook_local_file.php:104
+#: squirrelmail/functions/abook_local_file.php:139
 msgid "Open failed"
 msgstr "Error al abrir"
 
-#: squirrelmail/functions/abook_global_file.php:178
-#: squirrelmail/functions/abook_global_file.php:184
-#: squirrelmail/functions/abook_global_file.php:190
+#: squirrelmail/functions/abook_global_file.php:171
+#: squirrelmail/functions/abook_global_file.php:177
+#: squirrelmail/functions/abook_global_file.php:183
 msgid "Can not modify global address book"
 msgstr "La libreta global de direcciones no puede modificarse"
 
-#: squirrelmail/functions/abook_local_file.php:61
+#: squirrelmail/functions/abook_local_file.php:46
 msgid "Not a file name"
 msgstr "No es un nombre de archivo"
 
-#: squirrelmail/functions/abook_local_file.php:271
-#: squirrelmail/functions/abook_local_file.php:295
+#: squirrelmail/functions/abook_local_file.php:265
+#: squirrelmail/functions/abook_local_file.php:291
 #: squirrelmail/functions/abook_local_file.php:330
 msgid "Could not lock datafile"
 msgstr "No se pudo bloquear el archivo de datos"
 
-#: squirrelmail/functions/abook_local_file.php:283
+#: squirrelmail/functions/abook_local_file.php:278
 msgid "Write to addressbook failed"
 msgstr "Error escribiendo la libreta de direcciones"
 
@@ -1401,13 +1414,13 @@ msgstr "Falta la direcci
 msgid "Nickname contains illegal characters"
 msgstr "El apodo contiene caracteres no válidos"
 
-#: squirrelmail/functions/attachment_common.php:116
-#: squirrelmail/functions/attachment_common.php:141
-#: squirrelmail/functions/attachment_common.php:166
+#: squirrelmail/functions/attachment_common.php:106
+#: squirrelmail/functions/attachment_common.php:131
+#: squirrelmail/functions/attachment_common.php:156
 msgid "view"
 msgstr "ver"
 
-#: squirrelmail/functions/attachment_common.php:183
+#: squirrelmail/functions/attachment_common.php:173
 msgid "Business Card"
 msgstr "Tarjeta de Visita"
 
@@ -1526,48 +1539,48 @@ msgstr "j/m/Y"
 #: squirrelmail/functions/db_prefs.php:66
 #: squirrelmail/functions/db_prefs.php:104
 #: squirrelmail/functions/db_prefs.php:107
-#: squirrelmail/functions/db_prefs.php:241
+#: squirrelmail/functions/db_prefs.php:245
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr "Archivo de preferencias %s no encontrado. Saliendo anormalmente."
 
-#: squirrelmail/functions/db_prefs.php:377
-#: squirrelmail/functions/prefs.php:268
+#: 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:378
-#: squirrelmail/functions/prefs.php:269
+#: 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:379
-#: squirrelmail/functions/prefs.php:171 squirrelmail/functions/prefs.php:176
-#: squirrelmail/functions/prefs.php:270
+#: 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:23
+#: squirrelmail/functions/display_messages.php:28
 #: squirrelmail/functions/imap_general.php:224
 msgid "Unknown user or password incorrect."
 msgstr "Usuario o contraseña incorrecto."
 
-#: squirrelmail/functions/display_messages.php:25
+#: squirrelmail/functions/display_messages.php:30
 msgid "Click here to try again"
 msgstr "Pulse aquí para intentarlo de nuevo"
 
-#: squirrelmail/functions/display_messages.php:39
+#: squirrelmail/functions/display_messages.php:44
 #, c-format
 msgid "Welcome to %s's WebMail system"
 msgstr "Bienvenido al Correo Web de %s"
 
-#: squirrelmail/functions/display_messages.php:51
+#: squirrelmail/functions/display_messages.php:56
 #, c-format
 msgid "Running SquirrelMail version %s (c) 1999-2001."
 msgstr "Ejecutando SquirrelMail versión %s (c) 1999-2001."
 
-#: squirrelmail/functions/display_messages.php:76
+#: squirrelmail/functions/display_messages.php:81
 #, c-format
 msgid "Click here to return to %s"
 msgstr "Pulse aquí para volver a %s"
@@ -1650,15 +1663,15 @@ msgstr "Sin destinatario"
 msgid "(unknown sender)"
 msgstr "(remitente desconocido)"
 
-#: squirrelmail/functions/imap_search.php:61
+#: squirrelmail/functions/imap_search.php:82
 msgid "No Messages Found"
 msgstr "No se Encontraron Mensajes"
 
-#: squirrelmail/functions/imap_search.php:151
+#: squirrelmail/functions/imap_search.php:172
 msgid "Found"
 msgstr "Encontrado"
 
-#: squirrelmail/functions/imap_search.php:151
+#: squirrelmail/functions/imap_search.php:172
 msgid "messages"
 msgstr "mensajes"
 
@@ -1756,15 +1769,15 @@ msgstr "Mensaje:"
 msgid "FETCH line:"
 msgstr "Recojer línea:"
 
-#: squirrelmail/functions/mime.php:649
+#: squirrelmail/functions/mime.php:653
 msgid "Attachments"
 msgstr "Ficheros adjuntos"
 
-#: squirrelmail/functions/mime.php:688
+#: squirrelmail/functions/mime.php:692
 msgid "download"
 msgstr "descargar"
 
-#: squirrelmail/functions/mime.php:967
+#: squirrelmail/functions/mime.php:979
 #: squirrelmail/plugins/calendar/event_create.php:53
 #: squirrelmail/plugins/calendar/event_create.php:111
 #: squirrelmail/plugins/calendar/event_delete.php:36
@@ -1774,7 +1787,7 @@ msgstr "descargar"
 msgid "Title:"
 msgstr "Título:"
 
-#: squirrelmail/functions/mime.php:1137
+#: squirrelmail/functions/mime.php:1149
 msgid "sec_remove_eng.png"
 msgstr ""
 
@@ -1784,22 +1797,24 @@ 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:313
 #: 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:314
 #: squirrelmail/plugins/calendar/event_delete.php:58
 #: squirrelmail/plugins/calendar/event_edit.php:141
 msgid "No"
 msgstr "No"
 
-#: squirrelmail/functions/page_header.php:108
+#: squirrelmail/functions/page_header.php:111
 msgid "Current Folder"
 msgstr "Carpeta Actual"
 
-#: squirrelmail/functions/page_header.php:120
+#: squirrelmail/functions/page_header.php:123
 msgid "Compose"
 msgstr "Componer"
 
@@ -1812,15 +1827,15 @@ 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:169 squirrelmail/functions/prefs.php:174
+#: squirrelmail/functions/prefs.php:170 squirrelmail/functions/prefs.php:175
 msgid "Error opening "
 msgstr "Error abriendo "
 
-#: squirrelmail/functions/prefs.php:170
+#: squirrelmail/functions/prefs.php:171
 msgid "Default preference file not found!"
 msgstr "¡No se encuentra el fichero de preferencias por omisión!"
 
-#: squirrelmail/functions/prefs.php:175
+#: squirrelmail/functions/prefs.php:176
 msgid "Could not create initial preference file!"
 msgstr "¡No se pudo crear el fichero inicial de preferencias!"
 
@@ -2218,361 +2233,6 @@ msgstr ""
 "Se ha producido un intento de intrusión no autorizado. Administrador del "
 "sistema contactado."
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:24
-msgid "Your personal dictionary was erased."
-msgstr "Se eliminó su diccionario personal."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:25
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:32
-msgid "Dictionary Erased"
-msgstr "Diccionario Borrado"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:30
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:57
-msgid "Close this Window"
-msgstr "Cerrar esta Ventana"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:48
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Now return to the "
-"&quot;SpellChecker options&quot; menu and make your selection again."
-msgstr ""
-"Su diccionario personal ha sido cifrado correctamente. Vuelva a la página de "
-"opciones de SpellChecker y vuelva a realizar su selección."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:51
-msgid "Successful Re-encryption"
-msgstr "Cifrado Correcto"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:54
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Please close this "
-"window and click \"Check Spelling\" button again to start your spellcheck "
-"over."
-msgstr ""
-"Su diccionario personal ha sido cifrado correctamente. Por favor cierre esta "
-"venta y pulse sobre el botón \"Otrografía\" de nuevo para volver a empezar "
-"la comprobación"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:59
-msgid "Dictionary re-encrypted"
-msgstr "Diccionario Cifrado"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:25
-msgid ""
-"Your personal dictionary has been <strong>encrypted</strong> and is now "
-"stored in an <strong>encrypted format</strong>."
-msgstr ""
-"Su diccionario personal ha sido <b>cifrado</b> y ha sido almacenado en un "
-"formato <b>cifrado</b>."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:36
-msgid ""
-"Your personal dictionary has been <strong>decrypted</strong> and is now "
-"stored as <strong>clear text</strong>."
-msgstr ""
-"Su diccionario personal ha sido <b>descifrado</b> y se ha almacenado como "
-"<b>texto</b> sin cifrar."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:44
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:45
-msgid "Personal Dictionary Crypto Settings"
-msgstr "Opciones de Cifrado del Diccionario Personal"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:121
-msgid "SquirrelSpell Results"
-msgstr "Resultados de SquirrelSpell"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:170
-#, c-format
-msgid "Found %s errors"
-msgstr "Se encontraron %s errores"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:183
-msgid "Line with an error:"
-msgstr "Línea que contiene la falta:"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:192
-msgid "Error:"
-msgstr "Error:"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:200
-msgid "Suggestions:"
-msgstr "Sugerencias:"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:206
-msgid "Suggestions"
-msgstr "Sugerencias"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:214
-msgid "Change to:"
-msgstr "Cambiar a:"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:223
-msgid "Occurs times:"
-msgstr "Nº de veces:"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:239
-msgid "Change this word"
-msgstr "Cambia esta palabra"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:240
-msgid "Change"
-msgstr "Cambiar"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:242
-msgid "Change ALL occurances of this word"
-msgstr "Cambia TODAS las apariciones de esta palabra"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:243
-msgid "Change All"
-msgstr "Cambia Todos"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:245
-msgid "Ignore this word"
-msgstr "Ignora esta palabra"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:246
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:248
-msgid "Ignore ALL occurances this word"
-msgstr "Ignora TODAS las apariciones de esta palabra"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:249
-msgid "Ignore All"
-msgstr "Ignora Todos"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:251
-msgid "Add this word to your personal dictionary"
-msgstr "Agregar esta palabra a su diccionario personal"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:252
-msgid "Add to Dic"
-msgstr "Agregar"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:264
-msgid "Close and Commit"
-msgstr "Cerrar y Corregir"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:266
-msgid "The spellcheck is not finished. Really close and commit changes?"
-msgstr "La comprobación no ha terminado aún. ¿Confirma el cierre y corrección?"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:269
-msgid "Close and Cancel"
-msgstr "Cerrar y Cancelar"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:271
-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.php:285
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:50
-msgid "Close"
-msgstr "Cerrar"
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:286
-msgid "No errors found"
-msgstr "No se encontraron errores"
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:21
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:56
-msgid "Personal Dictionary"
-msgstr "Diccionario Personal"
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:21
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:61
-msgid "No words in your personal dictionary."
-msgstr "Su diccionario personal no contiene ninguna palabra."
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:24
-msgid "Please check any words you wish to delete from your dictionary."
-msgstr ""
-"Por favor marque todas las palabras que desea borrar de su diccionario."
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:35
-#, c-format
-msgid "%s dictionary"
-msgstr "diccionario %s"
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:54
-msgid "Delete checked words"
-msgstr "Borrar palabras seleccionadas"
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:65
-msgid "Edit your Personal Dictionary"
-msgstr "Editar el Diccionario Personal"
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:22
-msgid ""
-"<p>Your personal dictionary is <strong>currently encrypted</strong>. This "
-"helps protect your privacy in case the web-mail system gets compromized and "
-"your personal dictionary ends up stolen. It is currently encrypted with the "
-"password you use to access your mailbox, making it hard for anyone to see "
-"what is stored in your personal dictionary.</p> <p><strong>ATTENTION:</"
-"strong> If you forget your password, your personal dictionary will become "
-"unaccessible, since it can no longer be decrypted. If you change your "
-"mailbox password, SquirrelSpell will recognize it and prompt you for your "
-"old password in order to re-encrypt the dictionary with a new key.</p>"
-msgstr ""
-"<p>Su diccionario personal está <b>cifrado</b>. Esto ayuda a proteger su "
-"intimidad en el caso de que la seguridad del correo web esté comprometida y "
-"su diccionario personal sea robado por terceros. Actualmente la contraseña "
-"de cifrado empleada es la misma que la de su buzón.</p><p><b>ATENCIÓN:</b> "
-"Si olvida su contraseña su diccionario personal no podrá emplearse, puesto "
-"que no podrá ser descifrado. Si cambia la contraseña de su buzón "
-"SquirrelSpell se dará cuenta  y le pedirá su contraseña antigua para cambiar "
-"el cifrado del diccionario.</p>"
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:26
-msgid ""
-"Please decrypt my personal dictionary and store it in a clear-text format."
-msgstr "Por favor descifra mi diccionario personal y guárdalo en modo texto."
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:29
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:42
-msgid "Change crypto settings"
-msgstr "Cambiar opciones de cifrado"
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:35
-msgid ""
-"<p>Your personal dictionary is <strong>currently not encrypted</strong>. You "
-"may wish to encrypt your personal dictionary to protect your privacy in case "
-"the webmail system gets compromized and your personal dictionary file gets "
-"stolen. When encrypted, the file's contents look garbled and are hard to "
-"decrypt without knowing the correct key (which is your mailbox password).</"
-"p> <strong>ATTENTION:</strong> If you decide to encrypt your personal "
-"dictionary, you must remember that it gets &quot;hashed&quot; with your "
-"mailbox password. If you forget your mailbox password and the administrator "
-"changes it to a new value, your personal dictionary will become useless and "
-"will have to be created anew. However, if you or your system administrator "
-"change your mailbox password but you still have the old password at hand, "
-"you will be able to enter the old key to re-encrypt the dictionary with the "
-"new value.</p>"
-msgstr ""
-"<p>Actualmente su diccionario personal <b>no está cifrado</b>. Si lo desea "
-"puede hacerlo para proteger su intimidad en el caso en el que la seguridad "
-"del correo WEB se vea comprometida y se robe el fichero que contiene su "
-"diccionario. Una vez cifrado, es muy improbable que se pueda ver su "
-"contenido sin conocer su contraseña (que equivale a la de su buzón de "
-"correo).</p><b>ATENCIÓN:</b> Si una vez el diccionario cifrado usted "
-"olvidara la contraseña, este no podría volver a utilizarse. En cualquier "
-"caso, si se produjera algún cambio en la contraseña de su buzón deberá de "
-"facilitar la contraseña antigua para poder cifrar el diccionario con la "
-"clave nueva.</p>"
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:39
-msgid ""
-"Please encrypt my personal dictionary and store it in an encrypted format."
-msgstr "Por favor cifra mi diccionario."
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:22
-#, c-format
-msgid "Deleting the following entries from <strong>%s</strong> dictionary:"
-msgstr "Borrando las siguientes palabras del diccionario <b>%s</b>:"
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:52
-msgid "All done!"
-msgstr "¡Hecho!"
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:53
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:51
-msgid "Personal Dictionary Updated"
-msgstr "Diccionario Personal Actualizado"
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:56
-msgid "No changes requested."
-msgstr "No hay cambios pendientes"
-
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:25
-msgid "Please wait, communicating with the server..."
-msgstr "Espere un momento, comunicando con el servidor ..."
-
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:32
-msgid ""
-"Please choose which dictionary you would like to use to spellcheck this "
-"message:"
-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/squirrelspell/modules/init.mod.php:44
-msgid "Go"
-msgstr "Adelante"
-
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:48
-msgid "SquirrelSpell Initiating"
-msgstr "Iniciando SquirrelSpell"
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:56
-#, c-format
-msgid ""
-"Settings adjusted to: <strong>%s</strong> with <strong>%s</strong> as "
-"default dictionary."
-msgstr ""
-"Opciones ajustada a: <b>%s</b>, usando <b>%s</b> como diccionario por "
-"omisión."
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:61
-#, c-format
-msgid "Using <strong>%s</strong> dictionary (system default) for spellcheck."
-msgstr ""
-"Usando el diccionario <b>%s</b> (establecido por omisión) para comprobar la "
-"ortografía"
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:69
-msgid "International Dictionaries Preferences Updated"
-msgstr "Opciones de Diccionarios Intl. Actualizadas"
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:19
-msgid ""
-"Please check any available international dictionaries which you would like "
-"to use when spellchecking:"
-msgstr ""
-"Por favor, seleccione de los diccionarios disponibles aquellos que le  "
-"gustaría emplear para comprobar la ortografía."
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:26
-msgid "Make this dictionary my default selection:"
-msgstr "Establecer este diccionario por omisión:"
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:41
-msgid "Make these changes"
-msgstr "Hacer estos cambios"
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:42
-msgid "Add International Dictionaries"
-msgstr "Agregar Diccionarios Internacionales"
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:18
-msgid "Please choose which options you wish to set up:"
-msgstr "Por favor, seleccione las opciones que desea establecer:"
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:22
-msgid "Edit your personal dictionary"
-msgstr "Edite su diccionario personal"
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:27
-msgid "Set up international dictionaries"
-msgstr "Establecer diccionarios internacionales"
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:35
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:39
-msgid "Encrypt or decrypt your personal dictionary"
-msgstr "Cifrado del diccionario personal"
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:39
-msgid "not available"
-msgstr "no disponible"
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:43
-msgid "SquirrelSpell Options Menu"
-msgstr "Menú de Opciones de SquirrelSpell"
-
 #: squirrelmail/plugins/translate/options.php:97
 msgid "Translator"
 msgstr "Traductor"
@@ -3087,6 +2747,10 @@ msgstr "Probar Sonido"
 msgid "Loading the sound..."
 msgstr "Cargando el sonido ..."
 
+#: squirrelmail/plugins/newmail/testsound.php:33
+msgid "Close"
+msgstr "Cerrar"
+
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:82
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:90
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:102
@@ -3556,6 +3220,10 @@ msgstr "Carpeta Base de Mensajes Enviados"
 msgid "TODAY"
 msgstr "HOY"
 
+#: squirrelmail/plugins/calendar/calendar.php:112
+msgid "Go"
+msgstr "Adelante"
+
 #: squirrelmail/plugins/calendar/day.php:79
 msgid "ADD"
 msgstr "Agregar"
@@ -3750,33 +3418,556 @@ msgstr "Contestar"
 msgid "Mailinglist options:"
 msgstr "Opciones de Lista:"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:158
-#: squirrelmail/plugins/delete_move_next/setup.php:161
+#: squirrelmail/plugins/delete_move_next/setup.php:159
+#: squirrelmail/plugins/delete_move_next/setup.php:162
 msgid "Delete & Prev"
 msgstr "Borrar y Atrás"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:164
-#: squirrelmail/plugins/delete_move_next/setup.php:166
+#: squirrelmail/plugins/delete_move_next/setup.php:165
+#: squirrelmail/plugins/delete_move_next/setup.php:167
 msgid "Delete & Next"
 msgstr "Borrar y Adelante"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:289
+#: squirrelmail/plugins/delete_move_next/setup.php:290
 msgid "delete_move_next:"
 msgstr "Borrar_mover_siguiente:"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:295
+#: squirrelmail/plugins/delete_move_next/setup.php:296
 msgid "display at top"
 msgstr "mostrar arriba"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:301
-#: squirrelmail/plugins/delete_move_next/setup.php:313
+#: squirrelmail/plugins/delete_move_next/setup.php:302
+#: squirrelmail/plugins/delete_move_next/setup.php:314
 msgid "with move option"
 msgstr "activar mover"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:307
+#: squirrelmail/plugins/delete_move_next/setup.php:308
 msgid "display at bottom"
 msgstr "mostrar abajo"
 
+#: squirrelmail/plugins/administrator/defines.php:46
+msgid "Config File Version"
+msgstr "Versión de configuración"
+
+#: squirrelmail/plugins/administrator/defines.php:50
+msgid "Organization Preferences"
+msgstr "Opciones de la Entidad"
+
+#: squirrelmail/plugins/administrator/defines.php:52
+msgid "Organization Name"
+msgstr "Nombre de la entidad"
+
+#: squirrelmail/plugins/administrator/defines.php:55
+msgid "Organization Logo"
+msgstr "Logotipo de la entidad"
+
+#: squirrelmail/plugins/administrator/defines.php:58
+msgid "Organization Title"
+msgstr "Título de la entidad"
+
+#: squirrelmail/plugins/administrator/defines.php:61
+msgid "Signout Page"
+msgstr "Página de desconexión"
+
+#: squirrelmail/plugins/administrator/defines.php:64
+msgid "Default Language"
+msgstr "Idioma por omisión"
+
+#: squirrelmail/plugins/administrator/defines.php:68
+msgid "Top Frame"
+msgstr "Marco superior"
+
+#: squirrelmail/plugins/administrator/defines.php:72
+msgid "Server Settings"
+msgstr "Configuración de servidores"
+
+#: squirrelmail/plugins/administrator/defines.php:74
+msgid "Mail Domain"
+msgstr "Dominio de correo"
+
+#: squirrelmail/plugins/administrator/defines.php:77
+msgid "IMAP Server Address"
+msgstr "Dirección del servidor IMAP"
+
+#: squirrelmail/plugins/administrator/defines.php:80
+msgid "IMAP Server Port"
+msgstr "Puerto del servidor IMAP"
+
+#: squirrelmail/plugins/administrator/defines.php:82
+msgid "IMAP Server Type"
+msgstr "Tipo de servidor IMAP"
+
+#: squirrelmail/plugins/administrator/defines.php:84
+msgid "Cyrus IMAP server"
+msgstr "Servidor IMAP Cyrus"
+
+#: squirrelmail/plugins/administrator/defines.php:85
+msgid "University of Washington's IMAP server"
+msgstr "Servidor IMAP de la Universidad de Washington"
+
+#: squirrelmail/plugins/administrator/defines.php:86
+msgid "Microsoft Exchange IMAP server"
+msgstr "Servidor IMAP Microsoft Exchange"
+
+#: squirrelmail/plugins/administrator/defines.php:87
+msgid "Courier IMAP server"
+msgstr "Servidor IMAP Courier"
+
+#: squirrelmail/plugins/administrator/defines.php:88
+msgid "Not one of the above servers"
+msgstr "Ninguno de los anteriores"
+
+#: squirrelmail/plugins/administrator/defines.php:89
+msgid "IMAP Folder Delimiter"
+msgstr "Delimitador de carpetas IMAP"
+
+#: squirrelmail/plugins/administrator/defines.php:91
+msgid "Use \"detect\" to auto-detect."
+msgstr "Escribe \"detect\" para su auto-detección."
+
+#: squirrelmail/plugins/administrator/defines.php:93
+msgid "Use Sendmail"
+msgstr "¿Usar Sendmail?"
+
+#: squirrelmail/plugins/administrator/defines.php:95
+msgid "Sendmail Path"
+msgstr "Ubicación de Sendmail"
+
+#: squirrelmail/plugins/administrator/defines.php:98
+msgid "SMTP Server Address"
+msgstr "Dirección del servidor SMTP"
+
+#: squirrelmail/plugins/administrator/defines.php:101
+msgid "SMTP Server Port"
+msgstr "Puerto del servidor SMTP"
+
+#: squirrelmail/plugins/administrator/defines.php:103
+msgid "Authenticated SMTP"
+msgstr "¿Servidor SMTP con autentificación?"
+
+#: squirrelmail/plugins/administrator/defines.php:105
+msgid "Invert Time"
+msgstr "¿Invertir la hora?"
+
+#: squirrelmail/plugins/administrator/defines.php:108
+msgid "Folders Defaults"
+msgstr "Valores por Omisión para las Carpetas"
+
+#: squirrelmail/plugins/administrator/defines.php:110
+msgid "Default Folder Prefix"
+msgstr "Prefijo de carpetas"
+
+#: squirrelmail/plugins/administrator/defines.php:113
+msgid "Show Folder Prefix Option"
+msgstr "¿Permitir modificar el prefijo?"
+
+#: squirrelmail/plugins/administrator/defines.php:124
+msgid "By default, move to trash"
+msgstr "¿Mover a la papelera por omisión?"
+
+#: squirrelmail/plugins/administrator/defines.php:126
+msgid "By default, move to sent"
+msgstr "¿Mover a elementos enviados por omisión?"
+
+#: squirrelmail/plugins/administrator/defines.php:128
+msgid "By default, save as draft"
+msgstr "¿Guardar borradores por omisión?"
+
+#: squirrelmail/plugins/administrator/defines.php:130
+msgid "List Special Folders First"
+msgstr "¿Mostrar carpetas especiales al principio?"
+
+#: squirrelmail/plugins/administrator/defines.php:132
+msgid "Show Special Folders Color"
+msgstr "¿Cambiar color de carpetas especiales?"
+
+#: squirrelmail/plugins/administrator/defines.php:134
+msgid "Auto Expunge"
+msgstr "¿Purga Automática?"
+
+#: squirrelmail/plugins/administrator/defines.php:136
+msgid "Default Sub. of INBOX"
+msgstr "¿Por debajo de INBOX por omisión?"
+
+#: squirrelmail/plugins/administrator/defines.php:138
+msgid "Show 'Contain Sub.' Option"
+msgstr "¿Mostrar la opción de subcarpetas?"
+
+#: squirrelmail/plugins/administrator/defines.php:140
+msgid "Default Unseen Notify"
+msgstr "Notificación de no leidos por omisión"
+
+#: squirrelmail/plugins/administrator/defines.php:142
+msgid "Default Unseen Type"
+msgstr "Tipo de no leidos por omisión"
+
+#: squirrelmail/plugins/administrator/defines.php:144
+msgid "Auto Create Special Folders"
+msgstr "¿Crear carpeta especiales automáticamente?"
+
+#: squirrelmail/plugins/administrator/defines.php:146
+msgid "Default Javascript Adrressbook"
+msgstr "¿Usar Javasrcipt por omisión en la agenda?"
+
+#: squirrelmail/plugins/administrator/defines.php:149
+msgid "General Options"
+msgstr "Opciones Generales"
+
+#: squirrelmail/plugins/administrator/defines.php:151
+msgid "Default Charset"
+msgstr "Juego de caracteres por omisión"
+
+#: squirrelmail/plugins/administrator/defines.php:162
+msgid "Data Directory"
+msgstr "Directorio de datos"
+
+#: squirrelmail/plugins/administrator/defines.php:165
+msgid "Temp Directory"
+msgstr "Directorio temporal"
+
+#: squirrelmail/plugins/administrator/defines.php:168
+msgid "Hash Level"
+msgstr "Nivel de fragmentación"
+
+#: squirrelmail/plugins/administrator/defines.php:170
+msgid "Hash Disabled"
+msgstr "¿Desactivar fragmentación de directorio?"
+
+#: squirrelmail/plugins/administrator/defines.php:172
+msgid "Moderate"
+msgstr "Moderada"
+
+#: squirrelmail/plugins/administrator/defines.php:173
+msgid "Medium"
+msgstr "Media"
+
+#: squirrelmail/plugins/administrator/defines.php:175
+msgid "Default Left Size"
+msgstr "Tamaño por omisión de lista de carpetas"
+
+#: squirrelmail/plugins/administrator/defines.php:178
+msgid "Usernames in Lowercase"
+msgstr "¿Nombres de usuarios en minúsculas?"
+
+#: squirrelmail/plugins/administrator/defines.php:180
+msgid "Allow use of priority"
+msgstr "¿Activar prioridades?"
+
+#: squirrelmail/plugins/administrator/defines.php:182
+msgid "Hide SM attributions"
+msgstr "¿Esconder atributos de SM?"
+
+#: squirrelmail/plugins/administrator/defines.php:185
+#: squirrelmail/plugins/administrator/defines.php:187
+msgid "Message of the Day"
+msgstr "Mensaje del día"
+
+#: squirrelmail/plugins/administrator/defines.php:191
+msgid "Themes"
+msgstr "Temas"
+
+#: squirrelmail/plugins/administrator/defines.php:193
+msgid "Style Sheet URL (css)"
+msgstr "URL de la hoja de estilos (css)"
+
+#: squirrelmail/plugins/administrator/options.php:168
+msgid "Configuration Administrator"
+msgstr "Configuración del Sistema"
+
+#: squirrelmail/plugins/administrator/options.php:332
+msgid "Theme Name"
+msgstr "Nombre del tema"
+
+#: squirrelmail/plugins/administrator/options.php:333
+msgid "Theme Path"
+msgstr "Ubicación del tema"
+
+#: squirrelmail/plugins/administrator/options.php:362
+msgid "Plugins"
+msgstr "Añadidos (Plugins)"
+
+#: squirrelmail/plugins/administrator/options.php:405
+msgid "Change Settings"
+msgstr "Cambiar opciones"
+
+#: squirrelmail/plugins/administrator/setup.php:31
+msgid "Administration"
+msgstr "Administración"
+
+#: squirrelmail/plugins/administrator/setup.php:33
+msgid ""
+"This module allows administrators to manage SquirrelMail main configuration "
+"remotely."
+msgstr "Este módulo permite configurar remotamente las opciones principales de Squirrelmail."
+
+#~ msgid "Your personal dictionary was erased."
+#~ msgstr "Se eliminó su diccionario personal."
+
+#~ msgid "Dictionary Erased"
+#~ msgstr "Diccionario Borrado"
+
+#~ msgid "Close this Window"
+#~ msgstr "Cerrar esta Ventana"
+
+#~ msgid ""
+#~ "Your personal dictionary was re-encrypted successfully. Now return to the "
+#~ "&quot;SpellChecker options&quot; menu and make your selection again."
+#~ msgstr ""
+#~ "Su diccionario personal ha sido cifrado correctamente. Vuelva a la página "
+#~ "de opciones de SpellChecker y vuelva a realizar su selección."
+
+#~ msgid "Successful Re-encryption"
+#~ msgstr "Cifrado Correcto"
+
+#~ msgid ""
+#~ "Your personal dictionary was re-encrypted successfully. Please close this "
+#~ "window and click \"Check Spelling\" button again to start your spellcheck "
+#~ "over."
+#~ msgstr ""
+#~ "Su diccionario personal ha sido cifrado correctamente. Por favor cierre "
+#~ "esta venta y pulse sobre el botón \"Otrografía\" de nuevo para volver a "
+#~ "empezar la comprobación"
+
+#~ msgid "Dictionary re-encrypted"
+#~ msgstr "Diccionario Cifrado"
+
+#~ msgid ""
+#~ "Your personal dictionary has been <strong>encrypted</strong> and is now "
+#~ "stored in an <strong>encrypted format</strong>."
+#~ msgstr ""
+#~ "Su diccionario personal ha sido <b>cifrado</b> y ha sido almacenado en un "
+#~ "formato <b>cifrado</b>."
+
+#~ msgid ""
+#~ "Your personal dictionary has been <strong>decrypted</strong> and is now "
+#~ "stored as <strong>clear text</strong>."
+#~ msgstr ""
+#~ "Su diccionario personal ha sido <b>descifrado</b> y se ha almacenado como "
+#~ "<b>texto</b> sin cifrar."
+
+#~ msgid "Personal Dictionary Crypto Settings"
+#~ msgstr "Opciones de Cifrado del Diccionario Personal"
+
+#~ msgid "SquirrelSpell Results"
+#~ msgstr "Resultados de SquirrelSpell"
+
+#~ msgid "Found %s errors"
+#~ msgstr "Se encontraron %s errores"
+
+#~ msgid "Line with an error:"
+#~ msgstr "Línea que contiene la falta:"
+
+#~ msgid "Error:"
+#~ msgstr "Error:"
+
+#~ msgid "Suggestions:"
+#~ msgstr "Sugerencias:"
+
+#~ msgid "Suggestions"
+#~ msgstr "Sugerencias"
+
+#~ msgid "Change to:"
+#~ msgstr "Cambiar a:"
+
+#~ msgid "Occurs times:"
+#~ msgstr "Nº de veces:"
+
+#~ msgid "Change this word"
+#~ msgstr "Cambia esta palabra"
+
+#~ msgid "Change"
+#~ msgstr "Cambiar"
+
+#~ msgid "Change ALL occurances of this word"
+#~ msgstr "Cambia TODAS las apariciones de esta palabra"
+
+#~ msgid "Change All"
+#~ msgstr "Cambia Todos"
+
+#~ msgid "Ignore this word"
+#~ msgstr "Ignora esta palabra"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorar"
+
+#~ msgid "Ignore ALL occurances this word"
+#~ msgstr "Ignora TODAS las apariciones de esta palabra"
+
+#~ msgid "Ignore All"
+#~ msgstr "Ignora Todos"
+
+#~ msgid "Add this word to your personal dictionary"
+#~ msgstr "Agregar esta palabra a su diccionario personal"
+
+#~ msgid "Add to Dic"
+#~ msgstr "Agregar"
+
+#~ msgid "Close and Commit"
+#~ msgstr "Cerrar y Corregir"
+
+#~ msgid "The spellcheck is not finished. Really close and commit changes?"
+#~ msgstr ""
+#~ "La comprobación no ha terminado aún. ¿Confirma el cierre y corrección?"
+
+#~ msgid "Close and Cancel"
+#~ 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?"
+
+#~ msgid "No errors found"
+#~ msgstr "No se encontraron errores"
+
+#~ msgid "Personal Dictionary"
+#~ msgstr "Diccionario Personal"
+
+#~ msgid "No words in your personal dictionary."
+#~ msgstr "Su diccionario personal no contiene ninguna palabra."
+
+#~ msgid "Please check any words you wish to delete from your dictionary."
+#~ msgstr ""
+#~ "Por favor marque todas las palabras que desea borrar de su diccionario."
+
+#~ msgid "%s dictionary"
+#~ msgstr "diccionario %s"
+
+#~ msgid "Delete checked words"
+#~ msgstr "Borrar palabras seleccionadas"
+
+#~ msgid "Edit your Personal Dictionary"
+#~ msgstr "Editar el Diccionario Personal"
+
+#~ msgid ""
+#~ "<p>Your personal dictionary is <strong>currently encrypted</strong>. This "
+#~ "helps protect your privacy in case the web-mail system gets compromized "
+#~ "and your personal dictionary ends up stolen. It is currently encrypted "
+#~ "with the password you use to access your mailbox, making it hard for "
+#~ "anyone to see what is stored in your personal dictionary.</p> "
+#~ "<p><strong>ATTENTION:</strong> If you forget your password, your personal "
+#~ "dictionary will become unaccessible, since it can no longer be decrypted. "
+#~ "If you change your mailbox password, SquirrelSpell will recognize it and "
+#~ "prompt you for your old password in order to re-encrypt the dictionary "
+#~ "with a new key.</p>"
+#~ msgstr ""
+#~ "<p>Su diccionario personal está <b>cifrado</b>. Esto ayuda a proteger su "
+#~ "intimidad en el caso de que la seguridad del correo web esté comprometida "
+#~ "y su diccionario personal sea robado por terceros. Actualmente la "
+#~ "contraseña de cifrado empleada es la misma que la de su buzón.</"
+#~ "p><p><b>ATENCIÓN:</b> Si olvida su contraseña su diccionario personal no "
+#~ "podrá emplearse, puesto que no podrá ser descifrado. Si cambia la "
+#~ "contraseña de su buzón SquirrelSpell se dará cuenta  y le pedirá su "
+#~ "contraseña antigua para cambiar el cifrado del diccionario.</p>"
+
+#~ msgid ""
+#~ "Please decrypt my personal dictionary and store it in a clear-text format."
+#~ msgstr ""
+#~ "Por favor descifra mi diccionario personal y guárdalo en modo texto."
+
+#~ msgid ""
+#~ "<p>Your personal dictionary is <strong>currently not encrypted</strong>. "
+#~ "You may wish to encrypt your personal dictionary to protect your privacy "
+#~ "in case the webmail system gets compromized and your personal dictionary "
+#~ "file gets stolen. When encrypted, the file's contents look garbled and "
+#~ "are hard to decrypt without knowing the correct key (which is your "
+#~ "mailbox password).</p> <strong>ATTENTION:</strong> If you decide to "
+#~ "encrypt your personal dictionary, you must remember that it gets &quot;"
+#~ "hashed&quot; with your mailbox password. If you forget your mailbox "
+#~ "password and the administrator changes it to a new value, your personal "
+#~ "dictionary will become useless and will have to be created anew. However, "
+#~ "if you or your system administrator change your mailbox password but you "
+#~ "still have the old password at hand, you will be able to enter the old "
+#~ "key to re-encrypt the dictionary with the new value.</p>"
+#~ msgstr ""
+#~ "<p>Actualmente su diccionario personal <b>no está cifrado</b>. Si lo "
+#~ "desea puede hacerlo para proteger su intimidad en el caso en el que la "
+#~ "seguridad del correo WEB se vea comprometida y se robe el fichero que "
+#~ "contiene su diccionario. Una vez cifrado, es muy improbable que se pueda "
+#~ "ver su contenido sin conocer su contraseña (que equivale a la de su buzón "
+#~ "de correo).</p><b>ATENCIÓN:</b> Si una vez el diccionario cifrado usted "
+#~ "olvidara la contraseña, este no podría volver a utilizarse. En cualquier "
+#~ "caso, si se produjera algún cambio en la contraseña de su buzón deberá de "
+#~ "facilitar la contraseña antigua para poder cifrar el diccionario con la "
+#~ "clave nueva.</p>"
+
+#~ msgid ""
+#~ "Please encrypt my personal dictionary and store it in an encrypted format."
+#~ msgstr "Por favor cifra mi diccionario."
+
+#~ msgid "Deleting the following entries from <strong>%s</strong> dictionary:"
+#~ msgstr "Borrando las siguientes palabras del diccionario <b>%s</b>:"
+
+#~ msgid "All done!"
+#~ msgstr "¡Hecho!"
+
+#~ msgid "Personal Dictionary Updated"
+#~ msgstr "Diccionario Personal Actualizado"
+
+#~ msgid "No changes requested."
+#~ msgstr "No hay cambios pendientes"
+
+#~ msgid "Please wait, communicating with the server..."
+#~ msgstr "Espere un momento, comunicando con el servidor ..."
+
+#~ msgid ""
+#~ "Please choose which dictionary you would like to use to spellcheck this "
+#~ "message:"
+#~ msgstr ""
+#~ "Por favor, seleccione el diccionario que desea usar para comprobar la "
+#~ "ortografía de este mensaje."
+
+#~ msgid "SquirrelSpell Initiating"
+#~ msgstr "Iniciando SquirrelSpell"
+
+#~ msgid ""
+#~ "Settings adjusted to: <strong>%s</strong> with <strong>%s</strong> as "
+#~ "default dictionary."
+#~ msgstr ""
+#~ "Opciones ajustada a: <b>%s</b>, usando <b>%s</b> como diccionario por "
+#~ "omisión."
+
+#~ msgid ""
+#~ "Using <strong>%s</strong> dictionary (system default) for spellcheck."
+#~ msgstr ""
+#~ "Usando el diccionario <b>%s</b> (establecido por omisión) para comprobar "
+#~ "la ortografía"
+
+#~ msgid "International Dictionaries Preferences Updated"
+#~ msgstr "Opciones de Diccionarios Intl. Actualizadas"
+
+#~ msgid ""
+#~ "Please check any available international dictionaries which you would "
+#~ "like to use when spellchecking:"
+#~ msgstr ""
+#~ "Por favor, seleccione de los diccionarios disponibles aquellos que le  "
+#~ "gustaría emplear para comprobar la ortografía."
+
+#~ msgid "Make this dictionary my default selection:"
+#~ msgstr "Establecer este diccionario por omisión:"
+
+#~ msgid "Make these changes"
+#~ msgstr "Hacer estos cambios"
+
+#~ msgid "Add International Dictionaries"
+#~ msgstr "Agregar Diccionarios Internacionales"
+
+#~ msgid "Please choose which options you wish to set up:"
+#~ msgstr "Por favor, seleccione las opciones que desea establecer:"
+
+#~ msgid "Edit your personal dictionary"
+#~ msgstr "Edite su diccionario personal"
+
+#~ msgid "Set up international dictionaries"
+#~ msgstr "Establecer diccionarios internacionales"
+
+#~ msgid "Encrypt or decrypt your personal dictionary"
+#~ msgstr "Cifrado del diccionario personal"
+
+#~ msgid "not available"
+#~ msgstr "no disponible"
+
+#~ msgid "SquirrelSpell Options Menu"
+#~ msgstr "Menú de Opciones de SquirrelSpell"
+
 #~ msgid ""
 #~ "FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be "
 #~ "SLOOOOOOW!"
diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 5d571c3a..4ebc5af3 100644
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -26,6 +26,7 @@ define('SMOPT_TYPE_NUMLIST', 8);
 define('SMOPT_TYPE_TITLE', 9);
 define('SMOPT_TYPE_THEME', 10);
 define('SMOPT_TYPE_PLUGINS', 11);
+define('SMOPT_TYPE_LDAP', 12);
 
 global $languages;
 
diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index be1f0eb4..9a6ba649 100644
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -195,9 +195,12 @@ foreach ( $newcfg as $k => $v ) {
         $type = SMOPT_TYPE_THEME;
     } else if ( substr( $k, 0, 9 ) == '$plugins[' ) {
         $type = SMOPT_TYPE_PLUGINS;
+    } else if ( substr( $k, 0, 13 ) == '$ldap_server[' ) {
+        $type = SMOPT_TYPE_LDAP;
     }
 
     switch ( $type ) {
+    case SMOPT_TYPE_LDAP:
     case SMOPT_TYPE_PLUGINS:
     case SMOPT_TYPE_THEME:
     case SMOPT_TYPE_HIDDEN:
diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 7a94f792..90290e51 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-01-24 15:07+0100\n"
+"POT-Creation-Date: 2002-01-30 11:58+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"
@@ -19,81 +19,102 @@ msgid "Address Book"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:98
-#: squirrelmail/src/addrbook_search_html.php:66
+#: squirrelmail/src/addrbook_search_html.php:67
 #: squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:85
 msgid "Name"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:99
-#: squirrelmail/src/addrbook_search_html.php:67
+#: squirrelmail/src/addrbook_search_html.php:68
 #: squirrelmail/src/addressbook.php:286
 msgid "E-mail"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:68
+#: squirrelmail/src/addrbook_search_html.php:69
 #: squirrelmail/src/addressbook.php:287
 msgid "Info"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:103
-#: squirrelmail/src/addrbook_search_html.php:71
+#: squirrelmail/src/addrbook_search_html.php:72
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:98
+#: squirrelmail/functions/mailbox_display.php:565
+#: 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:294
+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:293
+msgid "Cc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:86
+msgid "Bcc"
+msgstr ""
+
+#: squirrelmail/src/addrbook_search_html.php:99
 msgid "Use Addresses"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:117
+#: squirrelmail/src/addrbook_search_html.php:118
 msgid "Address Book Search"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:173
-#: squirrelmail/src/addrbook_search_html.php:126
+#: squirrelmail/src/addrbook_search_html.php:127
 msgid "Search for"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:179
-#: squirrelmail/src/addrbook_search_html.php:136
+#: squirrelmail/src/addrbook_search_html.php:137
 msgid "in"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:180
-#: squirrelmail/src/addrbook_search_html.php:139
+#: squirrelmail/src/addrbook_search_html.php:140
 msgid "All address books"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:128
+#: squirrelmail/functions/page_header.php:131
 #: squirrelmail/src/addrbook_search.php:190
-#: squirrelmail/src/addrbook_search_html.php:150
-#: squirrelmail/src/search.php:45 squirrelmail/src/search.php:124
+#: squirrelmail/src/addrbook_search_html.php:151
+#: squirrelmail/src/search.php:188
 msgid "Search"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:191
-#: squirrelmail/src/addrbook_search_html.php:151
+#: squirrelmail/src/addrbook_search_html.php:152
 msgid "List all"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:213
-#: squirrelmail/src/addrbook_search_html.php:176
+#: squirrelmail/src/addrbook_search_html.php:177
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:236
-#: squirrelmail/src/addrbook_search_html.php:201
+#: squirrelmail/src/addrbook_search.php:239
+#: squirrelmail/src/addrbook_search_html.php:205
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:159
-#: squirrelmail/src/addrbook_search.php:243
-#: squirrelmail/src/addrbook_search_html.php:206
+#: squirrelmail/src/addrbook_search.php:246
+#: squirrelmail/src/addrbook_search_html.php:210
 msgid "No persons matching your search was found"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:219
+#: squirrelmail/src/addrbook_search_html.php:223
 msgid "Return"
 msgstr ""
 
@@ -138,9 +159,9 @@ msgstr ""
 msgid "Update address"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:20
-#: squirrelmail/functions/display_messages.php:71
-#: squirrelmail/functions/display_messages.php:87
+#: squirrelmail/functions/display_messages.php:25
+#: squirrelmail/functions/display_messages.php:76
+#: squirrelmail/functions/display_messages.php:92
 #: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:239
 msgid "ERROR"
 msgstr ""
@@ -184,9 +205,9 @@ msgstr ""
 #: 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:57
-#: squirrelmail/src/printer_friendly_bottom.php:118
-#: squirrelmail/src/search.php:116
+#: squirrelmail/src/options_order.php:40
+#: squirrelmail/src/printer_friendly_bottom.php:101
+#: squirrelmail/src/search.php:291
 msgid "Subject"
 msgstr ""
 
@@ -195,29 +216,19 @@ msgstr ""
 #: 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:55
-#: squirrelmail/src/printer_friendly_bottom.php:112
-#: squirrelmail/src/search.php:117
+#: squirrelmail/src/options_order.php:38
+#: squirrelmail/src/printer_friendly_bottom.php:95
+#: squirrelmail/src/search.php:292
 msgid "From"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:575
 #: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:133
-#: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:56
-#: squirrelmail/src/printer_friendly_bottom.php:117
+#: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:39
+#: squirrelmail/src/printer_friendly_bottom.php:100
 msgid "Date"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:565
-#: squirrelmail/plugins/filters/options.php:88
-#: 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:113
-#: squirrelmail/src/search.php:119
-msgid "To"
-msgstr ""
-
 #: squirrelmail/plugins/listcommands/mailout.php:50
 #: squirrelmail/src/compose.php:462 squirrelmail/src/read_body.php:566
 msgid "From:"
@@ -247,7 +258,7 @@ msgstr ""
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:143
+#: squirrelmail/src/compose.php:568 squirrelmail/src/options_order.php:126
 msgid "Add"
 msgstr ""
 
@@ -255,7 +266,7 @@ msgstr ""
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:122 squirrelmail/src/compose.php:609
+#: squirrelmail/functions/page_header.php:125 squirrelmail/src/compose.php:609
 #: squirrelmail/src/compose.php:613 squirrelmail/src/compose.php:617
 msgid "Addresses"
 msgstr ""
@@ -268,6 +279,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/defines.php:174
 #: squirrelmail/plugins/calendar/functions.php:98
 #: squirrelmail/src/compose.php:629 squirrelmail/src/read_body.php:424
 msgid "High"
@@ -278,6 +290,7 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/defines.php:171
 #: squirrelmail/src/compose.php:631 squirrelmail/src/read_body.php:430
 msgid "Low"
 msgstr ""
@@ -309,7 +322,7 @@ msgstr ""
 msgid "View message"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:620 squirrelmail/src/download.php:41
+#: squirrelmail/functions/mime.php:624 squirrelmail/src/download.php:41
 #: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:196
 msgid "Download this as a file"
 msgstr ""
@@ -322,7 +335,7 @@ msgstr ""
 msgid "Click here to go back"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:124 squirrelmail/src/folders.php:29
+#: squirrelmail/functions/page_header.php:127 squirrelmail/src/folders.php:29
 #: squirrelmail/src/left_main.php:234
 msgid "Folders"
 msgstr ""
@@ -392,7 +405,7 @@ msgstr ""
 #: squirrelmail/plugins/mail_fetch/options.php:168
 #: squirrelmail/plugins/mail_fetch/options.php:175
 #: squirrelmail/src/folders.php:190 squirrelmail/src/options_highlight.php:76
-#: squirrelmail/src/options_identities.php:320
+#: squirrelmail/src/options_identities.php:305
 #: squirrelmail/src/read_body.php:473
 msgid "Delete"
 msgstr ""
@@ -415,11 +428,11 @@ msgstr ""
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:42
+#: squirrelmail/src/folders_rename_getname.php:40
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:46
+#: squirrelmail/src/folders_rename_getname.php:44
 msgid "New name:"
 msgstr ""
 
@@ -427,12 +440,12 @@ msgstr ""
 #: squirrelmail/plugins/filters/options.php:138
 #: squirrelmail/plugins/newmail/newmail_opt.php:133
 #: squirrelmail/plugins/translate/options.php:163
-#: squirrelmail/src/folders_rename_getname.php:53
+#: squirrelmail/src/folders_rename_getname.php:51
 #: squirrelmail/src/options_highlight.php:347
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:130
+#: squirrelmail/functions/page_header.php:133
 #: squirrelmail/plugins/listcommands/setup.php:32 squirrelmail/src/help.php:91
 msgid "Help"
 msgstr ""
@@ -530,6 +543,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/defines.php:40
 #: squirrelmail/src/options_display.php:51
 #: squirrelmail/src/options_display.php:80
 msgid "Default"
@@ -656,6 +670,7 @@ msgstr ""
 msgid "Do not use Trash"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/defines.php:115
 #: squirrelmail/src/options_folder.php:67
 msgid "Trash Folder"
 msgstr ""
@@ -664,6 +679,7 @@ msgstr ""
 msgid "Do not use Sent"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/defines.php:118
 #: squirrelmail/src/options_folder.php:78
 msgid "Sent Folder"
 msgstr ""
@@ -672,6 +688,7 @@ msgstr ""
 msgid "Do not use Drafts"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/defines.php:121
 #: squirrelmail/src/options_folder.php:89
 msgid "Draft Folder"
 msgstr ""
@@ -692,6 +709,7 @@ msgstr ""
 msgid "Right"
 msgstr ""
 
+#: squirrelmail/plugins/administrator/defines.php:43
 #: squirrelmail/src/options_folder.php:111
 msgid "pixels"
 msgstr ""
@@ -777,17 +795,17 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:126
+#: squirrelmail/functions/page_header.php:129
 #: squirrelmail/plugins/filters/options.php:62
 #: squirrelmail/plugins/newmail/newmail_opt.php:34
 #: squirrelmail/plugins/translate/options.php:97
 #: squirrelmail/src/options.php:165 squirrelmail/src/options_highlight.php:62
-#: squirrelmail/src/options_identities.php:58
-#: squirrelmail/src/options_order.php:48
+#: squirrelmail/src/options_identities.php:44
+#: squirrelmail/src/options_order.php:31
 msgid "Options"
 msgstr ""
 
-#: squirrelmail/src/options.php:113 squirrelmail/src/options.php:264
+#: squirrelmail/src/options.php:113 squirrelmail/src/options.php:267
 #: squirrelmail/src/options_highlight.php:62
 msgid "Message Highlighting"
 msgstr ""
@@ -886,11 +904,6 @@ msgstr ""
 msgid "Ex: 63aa7f"
 msgstr ""
 
-#: squirrelmail/plugins/filters/options.php:91
-#: squirrelmail/src/options_highlight.php:328 squirrelmail/src/search.php:118
-msgid "Cc"
-msgstr ""
-
 #: squirrelmail/plugins/filters/options.php:94
 #: squirrelmail/src/options_highlight.php:331
 msgid "To or Cc"
@@ -900,87 +913,87 @@ msgstr ""
 msgid "Matches"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:58
+#: squirrelmail/src/options_identities.php:44
 msgid "Advanced Identities"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:69
+#: squirrelmail/src/options_identities.php:55
 msgid "Default Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:80
+#: squirrelmail/src/options_identities.php:66
 #, c-format
 msgid "Alternate Identity %d"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:90
+#: squirrelmail/src/options_identities.php:76
 msgid "Add a New Identity"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:306
+#: squirrelmail/src/options_identities.php:291
 #: squirrelmail/src/options_personal.php:49
 msgid "Full Name"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:307
+#: squirrelmail/src/options_identities.php:292
 msgid "E-Mail Address"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:308
+#: squirrelmail/src/options_identities.php:293
 #: squirrelmail/src/options_personal.php:65
 msgid "Reply To"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:315
+#: squirrelmail/src/options_identities.php:300
 msgid "Save / Update"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:318
+#: squirrelmail/src/options_identities.php:303
 msgid "Make Default"
 msgstr ""
 
-#: squirrelmail/src/options_identities.php:324
+#: squirrelmail/src/options_identities.php:309
 msgid "Move Up"
 msgstr ""
 
-#: squirrelmail/src/options.php:125 squirrelmail/src/options.php:280
-#: squirrelmail/src/options_order.php:48
+#: squirrelmail/src/options.php:125 squirrelmail/src/options.php:283
+#: squirrelmail/src/options_order.php:31
 msgid "Index Order"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:54
+#: squirrelmail/src/options_order.php:37
 msgid "Checkbox"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:58
+#: squirrelmail/src/options_order.php:41
 msgid "Flags"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:587
-#: squirrelmail/src/options_order.php:59
+#: squirrelmail/src/options_order.php:42
 msgid "Size"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:102
+#: squirrelmail/src/options_order.php:85
 msgid ""
 "The index order is the order that the columns are arranged in the message "
 "index.  You can add, remove, and move columns around to customize them to "
 "fit your needs."
 msgstr ""
 
-#: squirrelmail/src/options_order.php:111
+#: squirrelmail/src/options_order.php:94
 msgid "up"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:113
+#: squirrelmail/src/options_order.php:96
 msgid "down"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:118
+#: squirrelmail/src/options_order.php:101
 msgid "remove"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:147
+#: squirrelmail/src/options_order.php:130
 msgid "Return to options page"
 msgstr ""
 
@@ -1052,71 +1065,71 @@ msgstr ""
 msgid "Signature"
 msgstr ""
 
-#: squirrelmail/src/options.php:101 squirrelmail/src/options.php:248
+#: squirrelmail/src/options.php:101 squirrelmail/src/options.php:251
 msgid "Personal Information"
 msgstr ""
 
-#: squirrelmail/src/options.php:107 squirrelmail/src/options.php:256
+#: squirrelmail/src/options.php:107 squirrelmail/src/options.php:259
 msgid "Display Preferences"
 msgstr ""
 
-#: squirrelmail/src/options.php:119 squirrelmail/src/options.php:272
+#: squirrelmail/src/options.php:119 squirrelmail/src/options.php:275
 msgid "Folder Preferences"
 msgstr ""
 
-#: squirrelmail/src/options.php:232
+#: squirrelmail/src/options.php:235
 msgid "Successfully Saved Options"
 msgstr ""
 
-#: squirrelmail/src/options.php:236
+#: squirrelmail/src/options.php:239
 msgid "Refresh Folder List"
 msgstr ""
 
-#: squirrelmail/src/options.php:238
+#: squirrelmail/src/options.php:241
 msgid "Refresh Page"
 msgstr ""
 
-#: squirrelmail/src/options.php:250
+#: squirrelmail/src/options.php:253
 msgid ""
 "This contains personal information about yourself such as your name, your "
 "email address, etc."
 msgstr ""
 
-#: squirrelmail/src/options.php:258
+#: squirrelmail/src/options.php:261
 msgid ""
 "You can change the way that SquirrelMail looks and displays information to "
 "you, such as the colors, the language, and other settings."
 msgstr ""
 
-#: squirrelmail/src/options.php:266
+#: squirrelmail/src/options.php:269
 msgid ""
 "Based upon given criteria, incoming messages can have different background "
 "colors in the message list.  This helps to easily distinguish who the "
 "messages are from, especially for mailing lists."
 msgstr ""
 
-#: squirrelmail/src/options.php:274
+#: squirrelmail/src/options.php:277
 msgid ""
 "These settings change the way your folders are displayed and manipulated."
 msgstr ""
 
-#: squirrelmail/src/options.php:282
+#: squirrelmail/src/options.php:285
 msgid ""
 "The order of the message index can be rearranged and changed to contain the "
 "headers in any order you want."
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:78
+#: squirrelmail/src/printer_friendly_bottom.php:61
 msgid "Message not printable"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:107
+#: squirrelmail/src/printer_friendly_bottom.php:90
 #: squirrelmail/src/printer_friendly_main.php:15
 #: squirrelmail/src/printer_friendly_top.php:21
 msgid "Printer Friendly"
 msgstr ""
 
-#: squirrelmail/src/printer_friendly_bottom.php:115
+#: squirrelmail/src/printer_friendly_bottom.php:98
 msgid "CC"
 msgstr ""
 
@@ -1181,12 +1194,12 @@ msgstr ""
 msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:29 squirrelmail/src/redirect.php:60
+#: squirrelmail/functions/auth.php:33 squirrelmail/src/redirect.php:60
 #: squirrelmail/src/redirect.php:64
 msgid "You must be logged in to access this page."
 msgstr ""
 
-#: squirrelmail/functions/auth.php:30 squirrelmail/src/redirect.php:65
+#: squirrelmail/functions/auth.php:34 squirrelmail/src/redirect.php:65
 msgid "Go to the login page"
 msgstr ""
 
@@ -1198,23 +1211,23 @@ msgstr ""
 msgid "Contact your administrator for help."
 msgstr ""
 
-#: squirrelmail/src/search.php:114
+#: squirrelmail/src/search.php:289
 msgid "Body"
 msgstr ""
 
-#: squirrelmail/src/search.php:115
+#: squirrelmail/src/search.php:290
 msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:114 squirrelmail/src/signout.php:84
+#: squirrelmail/functions/page_header.php:117 squirrelmail/src/signout.php:72
 msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/src/signout.php:90
+#: squirrelmail/src/signout.php:78
 msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/signout.php:92
+#: squirrelmail/src/signout.php:80
 msgid "Click here to log back in."
 msgstr ""
 
@@ -1271,7 +1284,7 @@ msgid "Title & Org. / Dept."
 msgstr ""
 
 #: squirrelmail/functions/abook_database.php:50
-#: squirrelmail/functions/abook_local_file.php:53
+#: squirrelmail/functions/abook_local_file.php:37
 #: squirrelmail/functions/addressbook.php:152
 msgid "Personal address book"
 msgstr ""
@@ -1290,10 +1303,10 @@ msgstr ""
 #: squirrelmail/functions/abook_database.php:221
 #: squirrelmail/functions/abook_database.php:260
 #: squirrelmail/functions/abook_database.php:293
-#: squirrelmail/functions/abook_local_file.php:247
-#: squirrelmail/functions/abook_local_file.php:267
-#: squirrelmail/functions/abook_local_file.php:290
-#: squirrelmail/functions/abook_local_file.php:319
+#: squirrelmail/functions/abook_local_file.php:239
+#: 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
@@ -1301,49 +1314,49 @@ msgid "Addressbook is read-only"
 msgstr ""
 
 #: squirrelmail/functions/abook_database.php:231
-#: squirrelmail/functions/abook_local_file.php:252
+#: squirrelmail/functions/abook_local_file.php:244
 #, c-format
 msgid "User '%s' already exist"
 msgstr ""
 
 #: squirrelmail/functions/abook_database.php:303
-#: squirrelmail/functions/abook_local_file.php:324
+#: squirrelmail/functions/abook_local_file.php:323
 #, c-format
 msgid "User '%s' does not exist"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:51
+#: squirrelmail/functions/abook_global_file.php:35
 msgid "Global address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:71
-#: squirrelmail/functions/abook_local_file.php:94
+#: squirrelmail/functions/abook_global_file.php:56
+#: squirrelmail/functions/abook_local_file.php:83
 msgid "No such file or directory"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:81
-#: squirrelmail/functions/abook_local_file.php:114
-#: squirrelmail/functions/abook_local_file.php:150
+#: squirrelmail/functions/abook_global_file.php:69
+#: squirrelmail/functions/abook_local_file.php:104
+#: squirrelmail/functions/abook_local_file.php:139
 msgid "Open failed"
 msgstr ""
 
-#: squirrelmail/functions/abook_global_file.php:178
-#: squirrelmail/functions/abook_global_file.php:184
-#: squirrelmail/functions/abook_global_file.php:190
+#: squirrelmail/functions/abook_global_file.php:171
+#: squirrelmail/functions/abook_global_file.php:177
+#: squirrelmail/functions/abook_global_file.php:183
 msgid "Can not modify global address book"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:61
+#: squirrelmail/functions/abook_local_file.php:46
 msgid "Not a file name"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:271
-#: squirrelmail/functions/abook_local_file.php:295
+#: squirrelmail/functions/abook_local_file.php:265
+#: squirrelmail/functions/abook_local_file.php:291
 #: squirrelmail/functions/abook_local_file.php:330
 msgid "Could not lock datafile"
 msgstr ""
 
-#: squirrelmail/functions/abook_local_file.php:283
+#: squirrelmail/functions/abook_local_file.php:278
 msgid "Write to addressbook failed"
 msgstr ""
 
@@ -1385,13 +1398,13 @@ msgstr ""
 msgid "Nickname contains illegal characters"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:116
-#: squirrelmail/functions/attachment_common.php:141
-#: squirrelmail/functions/attachment_common.php:166
+#: squirrelmail/functions/attachment_common.php:106
+#: squirrelmail/functions/attachment_common.php:131
+#: squirrelmail/functions/attachment_common.php:156
 msgid "view"
 msgstr ""
 
-#: squirrelmail/functions/attachment_common.php:183
+#: squirrelmail/functions/attachment_common.php:173
 msgid "Business Card"
 msgstr ""
 
@@ -1510,48 +1523,48 @@ msgstr ""
 #: squirrelmail/functions/db_prefs.php:66
 #: squirrelmail/functions/db_prefs.php:104
 #: squirrelmail/functions/db_prefs.php:107
-#: squirrelmail/functions/db_prefs.php:241
+#: squirrelmail/functions/db_prefs.php:245
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:377
-#: squirrelmail/functions/prefs.php:268
+#: squirrelmail/functions/db_prefs.php:381
+#: squirrelmail/functions/prefs.php:269
 #, c-format
 msgid "Error creating directory %s."
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:378
-#: squirrelmail/functions/prefs.php:269
+#: squirrelmail/functions/db_prefs.php:382
+#: squirrelmail/functions/prefs.php:270
 msgid "Could not create hashed directory structure!"
 msgstr ""
 
-#: squirrelmail/functions/db_prefs.php:379
-#: squirrelmail/functions/prefs.php:171 squirrelmail/functions/prefs.php:176
-#: squirrelmail/functions/prefs.php:270
+#: 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 ""
 
-#: squirrelmail/functions/display_messages.php:23
+#: squirrelmail/functions/display_messages.php:28
 #: squirrelmail/functions/imap_general.php:224
 msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:25
+#: squirrelmail/functions/display_messages.php:30
 msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:39
+#: squirrelmail/functions/display_messages.php:44
 #, c-format
 msgid "Welcome to %s's WebMail system"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:51
+#: squirrelmail/functions/display_messages.php:56
 #, c-format
 msgid "Running SquirrelMail version %s (c) 1999-2001."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:76
+#: squirrelmail/functions/display_messages.php:81
 #, c-format
 msgid "Click here to return to %s"
 msgstr ""
@@ -1634,15 +1647,15 @@ msgstr ""
 msgid "(unknown sender)"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:61
+#: squirrelmail/functions/imap_search.php:82
 msgid "No Messages Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:151
+#: squirrelmail/functions/imap_search.php:172
 msgid "Found"
 msgstr ""
 
-#: squirrelmail/functions/imap_search.php:151
+#: squirrelmail/functions/imap_search.php:172
 msgid "messages"
 msgstr ""
 
@@ -1735,15 +1748,15 @@ msgstr ""
 msgid "FETCH line:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:649
+#: squirrelmail/functions/mime.php:653
 msgid "Attachments"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:688
+#: squirrelmail/functions/mime.php:692
 msgid "download"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:967
+#: squirrelmail/functions/mime.php:979
 #: squirrelmail/plugins/calendar/event_create.php:53
 #: squirrelmail/plugins/calendar/event_create.php:111
 #: squirrelmail/plugins/calendar/event_delete.php:36
@@ -1753,7 +1766,7 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:1137
+#: squirrelmail/functions/mime.php:1149
 msgid "sec_remove_eng.png"
 msgstr ""
 
@@ -1763,22 +1776,24 @@ msgid "Option Type '%s' Not Found"
 msgstr ""
 
 #: squirrelmail/functions/options.php:253
+#: squirrelmail/plugins/administrator/options.php:313
 #: squirrelmail/plugins/calendar/event_delete.php:51
 #: squirrelmail/plugins/calendar/event_edit.php:134
 msgid "Yes"
 msgstr ""
 
 #: squirrelmail/functions/options.php:258
+#: squirrelmail/plugins/administrator/options.php:314
 #: squirrelmail/plugins/calendar/event_delete.php:58
 #: squirrelmail/plugins/calendar/event_edit.php:141
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:108
+#: squirrelmail/functions/page_header.php:111
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:120
+#: squirrelmail/functions/page_header.php:123
 msgid "Compose"
 msgstr ""
 
@@ -1789,15 +1804,15 @@ msgid ""
 "default preference file."
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:169 squirrelmail/functions/prefs.php:174
+#: squirrelmail/functions/prefs.php:170 squirrelmail/functions/prefs.php:175
 msgid "Error opening "
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:170
+#: squirrelmail/functions/prefs.php:171
 msgid "Default preference file not found!"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:175
+#: squirrelmail/functions/prefs.php:176
 msgid "Could not create initial preference file!"
 msgstr ""
 
@@ -2130,325 +2145,6 @@ msgstr ""
 msgid "SECURITY BREACH ON DECK 5! CMDR TUVOK AND SECURITY TEAM REQUESTED."
 msgstr ""
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:24
-msgid "Your personal dictionary was erased."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:25
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:32
-msgid "Dictionary Erased"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:30
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:57
-msgid "Close this Window"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:48
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Now return to the "
-"&quot;SpellChecker options&quot; menu and make your selection again."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:51
-msgid "Successful Re-encryption"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:54
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Please close this "
-"window and click \"Check Spelling\" button again to start your spellcheck "
-"over."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod.php:59
-msgid "Dictionary re-encrypted"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:25
-msgid ""
-"Your personal dictionary has been <strong>encrypted</strong> and is now "
-"stored in an <strong>encrypted format</strong>."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:36
-msgid ""
-"Your personal dictionary has been <strong>decrypted</strong> and is now "
-"stored as <strong>clear text</strong>."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod.php:44
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:45
-msgid "Personal Dictionary Crypto Settings"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:121
-msgid "SquirrelSpell Results"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:170
-#, c-format
-msgid "Found %s errors"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:183
-msgid "Line with an error:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:192
-msgid "Error:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:200
-msgid "Suggestions:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:206
-msgid "Suggestions"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:214
-msgid "Change to:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:223
-msgid "Occurs times:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:239
-msgid "Change this word"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:240
-msgid "Change"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:242
-msgid "Change ALL occurances of this word"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:243
-msgid "Change All"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:245
-msgid "Ignore this word"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:246
-msgid "Ignore"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:248
-msgid "Ignore ALL occurances this word"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:249
-msgid "Ignore All"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:251
-msgid "Add this word to your personal dictionary"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:252
-msgid "Add to Dic"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:264
-msgid "Close and Commit"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:266
-msgid "The spellcheck is not finished. Really close and commit changes?"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:269
-msgid "Close and Cancel"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:271
-msgid "The spellcheck is not finished. Really close and discard changes?"
-msgstr ""
-
-#: squirrelmail/plugins/newmail/testsound.php:33
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:285
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:50
-msgid "Close"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:286
-msgid "No errors found"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:21
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:56
-msgid "Personal Dictionary"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:21
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:61
-msgid "No words in your personal dictionary."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:24
-msgid "Please check any words you wish to delete from your dictionary."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:35
-#, c-format
-msgid "%s dictionary"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:54
-msgid "Delete checked words"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod.php:65
-msgid "Edit your Personal Dictionary"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:22
-msgid ""
-"<p>Your personal dictionary is <strong>currently encrypted</strong>. This "
-"helps protect your privacy in case the web-mail system gets compromized and "
-"your personal dictionary ends up stolen. It is currently encrypted with the "
-"password you use to access your mailbox, making it hard for anyone to see "
-"what is stored in your personal dictionary.</p> <p><strong>ATTENTION:</"
-"strong> If you forget your password, your personal dictionary will become "
-"unaccessible, since it can no longer be decrypted. If you change your "
-"mailbox password, SquirrelSpell will recognize it and prompt you for your "
-"old password in order to re-encrypt the dictionary with a new key.</p>"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:26
-msgid ""
-"Please decrypt my personal dictionary and store it in a clear-text format."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:29
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:42
-msgid "Change crypto settings"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:35
-msgid ""
-"<p>Your personal dictionary is <strong>currently not encrypted</strong>. You "
-"may wish to encrypt your personal dictionary to protect your privacy in case "
-"the webmail system gets compromized and your personal dictionary file gets "
-"stolen. When encrypted, the file's contents look garbled and are hard to "
-"decrypt without knowing the correct key (which is your mailbox password).</"
-"p> <strong>ATTENTION:</strong> If you decide to encrypt your personal "
-"dictionary, you must remember that it gets &quot;hashed&quot; with your "
-"mailbox password. If you forget your mailbox password and the administrator "
-"changes it to a new value, your personal dictionary will become useless and "
-"will have to be created anew. However, if you or your system administrator "
-"change your mailbox password but you still have the old password at hand, "
-"you will be able to enter the old key to re-encrypt the dictionary with the "
-"new value.</p>"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod.php:39
-msgid ""
-"Please encrypt my personal dictionary and store it in an encrypted format."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:22
-#, c-format
-msgid "Deleting the following entries from <strong>%s</strong> dictionary:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:52
-msgid "All done!"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:53
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:51
-msgid "Personal Dictionary Updated"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/forget_me.mod.php:56
-msgid "No changes requested."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:25
-msgid "Please wait, communicating with the server..."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:32
-msgid ""
-"Please choose which dictionary you would like to use to spellcheck this "
-"message:"
-msgstr ""
-
-#: squirrelmail/plugins/calendar/calendar.php:112
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:44
-msgid "Go"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/init.mod.php:48
-msgid "SquirrelSpell Initiating"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:56
-#, c-format
-msgid ""
-"Settings adjusted to: <strong>%s</strong> with <strong>%s</strong> as "
-"default dictionary."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:61
-#, c-format
-msgid "Using <strong>%s</strong> dictionary (system default) for spellcheck."
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_change.mod.php:69
-msgid "International Dictionaries Preferences Updated"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:19
-msgid ""
-"Please check any available international dictionaries which you would like "
-"to use when spellchecking:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:26
-msgid "Make this dictionary my default selection:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:41
-msgid "Make these changes"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod.php:42
-msgid "Add International Dictionaries"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:18
-msgid "Please choose which options you wish to set up:"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:22
-msgid "Edit your personal dictionary"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:27
-msgid "Set up international dictionaries"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:35
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:39
-msgid "Encrypt or decrypt your personal dictionary"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:39
-msgid "not available"
-msgstr ""
-
-#: squirrelmail/plugins/squirrelspell/modules/options_main.mod.php:43
-msgid "SquirrelSpell Options Menu"
-msgstr ""
-
 #: squirrelmail/plugins/translate/options.php:97
 msgid "Translator"
 msgstr ""
@@ -2938,6 +2634,10 @@ msgstr ""
 msgid "Loading the sound..."
 msgstr ""
 
+#: squirrelmail/plugins/newmail/testsound.php:33
+msgid "Close"
+msgstr ""
+
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:82
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:90
 #: squirrelmail/plugins/mail_fetch/class.POP3.php:102
@@ -3401,6 +3101,10 @@ msgstr ""
 msgid "TODAY"
 msgstr ""
 
+#: squirrelmail/plugins/calendar/calendar.php:112
+msgid "Go"
+msgstr ""
+
 #: squirrelmail/plugins/calendar/day.php:79
 msgid "ADD"
 msgstr ""
@@ -3614,3 +3318,258 @@ msgstr ""
 #: squirrelmail/plugins/delete_move_next/setup.php:308
 msgid "display at bottom"
 msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:46
+msgid "Config File Version"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:50
+msgid "Organization Preferences"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:52
+msgid "Organization Name"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:55
+msgid "Organization Logo"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:58
+msgid "Organization Title"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:61
+msgid "Signout Page"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:64
+msgid "Default Language"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:68
+msgid "Top Frame"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:72
+msgid "Server Settings"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:74
+msgid "Mail Domain"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:77
+msgid "IMAP Server Address"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:80
+msgid "IMAP Server Port"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:82
+msgid "IMAP Server Type"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:84
+msgid "Cyrus IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:85
+msgid "University of Washington's IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:86
+msgid "Microsoft Exchange IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:87
+msgid "Courier IMAP server"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:88
+msgid "Not one of the above servers"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:89
+msgid "IMAP Folder Delimiter"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:91
+msgid "Use \"detect\" to auto-detect."
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:93
+msgid "Use Sendmail"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:95
+msgid "Sendmail Path"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:98
+msgid "SMTP Server Address"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:101
+msgid "SMTP Server Port"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:103
+msgid "Authenticated SMTP"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:105
+msgid "Invert Time"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:108
+msgid "Folders Defaults"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:110
+msgid "Default Folder Prefix"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:113
+msgid "Show Folder Prefix Option"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:124
+msgid "By default, move to trash"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:126
+msgid "By default, move to sent"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:128
+msgid "By default, save as draft"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:130
+msgid "List Special Folders First"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:132
+msgid "Show Special Folders Color"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:134
+msgid "Auto Expunge"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:136
+msgid "Default Sub. of INBOX"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:138
+msgid "Show 'Contain Sub.' Option"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:140
+msgid "Default Unseen Notify"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:142
+msgid "Default Unseen Type"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:144
+msgid "Auto Create Special Folders"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:146
+msgid "Default Javascript Adrressbook"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:149
+msgid "General Options"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:151
+msgid "Default Charset"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:162
+msgid "Data Directory"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:165
+msgid "Temp Directory"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:168
+msgid "Hash Level"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:170
+msgid "Hash Disabled"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:172
+msgid "Moderate"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:173
+msgid "Medium"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:175
+msgid "Default Left Size"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:178
+msgid "Usernames in Lowercase"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:180
+msgid "Allow use of priority"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:182
+msgid "Hide SM attributions"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:185
+#: squirrelmail/plugins/administrator/defines.php:187
+msgid "Message of the Day"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:191
+msgid "Themes"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/defines.php:193
+msgid "Style Sheet URL (css)"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:168
+msgid "Configuration Administrator"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:332
+msgid "Theme Name"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:333
+msgid "Theme Path"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:362
+msgid "Plugins"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/options.php:405
+msgid "Change Settings"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/setup.php:31
+msgid "Administration"
+msgstr ""
+
+#: squirrelmail/plugins/administrator/setup.php:33
+msgid ""
+"This module allows administrators to manage SquirrelMail main configuration "
+"remotely."
+msgstr ""
diff --git a/po/xgetpo b/po/xgetpo
index 3efa2947..71025f1f 100755
--- a/po/xgetpo
+++ b/po/xgetpo
@@ -38,5 +38,7 @@ xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/listcommands/*.php --output-dir=squirrelmail/po/
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/delete_move_next/*.php --output-dir=squirrelmail/po/
+xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
+    -C squirrelmail/plugins/administrator/*.php --output-dir=squirrelmail/po/
 
 cd squirrelmail/po
\ No newline at end of file
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 778c52e2..98cbe4ca 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -31,8 +31,9 @@ function addr_insert_hidden() {
            $identity;
 
    echo '<input type=hidden value="';
-   if (substr($body, 0, 1) == "\r")
+   if (substr($body, 0, 1) == "\r") {
        echo "\n";
+   }
    echo htmlspecialchars($body) . '" name=body>' . "\n" .
         '<input type=hidden value="' . htmlspecialchars($subject) .
         '" name=subject>' . "\n" .
@@ -78,11 +79,11 @@ function addr_display_result($res, $includesource = true) {
         if ($line % 2) { echo ' bgcolor="' . $color[0] . '"'; }
         echo ' nowrap><td nowrap align=center width="5%">' .
              '<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;To&nbsp;' .
+             htmlspecialchars($row['email']) . '">&nbsp;' . _("To") . '&nbsp;' .
              '<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;Cc&nbsp;' .
+             htmlspecialchars($row['email']) . '">&nbsp;' . _("Cc") . '&nbsp;' .
              '<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
-             htmlspecialchars($row['email']) . '">&nbsp;Bcc&nbsp;' . 
+             htmlspecialchars($row['email']) . '">&nbsp;' . _("Bcc") . '&nbsp;' . 
              '</td><td nowrap>&nbsp;' . $row['name'] . '&nbsp;</td>' .
              '<td nowrap>&nbsp;' . $row['email'] . '&nbsp;</td>' .
              '<td nowrap>&nbsp;' . $row['label'] . '&nbsp;</td>';
@@ -224,4 +225,4 @@ if ($addrquery == '' || sizeof($res) == 0) {
 }
 
 ?>
-</body></html>
+</body></html>
\ No newline at end of file
-- 
2.25.1