diff po/es.po @ 11274:67a929d50cfe

[gaim-migrate @ 13459] commit the make dist changes to po files, as otherwise it takes 15 minutes to process them (and a minute amount of time after the first attempt) committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 15 Aug 2005 16:22:25 +0000
parents e099f00b2f93
children 4be6232ffcd3
line wrap: on
line diff
--- a/po/es.po	Mon Aug 15 16:18:00 2005 +0000
+++ b/po/es.po	Mon Aug 15 16:22:25 2005 +0000
@@ -44,7 +44,7 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 18:38-0500\n"
+"POT-Creation-Date: 2005-08-15 12:01-0400\n"
 "PO-Revision-Date: 2004-08-23 16:58+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
@@ -53,19 +53,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/autorecon.c:276
+#: plugins/autorecon.c:291
 msgid "Error Message Suppression"
 msgstr "Supresión de mensajes de error"
 
-#: plugins/autorecon.c:280
+#: plugins/autorecon.c:295
 msgid "Hide Disconnect Errors"
 msgstr "Ocultar errores de desconexión"
 
-#: plugins/autorecon.c:284
+#: plugins/autorecon.c:299
 msgid "Hide Login Errors"
 msgstr "Ocultar errores de conexión"
 
-#: plugins/autorecon.c:288
+#: plugins/autorecon.c:303
 #, fuzzy
 msgid "Hide Reconnecting Dialog"
 msgstr "Ocultar errores de desconexión"
@@ -76,7 +76,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:312
+#: plugins/autorecon.c:327
 msgid "Auto-Reconnect"
 msgstr "Reconexión automática"
 
@@ -84,27 +84,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:315 plugins/autorecon.c:317
+#: plugins/autorecon.c:330 plugins/autorecon.c:332
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Cuando por alguna razón Ud. se le expulsa, esto lo vuelve a conectar."
 
-#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
-msgid "Mail Server"
-msgstr "Servidor de correo"
-
-#: plugins/chkmail.c:136
-#, c-format
-msgid "%s (%d new/%d total)"
-msgstr "%s (%d nuevos/%d en total)"
-
-#: plugins/chkmail.c:199
-msgid "Check Mail"
-msgstr "Comprobar correo"
-
-#: plugins/chkmail.c:203
-msgid "Check email every X seconds.\n"
-msgstr "Comprobar correo cada X segundos.\n"
-
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Valores a utilizar cuando..."
@@ -127,12 +110,13 @@
 
 #. Explanation
 #: plugins/contact_priority.c:141
+#, fuzzy
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4,away = 2, and idle = 1)\n"
-"will use what used to be the built-in order active->idle->away->away+idle-"
-">offline."
+"The default values (offline = 4, away = 2, and idle = 1) will use what used "
+"to be\n"
+"the built-in order: active, idle, away, away + idle, offline."
 msgstr ""
 "El amigo con la puntuación más baja es el que tendrá prioridad dentro del "
 "contacto.\n"
@@ -142,7 +126,8 @@
 "disponible->no disponible e inactivo->desconectado."
 
 #: plugins/contact_priority.c:144
-msgid "Point values to use for Account..."
+#, fuzzy
+msgid "Point values to use for account..."
 msgstr "Valores para utilizar para la cuenta..."
 
 #. *< type
@@ -189,68 +174,60 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Ausente"
 
-#: plugins/docklet/docklet.c:140
-msgid "Auto-login"
-msgstr "Conectarse automáticamente"
-
-#: plugins/docklet/docklet.c:143
+#: plugins/docklet/docklet.c:136
 msgid "New Message..."
 msgstr "Mensaje nuevo..."
 
-#: plugins/docklet/docklet.c:144
+#: plugins/docklet/docklet.c:137
 msgid "Join A Chat..."
 msgstr "Unirse a un chat..."
 
-#: plugins/docklet/docklet.c:181
+#: plugins/docklet/docklet.c:172
 msgid "New..."
 msgstr "Nuevo..."
 
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1760 src/protocols/gg/gg.c:52
-#: src/protocols/irc/irc.c:169 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:987
-#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811
-#: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
-#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5592
-#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6883
-#: src/protocols/silc/buddy.c:1384 src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:3167 src/protocols/zephyr/zephyr.c:2225
+#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
+#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
+#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
+#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
+#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
+#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
+#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
+#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
+#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
 msgid "Away"
 msgstr "Ausente"
 
-#: plugins/docklet/docklet.c:197
+#: plugins/docklet/docklet.c:184
 msgid "Back"
 msgstr "Volver atrás"
 
-#: plugins/docklet/docklet.c:206
+#: plugins/docklet/docklet.c:191
 msgid "Mute Sounds"
 msgstr "Sin sonido"
 
-#: plugins/docklet/docklet.c:213 src/gtkft.c:628
+#: plugins/docklet/docklet.c:198 src/gtkft.c:694
 msgid "File Transfers"
 msgstr "Transferencia de ficheros"
 
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2345
+#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2263
+#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: plugins/docklet/docklet.c:224
-#, fuzzy
-msgid "Log Out"
-msgstr "Desconectado"
-
-#: plugins/docklet/docklet.c:228
+#: plugins/docklet/docklet.c:204
 msgid "Quit"
 msgstr "Salir"
 
-#: plugins/docklet/docklet.c:553
+#: plugins/docklet/docklet.c:529
 msgid "Tray Icon Configuration"
 msgstr "Configuración del icono de la barra del sistema"
 
-#: plugins/docklet/docklet.c:557
+#: plugins/docklet/docklet.c:533
 msgid "_Hide new messages until tray icon is clicked"
 msgstr ""
 "_Ocultar mensajes nuevos hasta que se pulsa en el icono de la barra del "
@@ -267,19 +244,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:583
+#: plugins/docklet/docklet.c:559
 msgid "System Tray Icon"
 msgstr "Icono de la barra del sistema"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:586
+#: plugins/docklet/docklet.c:562
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Muestra un icono para Gaim en la barra del sistema."
 
 #. *  description
-#: plugins/docklet/docklet.c:588
+#: plugins/docklet/docklet.c:564
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -340,7 +317,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:249
+#: plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Control de ficheros de Gaim"
 
@@ -348,7 +325,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:252 plugins/filectl.c:254
+#: plugins/filectl.c:248 plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Permite controlar Gaim introduciendo órdenes en un archivo."
 
@@ -368,7 +345,7 @@
 msgid "Invalid AIM URI"
 msgstr "URI de AIM inválido"
 
-#: plugins/gaim-remote/remote.c:742
+#: plugins/gaim-remote/remote.c:750
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -377,7 +354,7 @@
 "No se pudo asignar %s a un socket\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:765
+#: plugins/gaim-remote/remote.c:774
 msgid "Unable to open socket"
 msgstr "No se pudo abrir el socket"
 
@@ -387,19 +364,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:815
+#: plugins/gaim-remote/remote.c:824
 msgid "Remote Control"
 msgstr "Control remoto"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:818
+#: plugins/gaim-remote/remote.c:827
 msgid "Provides remote control for gaim applications."
 msgstr "Permite el control remoto de las aplicaciones de Gaim."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:820
+#: plugins/gaim-remote/remote.c:829
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -438,21 +415,102 @@
 "- Envía un mensaje a las personas en su lista inmediatamente cuando se "
 "conectan"
 
+#: plugins/gaimrc.c:40
+msgid "Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:41
+msgid "Secondary Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:42
+#, fuzzy
+msgid "Hyperlink Color"
+msgstr "Color de hiperenlace"
+
+#: plugins/gaimrc.c:53
+#, fuzzy
+msgid "GtkTreeView Expander Size"
+msgstr "Tamaño del expansor"
+
+#: plugins/gaimrc.c:72
+#, fuzzy
+msgid "Conversation Entry"
+msgstr "Conversaciones"
+
+#: plugins/gaimrc.c:73
+#, fuzzy
+msgid "Conversation History"
+msgstr "Conversaciones"
+
+#: plugins/gaimrc.c:74
+#, fuzzy
+msgid "Log Viewer"
+msgstr "Servidor de conexión"
+
+#: plugins/gaimrc.c:75
+#, fuzzy
+msgid "Request Dialog"
+msgstr "Solicitud ambigua"
+
+#: plugins/gaimrc.c:76
+#, fuzzy
+msgid "Notify Dialog"
+msgstr "Notificar de"
+
+#: plugins/gaimrc.c:209
+#, fuzzy, c-format
+msgid "Select Color for %s"
+msgstr "Seleccionar el color del texto"
+
+#: plugins/gaimrc.c:211
+#, fuzzy
+msgid "Select Color"
+msgstr "Seleccionar el color del texto"
+
+#: plugins/gaimrc.c:246
+#, fuzzy, c-format
+msgid "Select Font for %s"
+msgstr "Seleccionar tipografía"
+
+#: plugins/gaimrc.c:284
+#, fuzzy
+msgid "Select Interface Font"
+msgstr "Seleccionar tipografía"
+
+#: plugins/gaimrc.c:343
+#, fuzzy
+msgid "GTK+ Interface Font"
+msgstr "Opciones de la interfaz"
+
+#: plugins/gaimrc.c:362
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: plugins/gaimrc.c:460
+#, fuzzy
+msgid "Gaim GTK+ Theme Control"
+msgstr "Control de ficheros de Gaim"
+
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
 #. Configuration frame
-#: plugins/gestures/gestures.c:221
+#: plugins/gestures/gestures.c:241
 msgid "Mouse Gestures Configuration"
 msgstr "Configuración de los gestos con el ratón"
 
-#: plugins/gestures/gestures.c:228
+#: plugins/gestures/gestures.c:248
 msgid "Middle mouse button"
 msgstr "Botón central del ratón"
 
-#: plugins/gestures/gestures.c:233
+#: plugins/gestures/gestures.c:253
 msgid "Right mouse button"
 msgstr "Botón derecho del ratón"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:245
+#: plugins/gestures/gestures.c:265
 msgid "_Visual gesture display"
 msgstr "Mostrar gestos _visuales"
 
@@ -462,19 +520,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:274
+#: plugins/gestures/gestures.c:294
 msgid "Mouse Gestures"
 msgstr "Gestos con el ratón"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:277
+#: plugins/gestures/gestures.c:297
 msgid "Provides support for mouse gestures"
 msgstr "Proporciona soporte para gestos con el ratón"
 
 #. *  description
-#: plugins/gestures/gestures.c:279
+#: plugins/gestures/gestures.c:299
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -492,9 +550,9 @@
 "Arriba y después a la derecha para cambiar a la siguiente conversación."
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2080
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:606
-#: src/protocols/msn/msn.c:1501 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
+#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Nombre"
 
@@ -503,32 +561,32 @@
 msgstr "Mensajería Instantáneos"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:455
+#: plugins/gevolution/add_buddy_dialog.c:459
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccione una persona de su agenda mostrada abajo, o añada una nueva "
 "persona."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7189
+#: plugins/gevolution/add_buddy_dialog.c:472
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
 msgid "Search"
 msgstr "Buscar"
 
-#: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4053
-#: src/gtkblist.c:4402
+#: plugins/gevolution/add_buddy_dialog.c:553
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
+#: src/gtkblist.c:4777
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:575
+#: plugins/gevolution/add_buddy_dialog.c:579
 #: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "Nueva persona"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/add_buddy_dialog.c:596
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"
 
@@ -555,29 +613,47 @@
 msgid "_Associate Buddy"
 msgstr "_Asociar amigo"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:775 src/blist.c:982 src/blist.c:1933 src/gtkblist.c:3873
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Amigos"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
+#, fuzzy
+msgid "Unable to send e-mail"
+msgstr "No se pudo enviar el mensaje."
+
+#: plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Añadir a la agenda"
 
+#: plugins/gevolution/gevolution.c:290
+#, fuzzy
+msgid "Send E-Mail"
+msgstr "Correo electrónico"
+
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:344
+#: plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Configuración de la integración con Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccione todas las cuentas a los que los amigos se añadirán de forma "
 "automática."
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:626
+#: plugins/gevolution/gevolution.c:447 plugins/idle.c:52 src/gtkconn.c:431
 msgid "Account"
 msgstr "Cuenta"
 
@@ -587,7 +663,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:460
+#: plugins/gevolution/gevolution.c:530
 msgid "Evolution Integration"
 msgstr "Integración con Evolution"
 
@@ -595,67 +671,82 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
-msgid "Provides integration with Ximian Evolution."
+#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#, fuzzy
+msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution de Ximian"
 
-#: plugins/gevolution/new_person_dialog.c:264
+#: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Introduzca la información de la persona a continuación."
 
-#: plugins/gevolution/new_person_dialog.c:268
+#: plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 "Introduzca el nombre de usuario de su amigo y el tipo de cuenta más abajo."
 
-#: plugins/gevolution/new_person_dialog.c:288
+#: plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo de cuenta:"
 
-#: plugins/gevolution/new_person_dialog.c:292
+#: plugins/gevolution/new_person_dialog.c:294
 msgid "Screenname:"
 msgstr "Nombre de usuario:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:312
+#: plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Información opcional"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:583
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
+#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
-#: plugins/gevolution/new_person_dialog.c:347
+#: plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "Nombre:"
 
-#: plugins/gevolution/new_person_dialog.c:359
+#: plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Apellidos:"
 
-#: plugins/gevolution/new_person_dialog.c:379
+#: plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "Correo electrónico:"
 
-#: plugins/history.c:92
+#: plugins/history.c:137
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+#: plugins/history.c:138
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+#: plugins/history.c:177
 msgid "History"
 msgstr "Histórico"
 
-#: plugins/history.c:94
+#: plugins/history.c:179
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."
 
-#: plugins/history.c:95
+#: plugins/history.c:180
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"Cuando se abre una nueva conversación este complemento introduce la última "
-"conversación en la conversación actual."
+"conversation into the current conversation.\n"
+"\n"
+"The history plugin requires logging be enabled. Logging can be enabled from "
+"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
+"chats will activate history for the same conversation type(s)."
+msgstr ""
 
 # Nota: ni «iconizar» ni «iconificar» están en el diccionario... jfs
 #. *< type
@@ -681,7 +772,7 @@
 msgid "Minutes"
 msgstr "minutos"
 
-#: plugins/idle.c:63 plugins/idle.c:98
+#: plugins/idle.c:63 plugins/idle.c:97
 msgid "I'dle Mak'er"
 msgstr "Generador de ausencia"
 
@@ -697,7 +788,7 @@
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: plugins/idle.c:100 plugins/idle.c:101
+#: plugins/idle.c:99 plugins/idle.c:100
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Permite alterar cuánto tiempo se ha estado ausente"
 
@@ -766,68 +857,74 @@
 "correo."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:599
+#: plugins/notify.c:642
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: plugins/notify.c:603
+#: plugins/notify.c:646
 msgid "_IM windows"
 msgstr "Ventanas de M_I"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:653
 msgid "C_hat windows"
 msgstr "Ventanas de _chat"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:660
 msgid "_Focused windows"
 msgstr "Ventanas _enfocadas"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:625
+#: plugins/notify.c:668
 msgid "Notification Methods"
 msgstr "Métodos de notificación"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:675
 msgid "Prepend _string into window title:"
 msgstr "Prefijar la _cadena en el título de la ventana:"
 
 #. Count method button
-#: plugins/notify.c:651
+#: plugins/notify.c:694
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar el _número de mensajes nuevos en el título de la ventana"
 
 #. Urgent method button
-#: plugins/notify.c:659
+#: plugins/notify.c:702
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista «_URGENTE» del gestor de ventanas"
 
+#. Raise window method button
+#: plugins/notify.c:710
+#, fuzzy
+msgid "R_aise conversation window"
+msgstr "Ventanas de conversación de MI"
+
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:667
+#: plugins/notify.c:718
 msgid "Notification Removal"
 msgstr "Eliminación de la notificación"
 
 #. Remove on focus button
-#: plugins/notify.c:672
+#: plugins/notify.c:723
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cuando la ventana de la conversación obtiene el _foco"
 
 #. Remove on click button
-#: plugins/notify.c:679
+#: plugins/notify.c:730
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversación _recibe una pulsación"
 
 #. Remove on type button
-#: plugins/notify.c:687
+#: plugins/notify.c:738
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _escriba en la ventana de la conversación"
 
 #. Remove on message send button
-#: plugins/notify.c:695
+#: plugins/notify.c:746
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cuando se envíe un _mensaje"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:704
+#: plugins/notify.c:755
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar al cambiar de _solapa de conversación"
 
@@ -837,7 +934,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:794
+#: plugins/notify.c:845
 msgid "Message Notification"
 msgstr "Notificación de mensajes"
 
@@ -845,7 +942,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:797 plugins/notify.c:799
+#: plugins/notify.c:848 plugins/notify.c:850
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -856,26 +953,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:535
+#: plugins/perl/perl.c:567
 msgid "Perl Plugin Loader"
 msgstr "Cargador de complementos Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
+#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
 msgid "Provides support for loading perl plugins."
 msgstr "Provee soporte para cargar complementos en perl."
 
-#: plugins/raw.c:149
+#: plugins/raw.c:151
 msgid "Raw"
 msgstr "En bruto"
 
-#: plugins/raw.c:151
+#: plugins/raw.c:153
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Le permite enviar datos en bruto a protocolos basados en texto."
 
-#: plugins/raw.c:152
+#: plugins/raw.c:154
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -944,7 +1041,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:585
+#: plugins/signals-test.c:626
 msgid "Signals Test"
 msgstr "Prueba de señales"
 
@@ -952,7 +1049,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:588 plugins/signals-test.c:590
+#: plugins/signals-test.c:629 plugins/signals-test.c:631
 msgid "Test to see that all signals are working properly."
 msgstr "Probar para ver si todas las señales funcionan correctamente."
 
@@ -974,35 +1071,43 @@
 msgid "Tests to see that most things are working."
 msgstr "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
 
-#: plugins/spellchk.c:415
+#: plugins/spellchk.c:1680
+msgid "Duplicate Correction"
+msgstr ""
+
+#: plugins/spellchk.c:1681
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+#: plugins/spellchk.c:1826
 msgid "Text Replacements"
 msgstr "Reemplazos de texto"
 
-#: plugins/spellchk.c:439
+#: plugins/spellchk.c:1850
 msgid "You type"
 msgstr "Usted escribe"
 
-#: plugins/spellchk.c:451
+#: plugins/spellchk.c:1862
 msgid "You send"
 msgstr "Usted envía"
 
-#: plugins/spellchk.c:477
+#: plugins/spellchk.c:1888
 msgid "Add a new text replacement"
 msgstr "Añadir una regla nueva de reemplazo de texto"
 
-#: plugins/spellchk.c:484
+#: plugins/spellchk.c:1895
 msgid "You _type:"
 msgstr "Usted _escribe:"
 
-#: plugins/spellchk.c:498
+#: plugins/spellchk.c:1909
 msgid "You _send:"
 msgstr "Usted _envía:"
 
-#: plugins/spellchk.c:540
+#: plugins/spellchk.c:1951
 msgid "Text replacement"
 msgstr "Reemplazo de texto"
 
-#: plugins/spellchk.c:542 plugins/spellchk.c:543
+#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Reemplaza el texto de los mensajes salientes según las reglas definidas por "
@@ -1014,7 +1119,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:226
+#: plugins/ssl/ssl-gnutls.c:227
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1022,7 +1127,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
+#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "Proporciona soporte SSL a través de GNUTLS"
 
@@ -1032,7 +1137,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:318
+#: plugins/ssl/ssl-nss.c:319
 msgid "NSS"
 msgstr "NSS"
 
@@ -1040,7 +1145,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
+#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Proporciona soporte SSL a través del NSS de Mozilla"
 
@@ -1143,19 +1248,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versión horizontal deslizante de la lista de amigos."
 
-#: plugins/timestamp.c:183
+#: plugins/timestamp.c:202
 msgid "iChat Timestamp"
 msgstr "Sello temporal al estilo iChat"
 
-#: plugins/timestamp.c:190
+#: plugins/timestamp.c:209
 msgid "Delay"
 msgstr "Retardo"
 
-#: plugins/timestamp.c:197
+#: plugins/timestamp.c:216
 msgid "minutes."
 msgstr "minutos."
 
-#: plugins/timestamp.c:203
+#: plugins/timestamp.c:222
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -1165,7 +1270,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:268
+#: plugins/timestamp.c:287
 msgid "Timestamp"
 msgstr "Marca temporal"
 
@@ -1173,37 +1278,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:271 plugins/timestamp.c:273
+#: plugins/timestamp.c:290 plugins/timestamp.c:292
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 "Añade una marca de tiempo al estilo iChat en las conversaciones cada N "
 "minutos."
 
 #: plugins/win32/transparency/win2ktrans.c:134
-#: plugins/win32/transparency/win2ktrans.c:404
-#: plugins/win32/transparency/win2ktrans.c:435
+#: plugins/win32/transparency/win2ktrans.c:413
+#: plugins/win32/transparency/win2ktrans.c:444
 msgid "Opacity:"
 msgstr "Opacidad:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:385
+#: plugins/win32/transparency/win2ktrans.c:394
 msgid "IM Conversation Windows"
 msgstr "Ventanas de conversación de MI"
 
-#: plugins/win32/transparency/win2ktrans.c:386
+#: plugins/win32/transparency/win2ktrans.c:395
 msgid "_IM window transparency"
 msgstr "Transparencia de las ventanas de M_I"
 
-#: plugins/win32/transparency/win2ktrans.c:396
+#: plugins/win32/transparency/win2ktrans.c:405
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante en la ventana MI"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:421
+#: plugins/win32/transparency/win2ktrans.c:430
 msgid "Buddy List Window"
 msgstr "Ventana de la lista de amigos"
 
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:431
 msgid "_Buddy List window transparency"
 msgstr "Transparencia de la ventana de lista de _amigos"
 
@@ -1213,19 +1318,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:480
+#: plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:483
+#: plugins/win32/transparency/win2ktrans.c:492
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para la lista de amigos y las conversaciones."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:485
+#: plugins/win32/transparency/win2ktrans.c:494
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1237,153 +1342,210 @@
 "\n"
 "* Nota: Este complemento requiere Win2000 o WinXP."
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:401
 msgid "GTK+ Runtime Version"
 msgstr "Versión en ejecución de GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:409
 msgid "Startup"
 msgstr "Inicio"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:410
 msgid "_Start Gaim on Windows startup"
 msgstr "_Iniciar Gaim al iniciar Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3145
-#: src/gtkprefs.c:2178
+#: plugins/win32/winprefs/winprefs.c:421 src/gtkblist.c:3514
+#: src/gtkprefs.c:2099
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:422
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable"
 
-#. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:367
-msgid "Docked _Buddy List is always on top"
-msgstr "La lista de _amigos apilada está siempre encima del resto"
-
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:377
-msgid "_Keep Buddy List window on top"
+#: plugins/win32/winprefs/winprefs.c:426
+#, fuzzy
+msgid "_Keep Buddy List window on top:"
 msgstr "_Mantener la ventana de amigos por encima del resto"
 
+#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
+msgid "Never"
+msgstr "Nunca"
+
+#: plugins/win32/winprefs/winprefs.c:429
+#, fuzzy
+msgid "Always"
+msgstr "Ausente"
+
+#. XXX: Did this ever work?
+#: plugins/win32/winprefs/winprefs.c:431
+msgid "Only when docked"
+msgstr ""
+
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:910
-#: src/gtkprefs.c:2179 src/protocols/msn/msn.c:1838
+#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
+#: src/gtkprefs.c:2100
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: plugins/win32/winprefs/winprefs.c:383
-msgid "_Flash Window when messages are received"
+#: plugins/win32/winprefs/winprefs.c:436
+#, fuzzy
+msgid "_Flash window when messages are received"
 msgstr "_Destello de ventana cuando se reciben mensajes"
 
-#: plugins/win32/winprefs/winprefs.c:407
+#: plugins/win32/winprefs/winprefs.c:459
 msgid "WinGaim Options"
 msgstr "Opciones de WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:461
 msgid "Options specific to Windows Gaim."
 msgstr "Opciones específicas de Gaim para Windows."
 
-#: src/account.c:294 src/protocols/jabber/jabber.c:1043
-msgid "New passwords do not match."
-msgstr "Las nuevas contraseñas no coinciden"
-
-#: src/account.c:303
-msgid "Fill out all fields completely."
-msgstr "Rellene todos los campos completamente."
-
-#: src/account.c:328
-msgid "Original password"
-msgstr "Contraseña original"
-
-#: src/account.c:335
-msgid "New password"
+#: plugins/win32/winprefs/winprefs.c:462
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr ""
+
+#: src/account.c:773
+#, fuzzy
+msgid "accounts"
+msgstr "Cuentas"
+
+#: src/account.c:913
+#, fuzzy
+msgid "Password is required to sign on."
+msgstr "La contraseña ha expirado"
+
+#: src/account.c:939
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Introduzca la contraseña para %s (%s)"
+
+#: src/account.c:946
+#, fuzzy
+msgid "Enter Password"
+msgstr "Cambiar contraseña"
+
+#: src/account.c:951
+#, fuzzy
+msgid "Save password"
 msgstr "Nueva contraseña"
 
-#: src/account.c:342
-msgid "New password (again)"
-msgstr "Nueva contraseña (otra vez)"
-
-#: src/account.c:348
-#, c-format
-msgid "Change password for %s"
-msgstr "Cambiar la contraseña de %s:"
-
-#: src/account.c:356
-msgid "Please enter your current password and your new password."
-msgstr "Introduzca su contraseña actual y la contraseña nueva."
-
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:359 src/connection.c:188 src/gtkblist.c:2419
-#: src/gtkdialogs.c:375 src/gtkdialogs.c:518 src/gtkdialogs.c:574
-#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1090
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
-#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
-#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3533
-#: src/protocols/oscar/oscar.c:3627 src/protocols/oscar/oscar.c:6976
-#: src/protocols/oscar/oscar.c:7068 src/protocols/oscar/oscar.c:7120
-#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2892 src/protocols/yahoo/yahoo.c:2901
-#: src/request.h:1244
+#: src/account.c:959 src/account.c:1111 src/gtkdialogs.c:504
+#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
+#: src/protocols/jabber/jabber.c:1103 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:3774
+#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
+#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
+#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:422
+#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1700
+#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/account.c:360 src/account.c:398 src/connection.c:189
-#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2420
-#: src/gtkblist.c:4440 src/gtkconn.c:171 src/gtkdialogs.c:376
-#: src/gtkdialogs.c:519 src/gtkdialogs.c:575 src/gtkdialogs.c:673
-#: src/gtkdialogs.c:695 src/gtkdialogs.c:715 src/gtkdialogs.c:751
-#: src/gtkdialogs.c:813 src/gtkdialogs.c:855 src/gtkdialogs.c:893
-#: src/gtkimhtmltoolbar.c:440 src/gtkprivacy.c:588 src/gtkprivacy.c:601
-#: src/gtkprivacy.c:626 src/gtkprivacy.c:637 src/gtkrequest.c:260
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:772
-#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:1091
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:244 src/protocols/msn/msn.c:259
-#: src/protocols/msn/msn.c:274 src/protocols/msn/msn.c:291
-#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3491
-#: src/protocols/oscar/oscar.c:3534 src/protocols/oscar/oscar.c:3571
-#: src/protocols/oscar/oscar.c:3628 src/protocols/oscar/oscar.c:6977
-#: src/protocols/oscar/oscar.c:7069 src/protocols/oscar/oscar.c:7121
-#: src/protocols/oscar/oscar.c:7190 src/protocols/silc/buddy.c:461
+#: src/account.c:960 src/account.c:1112 src/account.c:1150
+#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
+#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
+#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
+#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
+#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
+#: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
+#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
+#: src/protocols/oscar/oscar.c:1594 src/protocols/oscar/oscar.c:2477
+#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
+#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
+#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:718
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2893
-#: src/protocols/yahoo/yahoo.c:2902 src/request.h:1244 src/request.h:1254
+#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
+#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/account.c:389
+#: src/account.c:982 src/connection.c:96
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Falta el complemento de protocolo para %s"
+
+#: src/account.c:984 src/connection.c:99
+msgid "Connection Error"
+msgstr "Error de conexión"
+
+#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
+msgid "New passwords do not match."
+msgstr "Las nuevas contraseñas no coinciden"
+
+#: src/account.c:1055
+msgid "Fill out all fields completely."
+msgstr "Rellene todos los campos completamente."
+
+#: src/account.c:1080
+msgid "Original password"
+msgstr "Contraseña original"
+
+#: src/account.c:1087
+msgid "New password"
+msgstr "Nueva contraseña"
+
+#: src/account.c:1094
+msgid "New password (again)"
+msgstr "Nueva contraseña (otra vez)"
+
+#: src/account.c:1100
+#, c-format
+msgid "Change password for %s"
+msgstr "Cambiar la contraseña de %s:"
+
+#: src/account.c:1108
+msgid "Please enter your current password and your new password."
+msgstr "Introduzca su contraseña actual y la contraseña nueva."
+
+#: src/account.c:1141
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la información del usuario %s"
 
-#: src/account.c:397 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
-#: src/protocols/trepia/trepia.c:347
+#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
+#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Guardar"
 
-#: src/account.c:802 src/gtkft.c:158 src/protocols/jabber/buddy.c:621
-#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081
-#: src/protocols/novell/novell.c:2823
+#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
+#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
+#: src/protocols/novell/novell.c:2825
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/blist.c:681
+#: src/blist.c:545
+#, fuzzy
+msgid "buddy list"
+msgstr "Lista de amigos"
+
+#: src/blist.c:1145
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1352
+#: src/blist.c:1835
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1398,125 +1560,94 @@
 "%d amigos del grupo %s no se han eliminado porque no sus cuentas estaban "
 "conectadas. Esos amigos y sus grupos no han sido eliminados.\n"
 
-#: src/blist.c:1361
+#: src/blist.c:1844
 msgid "Group not removed"
 msgstr "Grupo no eliminado"
 
-#: src/blist.c:2064
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has moved to blist.xml~."
-msgstr ""
-"Se ha encontrado un error al interpretar la lista de amigos. No se ha "
-"cargado y el fichero antiguo ha sido movido a blist.xml~."
-
-#: src/blist.c:2067
-msgid "Buddy List Error"
-msgstr "Error en la lista de amigos"
-
-#: src/connection.c:112 src/connection.c:161
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Falta el complemento de protocolo para %s"
-
-#: src/connection.c:116
+#: src/connection.c:98
 msgid "Registration Error"
 msgstr "Error de registro"
 
-#: src/connection.c:165
-msgid "Connection Error"
-msgstr "Error de conexión"
-
-#: src/connection.c:185
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Introduzca la contraseña para %s (%s)"
-
-#: src/conversation.c:236
+#: src/conversation.c:237
 #, fuzzy
 msgid "Unable to send message: The message is too large."
 msgstr "No se pudo enviar el mensaje. Es demasiado grande."
 
-#: src/conversation.c:239
+#: src/conversation.c:240 src/conversation.c:253
 #, fuzzy, c-format
 msgid "Unable to send message to %s."
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: src/conversation.c:240
+#: src/conversation.c:241
 #, fuzzy
 msgid "The message is too large."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: src/conversation.c:249
+#: src/conversation.c:250
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
-#: src/conversation.c:252
-#, fuzzy, c-format
-msgid "Unable to send messge to %s."
-msgstr "No se pudo enviar el mensaje a %s:"
-
-#: src/conversation.c:2005
+#: src/conversation.c:1962
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: src/conversation.c:2008
+#: src/conversation.c:1965
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: src/conversation.c:2104
+#: src/conversation.c:2062
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"
 
-#: src/conversation.c:2107
+#: src/conversation.c:2065
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: src/conversation.c:2148
+#: src/conversation.c:2107
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#: src/conversation.c:2150
+#: src/conversation.c:2109
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: src/conversation.c:2219
+#: src/conversation.c:2186
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d más)"
 
-#: src/conversation.c:2221
+#: src/conversation.c:2188
 #, c-format
 msgid " left the room (%s)."
 msgstr " salió de la sala (%s)."
 
-#: src/conversation.c:2626
+#: src/conversation.c:2596
 msgid "Last created window"
 msgstr "Última ventana creada"
 
-#: src/conversation.c:2628
+#: src/conversation.c:2598
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: src/conversation.c:2630 src/gtkprefs.c:1287
+#: src/conversation.c:2600 src/gtkprefs.c:1279
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: src/conversation.c:2632
+#: src/conversation.c:2602
 msgid "By group"
 msgstr "Por grupo"
 
-#: src/conversation.c:2634
+#: src/conversation.c:2604
 msgid "By account"
 msgstr "Por cuenta"
 
-#: src/ft.c:148 src/protocols/msn/msn.c:370
+#: src/ft.c:150 src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1525,7 +1656,7 @@
 "Error al leer %s: \n"
 "%s.\n"
 
-#: src/ft.c:152
+#: src/ft.c:154
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1534,7 +1665,7 @@
 "Error al escribir %s: \n"
 "%s.\n"
 
-#: src/ft.c:156
+#: src/ft.c:158
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1543,30 +1674,35 @@
 "Error al acceder a %s: \n"
 "%s.\n"
 
-#: src/ft.c:188
+#: src/ft.c:191
 msgid "Cannot send a file of 0 bytes."
 msgstr "No se puede enviar un archivo de 0 bytes."
 
-#: src/ft.c:198
+#: src/ft.c:201
 msgid "Cannot send a directory."
 msgstr "No se puede enviar un directorio."
 
-#: src/ft.c:205
+#: src/ft.c:210
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un fichero normal. No se sobreescribirá.\n"
 
-#: src/ft.c:260
+#: src/ft.c:268
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"
 
-#: src/ft.c:302
+#: src/ft.c:275
+#, fuzzy, c-format
+msgid "%s wants to send you a file"
+msgstr "%s quiere enviarle %s (%s)"
+
+#: src/ft.c:316
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "¿Aceptar solicitud de transferencia de fichero de %s?"
 
-#: src/ft.c:306
+#: src/ft.c:320
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1577,39 +1713,64 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: src/ft.c:359
+#: src/ft.c:344
+#, fuzzy, c-format
+msgid "%s is offering to send file %s"
+msgstr "No se pudo enviar el mensaje a %s:"
+
+#: src/ft.c:384
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no es un nombre de fichero válido.\n"
 
-#: src/ft.c:377
+#: src/ft.c:405
 #, fuzzy, c-format
 msgid "Offering to send %s to %s"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: src/ft.c:870
+#: src/ft.c:416
+#, fuzzy, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Guardando la Información de Directorio de %s:"
+
+#: src/ft.c:570
 #, fuzzy, c-format
-msgid "Transfer of %s complete"
+msgid "Transfer of file %s complete"
 msgstr "Transferencia de fichero a %s abortada.\n"
 
-#: src/ft.c:918
+#: src/ft.c:573
+#, fuzzy
+msgid "File transfer complete"
+msgstr "Servidor de transferencia de ficheros"
+
+#: src/ft.c:957
 #, fuzzy, c-format
 msgid "You canceled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"
 
-#: src/ft.c:970
+#: src/ft.c:962
+#, fuzzy
+msgid "File transfer cancelled"
+msgstr "Ya se ha iniciado la transferencia de ficheros"
+
+#: src/ft.c:1019
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"
 
-#: src/ft.c:1020
-#, c-format
-msgid "File transfer to %s aborted.\n"
+#: src/ft.c:1024
+#, fuzzy, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s canceló la transferencia de %s"
+
+#: src/ft.c:1081
+#, fuzzy, c-format
+msgid "File transfer to %s failed."
 msgstr "Transferencia de fichero a %s abortada.\n"
 
-#: src/ft.c:1022
-#, c-format
-msgid "File transfer from %s aborted.\n"
+#: src/ft.c:1083
+#, fuzzy, c-format
+msgid "File transfer from %s failed."
 msgstr "Transferencia de fichero de %s abortada.\n"
 
 #: src/gaim-remote.c:104
@@ -1618,11 +1779,12 @@
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
+"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       send                     Send message\n"
+"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1646,7 +1808,7 @@
 "    OPCIONES:\n"
 "       -h, --help [orden]       Mostrar ayuda para la orden\n"
 
-#: src/gaim-remote.c:193
+#: src/gaim-remote.c:195
 #, fuzzy, c-format
 msgid ""
 "Gaim not running (on session %d)\n"
@@ -1656,13 +1818,13 @@
 "¿Está instalado el complemento de «Control remoto»?\n"
 "\n"
 
-#: src/gaim-remote.c:280
+#: src/gaim-remote.c:282
 msgid ""
 "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 "greater than 9999 chars\n"
 msgstr ""
 
-#: src/gaim-remote.c:291
+#: src/gaim-remote.c:293
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1706,7 +1868,14 @@
 "\tgaim-remote uri aim:addbuddy?screename=Pingüino\n"
 "... le solicita que añada a 'Pingüino' a su lista de amigos.\n"
 
-#: src/gaim-remote.c:311
+#: src/gaim-remote.c:313
+#, fuzzy
+msgid ""
+"\n"
+"Log out all accounts\n"
+msgstr "Registrar todas las _charlas"
+
+#: src/gaim-remote.c:317
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1714,7 +1883,7 @@
 "\n"
 "Cerrar copia en ejecución de Gaim\n"
 
-#: src/gaim-remote.c:315
+#: src/gaim-remote.c:321
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1722,7 +1891,7 @@
 "\n"
 "Marcar todas las cuentas como «ausentes» con el mensaje por omisión.\n"
 
-#: src/gaim-remote.c:319
+#: src/gaim-remote.c:325
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1730,14 +1899,14 @@
 "\n"
 "Establecer como activas todas las cuentas.\n"
 
-#: src/gaim-remote.c:323
+#: src/gaim-remote.c:329
 #, fuzzy
 msgid ""
 "\n"
 "Send instant message\n"
 msgstr "Enviar un _mensaje"
 
-#: src/gtkaccount.c:325
+#: src/gtkaccount.c:345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1749,188 +1918,153 @@
 "<b>Tamaño de imagen:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:625
+#: src/gtkaccount.c:665
 msgid "Login Options"
 msgstr "Opciones de conexión"
 
-#: src/gtkaccount.c:642 src/gtkft.c:555
+#: src/gtkaccount.c:682 src/gtkft.c:626
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/gtkaccount.c:647 src/gtkblist.c:4025
+#: src/gtkaccount.c:687 src/gtkblist.c:4369
 msgid "Screen Name:"
 msgstr "Nombre de usuario:"
 
-#: src/gtkaccount.c:720
+#: src/gtkaccount.c:760
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gtkaccount.c:725 src/gtkblist.c:4039 src/gtkblist.c:4388
+#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
 msgid "Alias:"
 msgstr "Apodo:"
 
-#: src/gtkaccount.c:729
+#: src/gtkaccount.c:769
 msgid "Remember password"
 msgstr "Recordar contraseña"
 
-#: src/gtkaccount.c:738
-#, fuzzy
-msgid "Auto log in"
-msgstr "Conectarse automáticamente"
-
 #. Build the user options frame.
-#: src/gtkaccount.c:785
+#: src/gtkaccount.c:814
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: src/gtkaccount.c:798
+#: src/gtkaccount.c:827
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
-#: src/gtkaccount.c:807
+#: src/gtkaccount.c:836
 msgid "Buddy icon:"
 msgstr "Icono de amigo"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:896
+#: src/gtkaccount.c:925
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
+#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global del proxy"
 
 #. No Proxy
-#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
+#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
 msgid "No Proxy"
 msgstr "Sin proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
+#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
+#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
+#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1090
+#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"
 
-#: src/gtkaccount.c:1153
+#: src/gtkaccount.c:1184
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"
 
-#: src/gtkaccount.c:1157
+#: src/gtkaccount.c:1188
 msgid "If you look real closely"
 msgstr "Si miras de cerca"
 
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1204
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1084
+#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1111
+#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1129
+#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1243
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1166
+#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
-#: src/gtkaccount.c:1589
+#: src/gtkaccount.c:1625
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: src/gtkaccount.c:1591
+#: src/gtkaccount.c:1627
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
-#. Add the disclosure
-#: src/gtkaccount.c:1615
-msgid "Show more options"
-msgstr "Mostrar más opciones"
-
-#: src/gtkaccount.c:1616
-msgid "Show fewer options"
-msgstr "Mostrar menos opciones"
-
 #. Register button
-#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:674
+#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gtkaccount.c:2008
+#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
 
-#: src/gtkaccount.c:2013 src/gtkrequest.c:263
+#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4179
+#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
+#: src/protocols/oscar/oscar.c:4420
 msgid "Screen Name"
 msgstr "Nombre de usuario:"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:975
-#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6871
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2655
-#: src/protocols/yahoo/yahoo.c:3125 src/protocols/zephyr/zephyr.c:2218
-msgid "Online"
-msgstr "Conectado"
-
-#: src/gtkaccount.c:2164
-#, fuzzy
-msgid "Auto Log In"
-msgstr "Auto conectarse"
-
-#: src/gtkaccount.c:2172
+#: src/gtkaccount.c:2115
+#, fuzzy
+msgid "Enabled"
+msgstr "Falló"
+
+#: src/gtkaccount.c:2123
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/gtkaccount.c:2485
+#: src/gtkaccount.c:2466
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha hecho amigo a %s %s%s%s"
 
-#: src/gtkaccount.c:2499
+#: src/gtkaccount.c:2480
 msgid ""
 "\n"
 "\n"
@@ -1940,258 +2074,238 @@
 "\n"
 "¿Desea añadirlo/a a su lista de amigos?"
 
-#: src/gtkaccount.c:2503
-msgid "Information"
-msgstr "Información"
-
-#: src/gtkaccount.c:2507
+#: src/gtkaccount.c:2488
 msgid "Add buddy to your list?"
 msgstr "¿Desea añadir el amigo a su lista?"
 
-#. Add button
-#: src/gtkaccount.c:2509 src/gtkblist.c:4439 src/gtkconv.c:1476
-#: src/gtkconv.c:3790 src/gtkconv.c:3861 src/gtkrequest.c:264
-#: src/protocols/oscar/oscar.c:3805 src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
+#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
+#: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gtkblist.c:813
+#: src/gtkblist.c:888
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: src/gtkblist.c:834
+#: src/gtkblist.c:909
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
-#: src/gtkblist.c:845 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: src/gtkblist.c:1117
+#: src/gtkblist.c:1225
 msgid "Get _Info"
 msgstr "Obtener _información"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1228
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:1126
+#: src/gtkblist.c:1234
 msgid "_Send File"
 msgstr "_Enviar fichero"
 
-#: src/gtkblist.c:1132
+#: src/gtkblist.c:1240
 msgid "Add Buddy _Pounce"
 msgstr "Añadir _aviso de amigo"
 
-#: src/gtkblist.c:1134 src/gtkblist.c:1231
+#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
+#: src/gtkblist.c:1369
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: src/gtkblist.c:1144
+#: src/gtkblist.c:1259
 #, fuzzy
 msgid "_Alias Buddy..."
 msgstr "Apodo de amigo"
 
-#: src/gtkblist.c:1146
+#: src/gtkblist.c:1261
 #, fuzzy
 msgid "_Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: src/gtkblist.c:1148
+#: src/gtkblist.c:1263
 #, fuzzy
 msgid "Alias Contact..."
 msgstr "Apodo para contacto"
 
-#: src/gtkblist.c:1151 src/gtkdialogs.c:749 src/gtkdialogs.c:750
+#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1239 src/gtkblist.c:1253
+#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1241 src/gtkblist.c:1258
-#: src/gtkconn.c:367
+#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
+#: src/gtkconn.c:171
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1318
 msgid "Add a _Buddy"
 msgstr "Añadir un _amigo"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1320
 msgid "Add a C_hat"
 msgstr "Añadir un _chat"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1322
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1324
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: src/gtkblist.c:1227 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:89
+#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:102
 msgid "_Join"
 msgstr "_Unirse"
 
-#: src/gtkblist.c:1229
+#: src/gtkblist.c:1344
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: src/gtkblist.c:1255 src/gtkblist.c:1280
+#: src/gtkblist.c:1382 src/gtkblist.c:1405
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: src/gtkblist.c:1285
+#: src/gtkblist.c:1410
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: src/gtkblist.c:1502 src/gtkblist.c:1512 src/gtkblist.c:3284
-#: src/gtkblist.c:3287
+#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
+#: src/gtkblist.c:3649
 #, fuzzy
 msgid "/Tools/Mute Sounds"
 msgstr "Sin sonido"
 
-#: src/gtkblist.c:1953 src/gtkconv.c:4356 src/gtkpounce.c:316
+#: src/gtkblist.c:2106 src/gtkconv.c:4255 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 
 #. Buddies menu
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2675
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2676
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo"
 
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2677
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: src/gtkblist.c:2366
+#: src/gtkblist.c:2678
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2679
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2681
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Mostrar amigos _desconectados"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2682
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Mostrar grupos _vacíos"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2683
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: src/gtkblist.c:2372
+#: src/gtkblist.c:2684
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: src/gtkblist.c:2373
+#: src/gtkblist.c:2685
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: src/gtkblist.c:2375
-#, fuzzy
-msgid "/Buddies/_Log Out"
-msgstr "/Amigos/_Salir"
-
-#: src/gtkblist.c:2376
+#: src/gtkblist.c:2687
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Tools
-#: src/gtkblist.c:2379
+#: src/gtkblist.c:2690
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/gtkblist.c:2380
-msgid "/Tools/_Away"
-msgstr "/Herramientas/_Ausentarse"
-
-#: src/gtkblist.c:2381
+#: src/gtkblist.c:2691
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: src/gtkblist.c:2382
+#: src/gtkblist.c:2692
 msgid "/Tools/Account Ac_tions"
 msgstr "/Herramientas/Acc_iones"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:2693
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Herramientas/Acciones del com_plemento"
 
-#: src/gtkblist.c:2385
+#: src/gtkblist.c:2695
+#, fuzzy
+msgid "/Tools/_Statuses"
+msgstr "Estado"
+
+#: src/gtkblist.c:2696
 msgid "/Tools/A_ccounts"
 msgstr "/Herramientas/_Cuentas"
 
-#: src/gtkblist.c:2386
+#: src/gtkblist.c:2697
+msgid "/Tools/Pr_eferences"
+msgstr "/Herramientas/Pr_eferencias"
+
+#: src/gtkblist.c:2698
+msgid "/Tools/Pr_ivacy"
+msgstr "/Herramientas/Pr_ivacidad"
+
+#: src/gtkblist.c:2699
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/Transferencias de _ficheros"
 
-#: src/gtkblist.c:2387
+#: src/gtkblist.c:2700
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/Lista de _salas"
 
-#: src/gtkblist.c:2388
-msgid "/Tools/Pr_eferences"
-msgstr "/Herramientas/Pr_eferencias"
-
-#: src/gtkblist.c:2389
-msgid "/Tools/Pr_ivacy"
-msgstr "/Herramientas/Pr_ivacidad"
-
-#: src/gtkblist.c:2390
+#: src/gtkblist.c:2702
 #, fuzzy
 msgid "/Tools/Mute _Sounds"
 msgstr "Sin sonido"
 
-#: src/gtkblist.c:2392
+#: src/gtkblist.c:2703
 msgid "/Tools/View System _Log"
 msgstr "/Herramientas/_Ver registro del sistema"
 
 #. Help
-#: src/gtkblist.c:2395
+#: src/gtkblist.c:2706
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/gtkblist.c:2396
+#: src/gtkblist.c:2707
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#: src/gtkblist.c:2397
+#: src/gtkblist.c:2708
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#: src/gtkblist.c:2398
+#: src/gtkblist.c:2709
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: src/gtkblist.c:2416
-msgid "Rename Group"
-msgstr "Renombrar grupo"
-
-#: src/gtkblist.c:2416
-msgid "New group name"
-msgstr "Nuevo nombre de grupo:"
-
-#: src/gtkblist.c:2417
-msgid "Please enter a new name for the selected group."
-msgstr "Introduzca un nombre para el grupo seleccionado."
-
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2741 src/gtkblist.c:2808
 #, c-format
 msgid ""
 "\n"
@@ -2200,7 +2314,61 @@
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2817
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Contact Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Apodo del contacto:</b>"
+
+#: src/gtkblist.c:2825
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Apodo:</b>"
+
+#: src/gtkblist.c:2833
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Nickname:</b> %s"
+msgstr ""
+"\n"
+"<b>Apodo:</b>"
+
+#: src/gtkblist.c:2842
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Logged In:</b> %s"
+msgstr ""
+"\n"
+"<b>Conectado:</b>"
+
+#: src/gtkblist.c:2854
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Idle:</b> %s"
+msgstr ""
+"\n"
+"<b>Ausente:</b>"
+
+#: src/gtkblist.c:2889
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Last Seen:</b> %s ago"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/gtkblist.c:2897
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2208,77 +2376,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: src/gtkblist.c:2535
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/gtkblist.c:2551
-msgid ""
-"\n"
-"<b>Account:</b>"
-msgstr ""
-"\n"
-"<b>Cuenta:</b>"
-
-#: src/gtkblist.c:2552
-msgid ""
-"\n"
-"<b>Contact Alias:</b>"
-msgstr ""
-"\n"
-"<b>Apodo del contacto:</b>"
-
-#: src/gtkblist.c:2553
-msgid ""
-"\n"
-"<b>Alias:</b>"
-msgstr ""
-"\n"
-"<b>Apodo:</b>"
-
-#: src/gtkblist.c:2554
-msgid ""
-"\n"
-"<b>Nickname:</b>"
-msgstr ""
-"\n"
-"<b>Apodo:</b>"
-
-#: src/gtkblist.c:2555
-msgid ""
-"\n"
-"<b>Logged In:</b>"
-msgstr ""
-"\n"
-"<b>Conectado:</b>"
-
-#: src/gtkblist.c:2556
-msgid ""
-"\n"
-"<b>Idle:</b>"
-msgstr ""
-"\n"
-"<b>Ausente:</b>"
-
-#: src/gtkblist.c:2556
-#, fuzzy
-msgid ""
-"\n"
-"<b>Idle</b>"
-msgstr ""
-"\n"
-"<b>Ausente:</b>"
-
-#: src/gtkblist.c:2558
-msgid ""
-"\n"
-"<b>Warned:</b>"
-msgstr ""
-"\n"
-"<b>Avisado:</b>"
-
-#: src/gtkblist.c:2560
+#: src/gtkblist.c:2919
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2286,116 +2384,127 @@
 "\n"
 "<b>Descripción:</b> Terrorífica"
 
-#: src/gtkblist.c:2561
-msgid ""
-"\n"
-"<b>Status</b>: Awesome"
+#: src/gtkblist.c:2921
+#, fuzzy
+msgid ""
+"\n"
+"<b>Status:</b> Awesome"
 msgstr ""
 "\n"
 "<b>Estado:</b> Genial "
 
-#: src/gtkblist.c:2562
-msgid ""
-"\n"
-"<b>Status</b>: Rockin'"
+#: src/gtkblist.c:2923
+#, fuzzy
+msgid ""
+"\n"
+"<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
 "<b>Estado:</b> Rock & roll "
 
-#: src/gtkblist.c:2864
-#, c-format
-msgid "Idle (%dh%02dm) "
+#: src/gtkblist.c:3185
+#, fuzzy, c-format
+msgid "Idle (%dh %02dm) "
 msgstr "Ausente (%dh%02dm) "
 
-#: src/gtkblist.c:2866
+#: src/gtkblist.c:3187
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Ausente (%dm)"
 
-#: src/gtkblist.c:2869
+#: src/gtkblist.c:3190
 #, fuzzy
 msgid "Idle "
 msgstr "Está inactivo"
 
-#: src/gtkblist.c:2877
-#, c-format
-msgid "Warned (%d%%) "
-msgstr "Avisado (%d%%) "
-
-#: src/gtkblist.c:2881
+#: src/gtkblist.c:3194
 msgid "Offline "
 msgstr "Desconectado "
 
-#. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:3008
+#: src/gtkblist.c:3310
+#, fuzzy
+msgid "/Buddies/New Instant Message..."
+msgstr "/Amigos/Mensaje _instantáneo nuevo"
+
+#: src/gtkblist.c:3311 src/gtkblist.c:3345
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: src/gtkblist.c:3011
+#: src/gtkblist.c:3312
+#, fuzzy
+msgid "/Buddies/Get User Info..."
+msgstr "/Amigos/Obtener _información del usuario..."
+
+#: src/gtkblist.c:3313
+#, fuzzy
+msgid "/Buddies/Add Buddy..."
+msgstr "/Amigos/_Añadir un amigo..."
+
+#: src/gtkblist.c:3314
+#, fuzzy
+msgid "/Buddies/Add Chat..."
+msgstr "/Amigos/Añadir un _chat..."
+
+#: src/gtkblist.c:3315
+#, fuzzy
+msgid "/Buddies/Add Group..."
+msgstr "/Amigos/Añadir _grupo..."
+
+#: src/gtkblist.c:3348
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: src/gtkblist.c:3014
+#: src/gtkblist.c:3351
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: src/gtkblist.c:3070 src/gtkprefs.c:917 src/gtkprefs.c:1774
-#: src/protocols/jabber/jabber.c:935
+#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
+#: src/protocols/yahoo/yahoo.c:2749
 msgid "None"
 msgstr "Ninguno"
 
-#: src/gtkblist.c:3072
+#: src/gtkblist.c:3429
 msgid "Alphabetical"
 msgstr "Alfabético"
 
-#: src/gtkblist.c:3073
+#: src/gtkblist.c:3430
 msgid "By status"
 msgstr "Por estado"
 
-#: src/gtkblist.c:3074
+#: src/gtkblist.c:3431
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
-#: src/gtkblist.c:3110
-#, fuzzy
-msgid "Statuses"
-msgstr "Estado"
-
-#. FIXME: Status
-#: src/gtkblist.c:3174
-msgid "/Tools/Away"
-msgstr "/Herramientas/Ausencia"
-
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3542
 msgid "/Tools/Buddy Pounce"
 msgstr "/Herramientas/Aviso de amigo"
 
-#: src/gtkblist.c:3180
+#: src/gtkblist.c:3543
 msgid "/Tools/Account Actions"
 msgstr "/Herramientas/Acciones de cuentas"
 
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3544
 msgid "/Tools/Plugin Actions"
 msgstr "/Herramientas/Acciones de complemento"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3280
+#: src/gtkblist.c:3642
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Mostrar amigos desconectados"
 
-#: src/gtkblist.c:3282
+#: src/gtkblist.c:3644
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Mostrar grupos vacíos"
 
-#: src/gtkblist.c:3979 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4323 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2822
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2847
 msgid "Add Buddy"
 msgstr "Añadir amigo"
 
-#: src/gtkblist.c:4003
+#: src/gtkblist.c:4347
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2407,15 +2516,15 @@
 "posible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4063 src/gtkblist.c:4368
+#: src/gtkblist.c:4410 src/gtkblist.c:4742
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: src/gtkblist.c:4301
+#: src/gtkblist.c:4675
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."
 
-#: src/gtkblist.c:4317
+#: src/gtkblist.c:4691
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2423,11 +2532,11 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: src/gtkblist.c:4334
+#: src/gtkblist.c:4708
 msgid "Add Chat"
 msgstr "Añadir chat"
 
-#: src/gtkblist.c:4358
+#: src/gtkblist.c:4732
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2435,41 +2544,24 @@
 "Introduzca el apodo, y la información que crea conveniente del chatque "
 "desearía añadir en la lista de amigos.\n"
 
-#: src/gtkblist.c:4436
+#: src/gtkblist.c:4811
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: src/gtkblist.c:4437
+#: src/gtkblist.c:4812
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: src/gtkblist.c:5011 src/gtkblist.c:5108
+#: src/gtkblist.c:5362 src/gtkblist.c:5458
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: src/gtkconn.c:81 src/gtkconn.c:254 src/gtkconn.c:267
-msgid "Done."
-msgstr "Hecho."
-
-#: src/gtkconn.c:160
-#, fuzzy
-msgid "Logging in: "
-msgstr "Registrándose"
-
-#: src/gtkconn.c:206
-#, fuzzy
-msgid "Logging In"
-msgstr "Registrándose"
-
-#: src/gtkconn.c:218
-msgid "Cancel All"
-msgstr "Cancelar todo"
-
-#: src/gtkconn.c:367 src/gtkconn.c:599
-msgid "_Reconnect"
+#: src/gtkconn.c:171
+#, fuzzy
+msgid "Reconnect"
 msgstr "_Reconectar"
 
-#: src/gtkconn.c:563
+#: src/gtkconn.c:368
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2482,37 +2574,51 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:565
+#: src/gtkconn.c:370
 msgid "Reason Unknown."
 msgstr "Razón desconocida."
 
-#: src/gtkconn.c:573
+#: src/gtkconn.c:378
 #, fuzzy
 msgid "Disconnected"
 msgstr "Desconectado."
 
-#: src/gtkconn.c:604
+#: src/gtkconn.c:404
+msgid "_Reconnect"
+msgstr "_Reconectar"
+
+#: src/gtkconn.c:409
 msgid "Reconnect _All"
 msgstr "Reconectar todas"
 
-#: src/gtkconn.c:634
+#: src/gtkconn.c:439
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/gtkconv.c:319
+#: src/gtkconv.c:148
+#, fuzzy
+msgid "Confirm close"
+msgstr "Confirmar cuenta"
+
+#: src/gtkconv.c:180
+#, fuzzy
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "¿Seguro que quiere borrar a %s?"
+
+#: src/gtkconv.c:410
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "yo estoy utilizando Gaim v%s."
 
-#: src/gtkconv.c:328
+#: src/gtkconv.c:419
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"
 
-#: src/gtkconv.c:352
+#: src/gtkconv.c:456
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)"
 
-#: src/gtkconv.c:355
+#: src/gtkconv.c:459
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2520,47 +2626,49 @@
 "Utilize \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes órdenes están disponibles en este contexto:\n"
 
-#: src/gtkconv.c:427
+#: src/gtkconv.c:531
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: src/gtkconv.c:434
+#: src/gtkconv.c:538
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error sintáctico:  Vd. no escribió suficientes argumentos para esa orden."
 
-#: src/gtkconv.c:439
+#: src/gtkconv.c:543
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: src/gtkconv.c:446
-msgid "That command only works in Chats, not IMs."
+#: src/gtkconv.c:550
+#, fuzzy
+msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sólo funciona en Chats, no en MIs."
 
-#: src/gtkconv.c:449
-msgid "That command only works in IMs, not Chats."
+#: src/gtkconv.c:553
+#, fuzzy
+msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sólo funciona en MIs, no en Chats."
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:557
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
-#: src/gtkconv.c:687 src/gtkconv.c:713
-msgid "That buddy is not on the same protocol as this chat"
-msgstr ""
-
-#: src/gtkconv.c:707
+#: src/gtkconv.c:783 src/gtkconv.c:809
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+#: src/gtkconv.c:803
 #, fuzzy
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 
-#: src/gtkconv.c:761
+#: src/gtkconv.c:858
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:791
+#: src/gtkconv.c:888
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2568,345 +2676,292 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."
 
-#: src/gtkconv.c:812
+#: src/gtkconv.c:909
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: src/gtkconv.c:832
+#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: src/gtkconv.c:888 src/gtkconv.c:2559 src/gtkdebug.c:179
+#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
 msgid "Unable to open file."
 msgstr "No se pudo leer el fichero."
 
-#: src/gtkconv.c:893
+#: src/gtkconv.c:992
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: src/gtkconv.c:907
+#: src/gtkconv.c:1016
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
-#: src/gtkconv.c:992 src/gtkdebug.c:128
+#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
 msgid "Find"
 msgstr "Buscar"
 
-#: src/gtkconv.c:1018 src/gtkdebug.c:156
+#: src/gtkconv.c:1143 src/gtkdebug.c:191
 msgid "_Search for:"
 msgstr "Término a _buscar:"
 
-#: src/gtkconv.c:1437
+#: src/gtkconv.c:1541
 msgid "IM"
 msgstr "MI"
 
-#. Send File button
-#: src/gtkconv.c:1443 src/gtkconv.c:3783 src/protocols/oscar/oscar.c:598
+#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
 msgid "Send File"
 msgstr "Enviar fichero"
 
-#: src/gtkconv.c:1450
+#: src/gtkconv.c:1554
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: src/gtkconv.c:1453 src/gtkprefs.c:781
+#: src/gtkconv.c:1557
 msgid "Ignore"
 msgstr "Ignorar"
 
-#. Info button
-#: src/gtkconv.c:1458 src/gtkconv.c:3804
+#: src/gtkconv.c:1562
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1464
+#: src/gtkconv.c:1568
 #, fuzzy
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia nuevo"
 
-#. Remove button
-#: src/gtkconv.c:1473 src/gtkconv.c:3797 src/gtkconv.c:3868
-#: src/gtkrequest.c:265
+#: src/gtkconv.c:1577 src/gtkrequest.c:266
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gtkconv.c:2567
+#: src/gtkconv.c:2644
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: src/gtkconv.c:2588
+#: src/gtkconv.c:2667
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: src/gtkconv.c:2618
+#: src/gtkconv.c:2695
 msgid "Animate"
 msgstr "Animar"
 
-#: src/gtkconv.c:2623
+#: src/gtkconv.c:2700
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: src/gtkconv.c:2629
+#: src/gtkconv.c:2706
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: src/gtkconv.c:2996
+#: src/gtkconv.c:3067
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:3072
 msgid "User has typed something and paused"
 msgstr "El usuario ha escrito algo y ha parado"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3107
+#: src/gtkconv.c:3173
 msgid "_Send As"
 msgstr "_Enviar como"
 
 #. Conversation menu
-#: src/gtkconv.c:3560
+#: src/gtkconv.c:3628
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: src/gtkconv.c:3562
+#: src/gtkconv.c:3630
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo"
 
-#: src/gtkconv.c:3567
+#: src/gtkconv.c:3635
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3637
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"
 
-#: src/gtkconv.c:3570
+#: src/gtkconv.c:3638
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."
 
-#: src/gtkconv.c:3572
+#: src/gtkconv.c:3640
 msgid "/Conversation/Clear"
 msgstr "/Conversación/Limpiar"
 
-#: src/gtkconv.c:3576
+#: src/gtkconv.c:3644
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/_Enviar fichero..."
 
-#: src/gtkconv.c:3577
+#: src/gtkconv.c:3645
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3647
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
 
-#: src/gtkconv.c:3581
-msgid "/Conversation/_Warn..."
-msgstr "/Conversación/Avi_sar..."
-
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3649
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: src/gtkconv.c:3588
+#: src/gtkconv.c:3654
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
 
-#: src/gtkconv.c:3590
+#: src/gtkconv.c:3656
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear"
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3658
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."
 
-#: src/gtkconv.c:3594
+#: src/gtkconv.c:3660
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."
 
-#: src/gtkconv.c:3599
+#: src/gtkconv.c:3665
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Insertar en_lace"
 
-#: src/gtkconv.c:3601
+#: src/gtkconv.c:3667
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Insertar imag_en..."
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3672
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"
 
 #. Options
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3676
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3677
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3678
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: src/gtkconv.c:3613
-msgid "/Options/Show Formatting _Toolbar"
+#: src/gtkconv.c:3679
+#, fuzzy
+msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barra de formato"
 
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3680
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3681
+#, fuzzy
+msgid "/Options/Show Buddy _Icon"
+msgstr "Mostrar _iconos de los amigos"
+
+#: src/gtkconv.c:3725
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#: src/gtkconv.c:3661
+#: src/gtkconv.c:3731
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar fichero..."
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3735
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3741
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"
 
-#: src/gtkconv.c:3675
-msgid "/Conversation/Warn..."
-msgstr "/Conversación/Avisar..."
-
-#: src/gtkconv.c:3679
+#: src/gtkconv.c:3745
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:3751
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."
 
-#: src/gtkconv.c:3689
+#: src/gtkconv.c:3755
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3759
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: src/gtkconv.c:3697
+#: src/gtkconv.c:3763
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:3769
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: src/gtkconv.c:3707
+#: src/gtkconv.c:3773
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: src/gtkconv.c:3713
+#: src/gtkconv.c:3779
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: src/gtkconv.c:3716
+#: src/gtkconv.c:3782
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: src/gtkconv.c:3719
-msgid "/Options/Show Formatting Toolbar"
+#: src/gtkconv.c:3785
+#, fuzzy
+msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barra de formato"
 
-#: src/gtkconv.c:3722
+#: src/gtkconv.c:3788
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#. The buttons, from left to right
-#. Block button
-#: src/gtkconv.c:3776 src/gtkprivacy.c:625 src/gtkprivacy.c:636
-msgid "Block"
-msgstr "Bloquear"
-
-#: src/gtkconv.c:3777
-msgid "Block the user"
-msgstr "Bloquear al usuario"
-
-#: src/gtkconv.c:3784
-msgid "Send a file to the user"
-msgstr "Enviar un fichero al usuario."
-
 #: src/gtkconv.c:3791
-msgid "Add the user to your buddy list"
-msgstr "Añadir al usuario a la lista de amigos"
-
-#: src/gtkconv.c:3798
-msgid "Remove the user from your buddy list"
-msgstr "Eliminar al usuario de la lista de amigos"
-
-#: src/gtkconv.c:3805 src/gtkconv.c:4126
-msgid "Get the user's information"
-msgstr "Obtener la información del usuario"
-
-#. Send button
-#: src/gtkconv.c:3811 src/gtkconv.c:3875
-msgid "Send"
-msgstr "Enviar"
-
-#: src/gtkconv.c:3812 src/gtkconv.c:3876
-msgid "Send message"
-msgstr "Enviar mensaje"
-
-#. The buttons, from left to right
-#. Invite
-#: src/gtkconv.c:3854
-msgid "Invite"
-msgstr "Invitar"
-
-#: src/gtkconv.c:3855
-msgid "Invite a user"
-msgstr "Invitar al usuario"
-
-#: src/gtkconv.c:3862
-msgid "Add the chat to your buddy list"
-msgstr "Añadir el chat a su lista de amigos"
-
-#: src/gtkconv.c:3869
-msgid "Remove the chat from your buddy list"
-msgstr "Eliminar el chat de su lista de amigos"
-
-#: src/gtkconv.c:3993
+#, fuzzy
+msgid "/Options/Show Buddy Icon"
+msgstr "Mostrar _iconos de los amigos"
+
+#: src/gtkconv.c:3911
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4042
+#: src/gtkconv.c:3959
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#: src/gtkconv.c:4103
+#: src/gtkconv.c:4021
 msgid "IM the user"
 msgstr "Enviar un MI al usuario"
 
-#: src/gtkconv.c:4115
+#: src/gtkconv.c:4034
 msgid "Ignore the user"
 msgstr "Ignorar al usuario"
 
-#: src/gtkconv.c:4634
+#: src/gtkconv.c:4046
+msgid "Get the user's information"
+msgstr "Obtener la información del usuario"
+
+#: src/gtkconv.c:4569
 msgid "Close conversation"
 msgstr "Cerrar conversación"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5198 src/gtkconv.c:5294 src/gtkconv.c:5352
+#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-#: src/gtkconv.c:5925 src/gtkconv.c:5928
-msgid "<main>/Conversation/Close"
-msgstr "<main>/Conversación/_Cerrar"
-
-#: src/gtkconv.c:6249
+#: src/gtkconv.c:6279
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2914,12 +2969,12 @@
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: src/gtkconv.c:6252
+#: src/gtkconv.c:6282
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
 
-#: src/gtkconv.c:6255
+#: src/gtkconv.c:6285
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2927,364 +2982,389 @@
 "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
 "actual."
 
-#: src/gtkconv.c:6259
+#: src/gtkconv.c:6288
+#, fuzzy
+msgid "clear: Clears the conversation scrollback."
+msgstr "%s cerró la ventana de conversación."
+
+#: src/gtkconv.c:6291
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: src/gtkdebug.c:194
+#: src/gtkdebug.c:230
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuración"
 
-#: src/gtkdebug.c:247
+#: src/gtkdebug.c:571
+#, fuzzy
+msgid "Invert"
+msgstr "_Insertar"
+
+#: src/gtkdebug.c:574
+msgid "Highlight matches"
+msgstr ""
+
+#: src/gtkdebug.c:621
 msgid "Debug Window"
 msgstr "Ventana de depuración"
 
-#: src/gtkdebug.c:285
+#: src/gtkdebug.c:674
+msgid "Clear"
+msgstr "Limpiar"
+
+#: src/gtkdebug.c:683
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/gtkdebug.c:291
+#: src/gtkdebug.c:690 src/gtkdebug.c:691
 msgid "Timestamps"
 msgstr "Marcas de tiempo"
 
-#: src/gtkdialogs.c:66
-msgid "maintainer"
-msgstr "mantenedor"
-
-#: src/gtkdialogs.c:67
+#: src/gtkdebug.c:709
+#, fuzzy
+msgid "Filter"
+msgstr "Falló"
+
+#: src/gtkdebug.c:722
+#, fuzzy
+msgid "Right click for more options."
+msgstr "Mostrar más opciones"
+
+#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
 msgid "lead developer"
 msgstr "desarrollador principal"
 
-#: src/gtkdialogs.c:68
-msgid "developer & webmaster"
-msgstr "desarrollador y webmaster"
-
-#: src/gtkdialogs.c:69
-msgid "win32 port"
-msgstr "adaptación a win32"
-
-#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72
-#: src/gtkdialogs.c:73 src/gtkdialogs.c:75
+#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
 msgid "developer"
 msgstr "desarrollador"
 
-#: src/gtkdialogs.c:74
+#: src/gtkdialogs.c:61
+msgid "developer & webmaster"
+msgstr "desarrollador y webmaster"
+
+#: src/gtkdialogs.c:62
+msgid "win32 port"
+msgstr "adaptación a win32"
+
+#: src/gtkdialogs.c:68
 msgid "support"
 msgstr "soporte"
 
-#: src/gtkdialogs.c:80
-msgid "former libfaim maintainer"
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
+msgid "maintainer"
+msgstr "mantenedor"
+
+#: src/gtkdialogs.c:88
+#, fuzzy
+msgid "libfaim maintainer"
 msgstr "desarrollador anterior de libfaim"
 
-#: src/gtkdialogs.c:81
-msgid "former lead developer"
-msgstr "desarrollador principal previo"
-
-#: src/gtkdialogs.c:82
-msgid "former maintainer"
-msgstr "desarrollador previo"
-
-#: src/gtkdialogs.c:83
-msgid "former Jabber developer"
+#: src/gtkdialogs.c:91
+#, fuzzy
+msgid "Jabber developer"
 msgstr "desarrollador de Jabber previo"
 
-#: src/gtkdialogs.c:84
+#: src/gtkdialogs.c:92
 msgid "original author"
 msgstr "autor original"
 
-#: src/gtkdialogs.c:85
+#: src/gtkdialogs.c:93
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseñador de controladores [lazy bum]"
 
-#: src/gtkdialogs.c:90 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: src/gtkdialogs.c:91 src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
 msgid "Catalan"
 msgstr "Catalán"
 
-#: src/gtkdialogs.c:92 src/gtkdialogs.c:131
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
 msgid "Czech"
 msgstr "Checo"
 
-#: src/gtkdialogs.c:93
+#: src/gtkdialogs.c:102
 msgid "Danish"
 msgstr "Danés"
 
-#: src/gtkdialogs.c:94
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
+msgid "German"
+msgstr "Alemán"
+
+#: src/gtkdialogs.c:104
 #, fuzzy
 msgid "Australian English"
 msgstr "Inglés canadiense"
 
-#: src/gtkdialogs.c:95
+#: src/gtkdialogs.c:105
 msgid "British English"
 msgstr "Inglés británico"
 
-#: src/gtkdialogs.c:96
+#: src/gtkdialogs.c:106
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: src/gtkdialogs.c:97 src/gtkdialogs.c:132
-msgid "German"
-msgstr "Alemán"
-
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:133
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
 msgid "Spanish"
 msgstr "Español"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:134
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:135
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
 msgid "French"
 msgstr "Francés"
 
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:110
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/gtkdialogs.c:102
+#: src/gtkdialogs.c:111
 msgid "Hindi"
 msgstr "Hindú"
 
-#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:112
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:136
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:137
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:115
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:138
+#: src/gtkdialogs.c:116
+#, fuzzy
+msgid "Georgian"
+msgstr "Alemán"
+
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/gtkdialogs.c:108
-msgid "Dutch; Flemish"
+#: src/gtkdialogs.c:118
+#, fuzzy
+msgid "Dutch, Flemish"
 msgstr "Danés; Flamenco"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:119
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:120
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:139
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:123
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:124
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:125
 msgid "Romanian"
 msgstr "Rumano"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:140 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
 msgid "Russian"
 msgstr "Ruso"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
 msgid "Serbian"
 msgstr "Serbio"
 
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:129
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
 msgid "Swedish"
 msgstr "Sueco"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:131
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:131
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:140
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: src/gtkdialogs.c:142
+#: src/gtkdialogs.c:155
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: src/gtkdialogs.c:144
-msgid "Chinese"
-msgstr "Chino"
-
-#: src/gtkdialogs.c:185
+#: src/gtkdialogs.c:199
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: src/gtkdialogs.c:208
+#: src/gtkdialogs.c:223
+#, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim es un cliente modular de mensajería instantánea, capaz de utilizar AIM, "
 "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr y "
 "Gadu-Gadu al mismo tiempo.  Está escrito usando GTK+ y se licencia con la "
 "GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:217
+#: src/gtkdialogs.c:232
+#, fuzzy
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #gaim en irc.freenode.net<BR><BR>"
+
+#: src/gtkdialogs.c:235
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #gaim en irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:222
+#: src/gtkdialogs.c:241
 msgid "Active Developers"
 msgstr "Desarrolladores en activo"
 
-#: src/gtkdialogs.c:237
+#: src/gtkdialogs.c:256
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: src/gtkdialogs.c:252
+#: src/gtkdialogs.c:271
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: src/gtkdialogs.c:267
+#: src/gtkdialogs.c:286
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: src/gtkdialogs.c:287
+#: src/gtkdialogs.c:306
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: src/gtkdialogs.c:357 src/gtkdialogs.c:500 src/gtkdialogs.c:555
-msgid "_Screen name"
-msgstr "_Nombre de usuario"
-
-#: src/gtkdialogs.c:363 src/gtkdialogs.c:506 src/gtkdialogs.c:561
+#: src/gtkdialogs.c:324
+#, fuzzy
+msgid "Debugging Information"
+msgstr "Información de Registro"
+
+#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
+#, fuzzy
+msgid "_Name"
+msgstr "Nombre"
+
+#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: src/gtkdialogs.c:370
+#: src/gtkdialogs.c:499
 msgid "New Instant Message"
 msgstr "Mensaje instantáneo nuevo"
 
-#: src/gtkdialogs.c:372
-msgid "Please enter the screen name of the person you would like to IM."
+#: src/gtkdialogs.c:501
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Introduzca el nombre de usuario de la persona con la que quiere comunicarse."
 
-#: src/gtkdialogs.c:513
+#: src/gtkdialogs.c:642
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: src/gtkdialogs.c:515
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
+#: src/gtkdialogs.c:644
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
 msgstr ""
 "Introduzca el nombre de usuario de la persona de la cual quiere ver "
 "información."
 
-#: src/gtkdialogs.c:569
-msgid "Get User Log"
+#: src/gtkdialogs.c:698
+#, fuzzy
+msgid "View User Log"
 msgstr "Obtener registro de usuario"
 
-#: src/gtkdialogs.c:571
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
+#: src/gtkdialogs.c:700
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
 msgstr ""
 "Introduzca el nombre de usuario de la persona de la cual quiere ver "
 "informaciónde registro."
 
-#: src/gtkdialogs.c:611
-msgid "Warn User"
-msgstr "Avisar usuario"
-
-#: src/gtkdialogs.c:632
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-"\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">¿Avisar a %s?</span>\n"
-"\n"
-"Ésto incrementará el nivel de aviso de %s y él o ella estará sujeto a un "
-"límite más duro en su tasa de envío de mensajes.\n"
-
-#: src/gtkdialogs.c:641
-msgid "Warn _anonymously?"
-msgstr "¿Advertir _anónimamente?"
-
-#: src/gtkdialogs.c:648
-msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>Las advertencias anónimas son menos duras.</b>"
-
-#: src/gtkdialogs.c:669
+#: src/gtkdialogs.c:719
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: src/gtkdialogs.c:670
+#: src/gtkdialogs.c:720
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: src/gtkdialogs.c:672 src/gtkdialogs.c:694 src/gtkdialogs.c:714
-#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
+#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Apodo"
 
-#: src/gtkdialogs.c:690
+#: src/gtkdialogs.c:740
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: src/gtkdialogs.c:692
+#: src/gtkdialogs.c:742
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: src/gtkdialogs.c:711
+#: src/gtkdialogs.c:761
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: src/gtkdialogs.c:712
+#: src/gtkdialogs.c:762
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: src/gtkdialogs.c:746
-#, c-format
-msgid ""
+#: src/gtkdialogs.c:799
+#, fuzzy, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr ""
+msgstr[0] ""
 "Está a punto de borrar el contacto que contiene a %s y a otros %d amigos de "
 "su lista de amigos. ¿Desea continuar?"
-
-#: src/gtkdialogs.c:808
+msgstr[1] ""
+"Está a punto de borrar el contacto que contiene a %s y a otros %d amigos de "
+"su lista de amigos. ¿Desea continuar?"
+
+#: src/gtkdialogs.c:866
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3293,21 +3373,21 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"
 
-#: src/gtkdialogs.c:811 src/gtkdialogs.c:812
+#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: src/gtkdialogs.c:850
+#: src/gtkdialogs.c:908
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
 
-#: src/gtkdialogs.c:853 src/gtkdialogs.c:854
+#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: src/gtkdialogs.c:887
+#: src/gtkdialogs.c:950
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3315,116 +3395,136 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: src/gtkdialogs.c:891 src/gtkdialogs.c:892
+#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: src/gtkft.c:140
+#: src/gtkft.c:141
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:161 src/gtkft.c:978
+#: src/gtkft.c:162 src/gtkft.c:1046
 msgid "Finished"
 msgstr "Terminado"
 
-#: src/gtkft.c:164 src/gtkft.c:929
+#: src/gtkft.c:165 src/gtkft.c:997
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: src/gtkft.c:167 src/gtkft.c:848
+#: src/gtkft.c:168 src/gtkft.c:916
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibiendo como:</b>"
 
-#: src/gtkft.c:222
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibiendo de:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: src/gtkft.c:228
+#: src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: src/gtkft.c:407
+#: src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "No se ha configurado ninguna aplicación para abrir este tipo de archivo."
 
-#: src/gtkft.c:412
+#: src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "Se produjo un error al abrir el archivo."
 
-#: src/gtkft.c:503
+#: src/gtkft.c:470
+#, fuzzy, c-format
+msgid "Error launching %s: %s"
+msgstr "Error al ejecutar <b>%s</b>: %s"
+
+#: src/gtkft.c:479
+#, fuzzy, c-format
+msgid "Error running %s"
+msgstr "Error al unirse al chat %s"
+
+#: src/gtkft.c:480
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#: src/gtkft.c:575
 msgid "Progress"
 msgstr "Progreso"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:582
 msgid "Filename"
 msgstr "Nombre de fichero"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:589
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/gtkft.c:524
+#: src/gtkft.c:596
 msgid "Remaining"
 msgstr "Restante"
 
-#: src/gtkft.c:556
+#: src/gtkft.c:627
 msgid "Filename:"
 msgstr "Nombre de fichero:"
 
-#: src/gtkft.c:557
+#: src/gtkft.c:628
+#, fuzzy
+msgid "Local File:"
+msgstr "Usuarios locales"
+
+#: src/gtkft.c:629
 msgid "Status:"
 msgstr "Estado:"
 
-#: src/gtkft.c:558
+#: src/gtkft.c:630
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/gtkft.c:559
+#: src/gtkft.c:631
 msgid "Time Elapsed:"
 msgstr "Tiempo transcurrido:"
 
-#: src/gtkft.c:560
+#: src/gtkft.c:632
 msgid "Time Remaining:"
 msgstr "Tiempo restante:"
 
-#: src/gtkft.c:652
+#: src/gtkft.c:718
 msgid "_Keep the dialog open"
 msgstr "Mantener el diálogo _abierto"
 
-#: src/gtkft.c:662
+#: src/gtkft.c:728
 msgid "_Clear finished transfers"
 msgstr "_Limpiar transferencias terminadas"
 
 #. "Download Details" arrow
-#: src/gtkft.c:671
+#: src/gtkft.c:737
 msgid "Show transfer details"
 msgstr "Mostrar detalles de la transferencia"
 
-#: src/gtkft.c:672
+#: src/gtkft.c:738
 msgid "Hide transfer details"
 msgstr "Ocultar detalles de la transferencia"
 
 #. Pause button
-#: src/gtkft.c:714 src/gtkstock.c:93
+#: src/gtkft.c:775 src/gtkstock.c:106
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: src/gtkft.c:724
+#: src/gtkft.c:785
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: src/gtkft.c:931
+#: src/gtkft.c:999
 msgid "Failed"
 msgstr "Falló"
 
@@ -3436,72 +3536,102 @@
 msgid "Size of the expander arrow"
 msgstr "Tamaño de la flecha de expansión"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:816
 msgid "Pa_ste As Text"
 msgstr "Pe_gar como texto"
 
-#: src/gtkimhtml.c:1019
+#: src/gtkimhtml.c:1263
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: src/gtkimhtml.c:1020
+#: src/gtkimhtml.c:1264
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: src/gtkimhtml.c:1237
+#: src/gtkimhtml.c:1267
+#, fuzzy
+msgid "Hyperlink prelight color"
+msgstr "Color de hiperenlace"
+
+#: src/gtkimhtml.c:1268
+#, fuzzy
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Color para dibujar hiperenlaces."
+
+#: src/gtkimhtml.c:1486
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar dirección de correo electrónico"
 
-#: src/gtkimhtml.c:1249
-msgid "_Copy Link Location"
-msgstr "_Copiar destino del enlace"
-
-#: src/gtkimhtml.c:1259
+#: src/gtkimhtml.c:1498
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: src/gtkimhtml.c:2817
-msgid ""
-"Unable to guess the image type based on the file extension supplied.  "
+#: src/gtkimhtml.c:1508
+msgid "_Copy Link Location"
+msgstr "_Copiar destino del enlace"
+
+#: src/gtkimhtml.c:3182
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+#: src/gtkimhtml.c:3185
+msgid ""
+"Unrecognized file type\n"
+"\n"
 "Defaulting to PNG."
 msgstr ""
-"Gaim no ha podido deducir el tipo de imagen a partir de la extensión del "
-"archivo. Tomando PNG por omisión."
-
-#: src/gtkimhtml.c:2825
-#, c-format
-msgid "Error saving image: %s"
+
+#: src/gtkimhtml.c:3198
+#, fuzzy, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:3201
+#, fuzzy, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
 msgstr "Error guardando imagen: %s"
 
-#: src/gtkimhtml.c:2902 src/gtkimhtml.c:2914
+#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
 msgid "Save Image"
 msgstr "Guardar imagen..."
 
-#: src/gtkimhtml.c:2942
+#: src/gtkimhtml.c:3321
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#: src/gtkimhtmltoolbar.c:180
+#: src/gtkimhtmltoolbar.c:141
 msgid "Select Font"
 msgstr "Seleccionar tipografía"
 
-#: src/gtkimhtmltoolbar.c:258
+#: src/gtkimhtmltoolbar.c:220
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"
 
-#: src/gtkimhtmltoolbar.c:332
+#: src/gtkimhtmltoolbar.c:299
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"
 
-#: src/gtkimhtmltoolbar.c:415
+#: src/gtkimhtmltoolbar.c:388
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:423
+#: src/gtkimhtmltoolbar.c:396
 msgid "_Description"
 msgstr "_Descripción"
 
-#: src/gtkimhtmltoolbar.c:426
+#: src/gtkimhtmltoolbar.c:399
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3509,201 +3639,172 @@
 "Introduzca el URL y la descripción del enlace que quiere insertar. La "
 "descripción es opcional."
 
-#: src/gtkimhtmltoolbar.c:430
+#: src/gtkimhtmltoolbar.c:403
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: src/gtkimhtmltoolbar.c:435
+#: src/gtkimhtmltoolbar.c:408
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: src/gtkimhtmltoolbar.c:439
+#: src/gtkimhtmltoolbar.c:412
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: src/gtkimhtmltoolbar.c:508
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No se pudo almacenar la imagen: %s\n"
 
-#: src/gtkimhtmltoolbar.c:534 src/gtkimhtmltoolbar.c:544
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: src/gtkimhtmltoolbar.c:703 src/gtkimhtmltoolbar.c:781
+#: src/gtkimhtmltoolbar.c:715
 msgid "This theme has no available smileys."
 msgstr "Este tema no tiene caritas disponibles."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:795
+#: src/gtkimhtmltoolbar.c:729
 msgid "Smile!"
 msgstr "¡Sonría!"
 
-#: src/gtkimhtmltoolbar.c:974
+#: src/gtkimhtmltoolbar.c:917
 msgid "Bold"
 msgstr "Negrita"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:928
 msgid "Italic"
 msgstr "Cursiva"
 
+#: src/gtkimhtmltoolbar.c:939
+msgid "Underline"
+msgstr "Subrayado"
+
+#: src/gtkimhtmltoolbar.c:955
+msgid "Larger font size"
+msgstr "Tamaño de tipografía mayor"
+
+#: src/gtkimhtmltoolbar.c:967
+msgid "Smaller font size"
+msgstr "Tamaño de tipografía menor"
+
+#: src/gtkimhtmltoolbar.c:984
+msgid "Font Face"
+msgstr "Estilo de tipografía"
+
 #: src/gtkimhtmltoolbar.c:996
-msgid "Underline"
-msgstr "Subrayado"
-
-#: src/gtkimhtmltoolbar.c:1012
-msgid "Larger font size"
-msgstr "Tamaño de tipografía mayor"
+msgid "Foreground font color"
+msgstr "Color del texto"
+
+#: src/gtkimhtmltoolbar.c:1008
+msgid "Background color"
+msgstr "Color de fondo"
 
 #: src/gtkimhtmltoolbar.c:1024
-msgid "Smaller font size"
-msgstr "Tamaño de tipografía menor"
-
-#: src/gtkimhtmltoolbar.c:1041
-msgid "Font Face"
-msgstr "Estilo de tipografía"
-
-#: src/gtkimhtmltoolbar.c:1053
-msgid "Foreground font color"
-msgstr "Color del texto"
-
-#: src/gtkimhtmltoolbar.c:1065
-msgid "Background color"
-msgstr "Color de fondo"
-
-#: src/gtkimhtmltoolbar.c:1080
+#, fuzzy
+msgid "Clear formatting"
+msgstr "_Limpiar formatos"
+
+#: src/gtkimhtmltoolbar.c:1039
 msgid "Insert link"
 msgstr "Insertar enlace"
 
-#: src/gtkimhtmltoolbar.c:1090
+#: src/gtkimhtmltoolbar.c:1049
 msgid "Insert image"
 msgstr "Insertar imagen"
 
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
-#: src/gtkimhtmltoolbar.c:1101
+#: src/gtkimhtmltoolbar.c:1060
 msgid "Insert smiley"
 msgstr "Insertar emoticono"
 
-#: src/gtklog.c:303
+#: src/gtklog.c:200
+#, fuzzy, c-format
+msgid "Conversation in %s on %s"
+msgstr "Conversaciones con %s"
+
+#: src/gtklog.c:202
+#, fuzzy, c-format
+msgid "Conversation with %s on %s"
+msgstr "Conversaciones con %s"
+
+#: src/gtklog.c:397
+msgid ""
+"System events will only be logged if the <span style=\"italic\">Enable "
+"system log preference</span> is set."
+msgstr ""
+
+#: src/gtklog.c:401
+msgid ""
+"Instant messages will only be logged if the <span style=\"italic\">Log all "
+"instant messages</span> preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:404
+msgid ""
+"Chats will only be logged if the <span style=\"italic\">Log all chats "
+"preference</span> is enabled."
+msgstr ""
+
+#: src/gtklog.c:409
+msgid "No logs were found."
+msgstr ""
+
+#: src/gtklog.c:455
+#, fuzzy, c-format
+msgid "Conversations in %s"
+msgstr "Conversaciones con %s"
+
+#: src/gtklog.c:463 src/gtklog.c:513
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaciones con %s"
 
-#. Window **********
-#: src/gtklog.c:391 src/gtklog.c:407
+#: src/gtklog.c:538
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: src/gtkmain.c:151
-msgid "Please create an account."
-msgstr "Por favor, cree una cuenta."
-
-#: src/gtkmain.c:233
-msgid "Login"
-msgstr "Conectar"
-
-#: src/gtkmain.c:249
-msgid "<b>_Account:</b>"
-msgstr "<b>_Cuenta:</b>"
-
-#: src/gtkmain.c:263
-msgid "<b>_Password:</b>"
-msgstr "<b>Contra_seña:</b>"
-
-#. And now for the buttons
-#: src/gtkmain.c:280
-#, fuzzy
-msgid "A_ccounts"
-msgstr "Cuentas"
-
-#: src/gtkmain.c:286
-#, fuzzy
-msgid "P_references"
-msgstr "Preferencias"
-
-#: src/gtkmain.c:292
-#, fuzzy
-msgid "_Log in"
-msgstr "_Entrada"
-
-#. full help text
-#: src/gtkmain.c:517
+#: src/gtkmain.c:323
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Intente `%s -h' para más información.\n"
+
+#: src/gtkmain.c:325
 #, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
 "  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
 "  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Modo de uso: %s [OPCIÓN]...\n"
-"\n"
-"  -a, --acct          muestra la ventana de edición de cuentas\n"
-"  -w, --away[=MENS]   marca como no disponible al conectar (el valor "
-"opcional\n"
-"                      MENS especifica el nombre del mensaje de no "
-"disponibilidad\n"
-"                      a usar)\n"
-"  -l, --login[=NOMBR] conexión automática (el argumento opcional NOMBRE "
-"especifica \n"
-"                      la/s cuenta/s a utilizar, separadas por comas)\n"
-"  -n, --loginwin      no conectarse automáticamente, mostrar ventana de "
-"conexión\n"
-"  -u, --user=NOMBRE   utilizar cuenta NOMBRE\n"
-"  -c, --config=DIR    utilizar DIR para los archivos de configuración\n"
-"  -d, --debug         mostrar mensajes de depuración en salida estándar\n"
-"  -v, --version       mostrar la versión actual y salir\n"
-"  -h, --help          mostrar esta ayuda y salir\n"
-
-#. short message
-#: src/gtkmain.c:532
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Intente `%s -h' para más información.\n"
-
-#: src/gtkmain.c:899
-msgid "Unable to load preferences"
-msgstr "No se pudieron cargar las preferencias"
-
-#: src/gtkmain.c:899
-msgid ""
-"Gaim was not able to load your preferences because they are stored in an old "
-"format that is no longer used.  Please reconfigure your settings using the "
-"Preferences window."
-msgstr ""
-"Gaim no pudo cargar sus preferencias porque están almacenadas en un formato "
-"antigüo que ya no se utiliza. Por favor, reconfigure sus preferencias "
-"utilizando la ventana de Preferencias."
+msgstr ""
 
 #. Descriptive label
-#: src/gtknotify.c:218
+#: src/gtknotify.c:267
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tiene %d mensaje nuevo."
 msgstr[1] "%s tiene %d nuevos mensajes."
 
-#: src/gtknotify.c:232
+#: src/gtknotify.c:281
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">De:</span> %s\n"
 
-#: src/gtknotify.c:241
+#: src/gtknotify.c:290
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Asunto:</span> %s\n"
 
-#: src/gtknotify.c:246
+#: src/gtknotify.c:295
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3714,7 +3815,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:262
+#: src/gtknotify.c:311
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3725,22 +3826,26 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
+#: src/gtknotify.c:456
+msgid "Search Results"
+msgstr "Resultados de la búsqueda"
+
+#: src/gtknotify.c:617
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "La orden de navegador <b>%s</b> no es válida."
 
-#: src/gtknotify.c:421 src/gtknotify.c:433 src/gtknotify.c:446
-#: src/gtknotify.c:570
+#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
+#: src/gtknotify.c:768
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: src/gtknotify.c:431 src/gtknotify.c:444
+#: src/gtknotify.c:629 src/gtknotify.c:642
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error al ejecutar <b>%s</b>: %s"
 
-#: src/gtknotify.c:571
+#: src/gtknotify.c:769
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3756,7 +3861,7 @@
 msgstr "Indique el amigo del que avisar."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:901
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
@@ -3854,63 +3959,55 @@
 msgstr "_Guardar este aviso tras la activación"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:908
+#: src/gtkpounce.c:906
 msgid "Remove Buddy Pounce"
 msgstr "Quitar aviso de amigo"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvió de su inactividad (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: src/gtkpounce.c:981
+#: src/gtkpounce.c:976
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: src/gtkpounce.c:983
+#: src/gtkpounce.c:978
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: src/gtkpounce.c:984
+#: src/gtkpounce.c:979
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
-#: src/gtkprefs.c:398
-msgid "Interface Options"
-msgstr "Opciones de la interfaz"
-
-#: src/gtkprefs.c:400
-msgid "D_isplay remote nicknames if no alias is set"
-msgstr "_Mostrar los apodos remotos si no se ha establecido un apodo"
-
-#: src/gtkprefs.c:632
+#: src/gtkprefs.c:685
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3918,48 +4015,58 @@
 "Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
 "instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:725
 msgid "Icon"
 msgstr "Icono"
 
-#: src/gtkprefs.c:679 src/gtkprefs.c:2117 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761
+#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Descripción"
 
-#: src/gtkprefs.c:774
-msgid "Display"
-msgstr "Mostrar"
-
-#: src/gtkprefs.c:775
-msgid "Show _timestamp on messages"
-msgstr "Mostrar la _hora en los mensajes"
-
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:832
+msgid "Buddy List Sorting"
+msgstr "Orden de la lista de amigos"
+
+#: src/gtkprefs.c:841
+msgid "_Sorting:"
+msgstr "Orden:"
+
+#: src/gtkprefs.c:846
+msgid "Buddy Display"
+msgstr "Mostrar amigos"
+
+#: src/gtkprefs.c:847
+#, fuzzy
+msgid "Show more buddy details"
+msgstr "Mostrar detalles del usuario"
+
+#: src/gtkprefs.c:885
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Enviar órdenes «_slash» desconocidas como mensajes"
+
+#: src/gtkprefs.c:887
+#, fuzzy
+msgid "Show _formatting on incoming messages"
+msgstr "_Ignorar el formato de los mensajes entrantes."
+
+#: src/gtkprefs.c:889
+msgid "Show buddy _icons"
+msgstr "Mostrar _iconos de los amigos"
+
+#: src/gtkprefs.c:891
+msgid "Enable buddy ic_on animation"
+msgstr "Habilitar animaciones en los i_conos de amigos"
+
+#: src/gtkprefs.c:893
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Notificar a los amigos cuando les esté escribiendo"
+
+#: src/gtkprefs.c:896
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar las faltas de ortografía"
 
-#: src/gtkprefs.c:782
-msgid "Ignore c_olors"
-msgstr "Ignorar c_olores"
-
-#: src/gtkprefs.c:784
-msgid "Ignore font _faces"
-msgstr "Ignorar _aspectos de la tipografía"
-
-#: src/gtkprefs.c:786
-msgid "Ignore font si_zes"
-msgstr "Ignorar t_amaños de tipografía"
-
-#: src/gtkprefs.c:789
-msgid "Default Formatting"
-msgstr "Formato por omisión"
-
-#: src/gtkprefs.c:791
-msgid "_Send default formatting with outgoing messages"
-msgstr "_Enviar formato por omisión en los mensajes salientes"
-
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:914
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3967,238 +4074,152 @@
 "Así se verá el texto de sus mensajes salientes cuando utilice protocolos que "
 "soportan formatos. :)"
 
-#: src/gtkprefs.c:804
-msgid "_Clear Formatting"
-msgstr "_Limpiar formatos"
-
-#: src/gtkprefs.c:841
-msgid "Window Closing"
-msgstr "Cierre de Ventanas"
-
-#: src/gtkprefs.c:842
-msgid "_Escape closes window"
-msgstr "«E_scape» cierra la ventana"
-
-#: src/gtkprefs.c:858
-msgid "Buddy List Sorting"
-msgstr "Orden de la lista de amigos"
-
-#: src/gtkprefs.c:867
-msgid "_Sorting:"
-msgstr "Orden:"
-
-#: src/gtkprefs.c:872
-msgid "Buddy Display"
-msgstr "Mostrar amigos"
-
-#: src/gtkprefs.c:873 src/gtkprefs.c:933
-msgid "Show buddy _icons"
-msgstr "Mostrar _iconos de los amigos"
-
-#: src/gtkprefs.c:875
-msgid "Show _warning levels"
-msgstr "Mostrar niveles de _aviso"
-
-#: src/gtkprefs.c:877
-msgid "Show idle _times"
-msgstr "Mostrar el _tiempo de inactividad"
-
-#: src/gtkprefs.c:879
-msgid "_Automatically expand contacts"
-msgstr "Expandir contactos _automáticamente"
-
-#: src/gtkprefs.c:912
-msgid "Show _buttons as:"
-msgstr "Mostrar los _botones como:"
-
-#: src/gtkprefs.c:914
-msgid "Pictures"
-msgstr "Imágenes"
-
-#: src/gtkprefs.c:915
-msgid "Text"
-msgstr "Texto"
-
-#: src/gtkprefs.c:916
-msgid "Pictures and text"
-msgstr "Imágenes y texto"
-
-#: src/gtkprefs.c:923
-msgid "Enable \"_slash\" commands"
-msgstr "Activar órdenes \"_barra\""
-
-#: src/gtkprefs.c:926
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Enviar órdenes «_slash» desconocidas como mensajes"
-
-#: src/gtkprefs.c:929
-msgid "Show _formatting toolbar"
-msgstr "Mostrar barra de _formato"
-
-#: src/gtkprefs.c:931
-msgid "Show _aliases in tabs/titles"
-msgstr "Mostrar _apodos en las solapas/títulos"
-
+#. All the tab options!
 #: src/gtkprefs.c:935
-msgid "Enable buddy ic_on animation"
-msgstr "Habilitar animaciones en los i_conos de amigos"
+msgid "Tab Options"
+msgstr "Opciones de las solapas"
 
 #: src/gtkprefs.c:937
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Notificar a los amigos cuando les esté escribiendo"
-
-#: src/gtkprefs.c:939
-msgid "_Raise IM window on events"
-msgstr "_Alzar ventanas de MI al recibir un evento"
-
-#: src/gtkprefs.c:942
-msgid "Raise chat _window on events"
-msgstr "Alzar _ventanas de chat al recibir un evento"
-
-#. All the tab options!
-#: src/gtkprefs.c:946
-msgid "Tab Options"
-msgstr "Opciones de las solapas"
-
-#: src/gtkprefs.c:948
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas distintas con solapas."
 
-#: src/gtkprefs.c:962
+#: src/gtkprefs.c:951
 #, fuzzy
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botones de _cierre en las solapas."
 
-#: src/gtkprefs.c:965
-msgid "Tab p_lacement:"
-msgstr "_Ubicación de las solapas:"
-
-#: src/gtkprefs.c:967
+#: src/gtkprefs.c:957
+#, fuzzy
+msgid "_Placement:"
+msgstr "_UbicaciónExt"
+
+#: src/gtkprefs.c:959
 msgid "Top"
 msgstr "Arriba"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:960
 msgid "Bottom"
 msgstr "Abajo"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:961
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:962
 msgid "Right"
 msgstr "Derecha"
 
-#: src/gtkprefs.c:976
-msgid "New conversation _placement:"
-msgstr "U_bicación de las nuevas conversaciones:"
-
-#: src/gtkprefs.c:1027 src/protocols/oscar/oscar.c:749
-#: src/protocols/oscar/oscar.c:5045
+#: src/gtkprefs.c:966
+#, fuzzy
+msgid "N_ew conversations:"
+msgstr "Cerrar conversación"
+
+#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
+#: src/protocols/oscar/oscar.c:5310
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1019
 msgid "_Autodetect IP Address"
 msgstr "_Autodetectar la dirección IP"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1028
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1052
 msgid "Ports"
 msgstr "Puertos"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1055
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará:"
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:1058
 msgid "_Start Port:"
 msgstr "Puerto _inicial:"
 
-#: src/gtkprefs.c:1075
+#: src/gtkprefs.c:1065
 msgid "_End Port:"
 msgstr "Puerto _final:"
 
-#: src/gtkprefs.c:1082
+#: src/gtkprefs.c:1072
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1076
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: src/gtkprefs.c:1148
+#: src/gtkprefs.c:1138
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1194
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1195
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1196
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1197
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1198
 msgid "Gnome Default"
 msgstr "Valores por omisión de Gnome"
 
-#: src/gtkprefs.c:1209
+#: src/gtkprefs.c:1199
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1200
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1211
+#: src/gtkprefs.c:1201
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1212
+#: src/gtkprefs.c:1202
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1211
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1264
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1268
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1275
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: src/gtkprefs.c:1285
+#: src/gtkprefs.c:1277
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: src/gtkprefs.c:1286
+#: src/gtkprefs.c:1278
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1280
 msgid "New tab"
 msgstr "Nueva pestaña"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1294
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4207,78 +4228,78 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1333
 msgid "Message Logs"
 msgstr "Registro de mensajes"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1336
 msgid "Log _Format:"
 msgstr "Formato de _registro:"
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1339
 msgid "_Log all instant messages"
 msgstr "Registrar _todos mensaje instantáneo"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1341
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: src/gtkprefs.c:1350
+#: src/gtkprefs.c:1344
 msgid "System Logs"
 msgstr "Registros del sistema"
 
-#: src/gtkprefs.c:1352
+#: src/gtkprefs.c:1346
 msgid "_Enable system log"
 msgstr "_Habilitar registro del sistema"
 
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1349
 #, fuzzy
 msgid "Log when buddies log in/log _out"
 msgstr "Registrar cuándo se _conectan/desconectan los amigos"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1355
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registrar cuándo los amigos están _activos/inactivos"
 
+#: src/gtkprefs.c:1361
+msgid "Log when buddies go away/come _back"
+msgstr "Registrar cuándo los amigos se ausentan/_regresan"
+
 #: src/gtkprefs.c:1367
-msgid "Log when buddies go away/come _back"
-msgstr "Registrar cuándo los amigos se ausentan/_regresan"
-
-#: src/gtkprefs.c:1373
 #, fuzzy
 msgid "Log your own _signons/idleness/awayness"
 msgstr "Registrar sus _propias conexiones/ausencias/inactividades"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1504
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
-#: src/gtkprefs.c:1561
+#: src/gtkprefs.c:1558
 msgid "Sound Method"
 msgstr "Método para reproducir sonidos"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1559
 msgid "_Method:"
 msgstr "_Método:"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1561
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: src/gtkprefs.c:1566
+#: src/gtkprefs.c:1563
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/gtkprefs.c:1573
+#: src/gtkprefs.c:1568
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1574
+#: src/gtkprefs.c:1569
 #, fuzzy
 msgid "No sounds"
 msgstr "Sonidos"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1577
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4287,102 +4308,99 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: src/gtkprefs.c:1609
+#: src/gtkprefs.c:1604
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1605
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversación obtiene el _foco"
 
-#: src/gtkprefs.c:1612
+#: src/gtkprefs.c:1607
 msgid "_Sounds while away"
 msgstr "_Sonidos mientras vd. está ausente"
 
-#: src/gtkprefs.c:1622
+#: src/gtkprefs.c:1617
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: src/gtkprefs.c:1673
+#: src/gtkprefs.c:1668
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1675
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: src/gtkprefs.c:1699
+#: src/gtkprefs.c:1694
 msgid "Test"
 msgstr "Probar"
 
-#: src/gtkprefs.c:1703
+#: src/gtkprefs.c:1698
 msgid "Reset"
 msgstr "Restablecer"
 
-#: src/gtkprefs.c:1707
+#: src/gtkprefs.c:1702
 msgid "Choose..."
 msgstr "Seleccionar..."
 
+#: src/gtkprefs.c:1758
+msgid "_Queue new messages when away"
+msgstr "En_colar mensajes nuevos durante las ausencias"
+
 #: src/gtkprefs.c:1761
-msgid "_Queue new messages when away"
-msgstr "En_colar mensajes nuevos durante las ausencias"
-
-#: src/gtkprefs.c:1764
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática"
 
-#: src/gtkprefs.c:1766
-msgid "Never"
-msgstr "Nunca"
-
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1764
 msgid "When away"
 msgstr "Cuando está ausente"
 
-#: src/gtkprefs.c:1768
-msgid "When away and idle"
+#: src/gtkprefs.c:1765
+#, fuzzy
+msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
-#: src/gtkprefs.c:1771 src/protocols/msn/msn.c:507
-#: src/protocols/msn/msn.c:1356 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4194
-#: src/protocols/yahoo/yahoo.c:2651 src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
+#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "Está inactivo"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1769
 msgid "Idle _time reporting:"
 msgstr "Informe de _tiempo de inactividad:"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1772
 msgid "Gaim usage"
 msgstr "Uso de Gaim"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1775
 msgid "X usage"
 msgstr "Uso de X"
 
-#: src/gtkprefs.c:1780
+#: src/gtkprefs.c:1777
 msgid "Windows usage"
 msgstr "Uso de Windows"
 
-#: src/gtkprefs.c:1788
+#: src/gtkprefs.c:1785
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: src/gtkprefs.c:1789
+#: src/gtkprefs.c:1786
 msgid "Set away _when idle"
 msgstr "Establecer como _ausente cuando esté inactivo"
 
-#: src/gtkprefs.c:1793
+#: src/gtkprefs.c:1790
 msgid "_Minutes before setting away:"
 msgstr "_Minutos antes de establecerlo como ausente:"
 
-#: src/gtkprefs.c:1801
+#: src/gtkprefs.c:1798
 msgid "Away m_essage:"
 msgstr "_Mensaje de ausencia:"
 
-#: src/gtkprefs.c:1859
+#: src/gtkprefs.c:1856
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4397,7 +4415,7 @@
 "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nombre del fichero:</span>\t%s"
 
-#: src/gtkprefs.c:1864
+#: src/gtkprefs.c:1861
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4412,137 +4430,129 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Nombre del fichero:</span>  %s"
 
-#: src/gtkprefs.c:2073
+#: src/gtkprefs.c:1996
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gtkprefs.c:2087
+#: src/gtkprefs.c:2010
 msgid "Summary"
 msgstr "Resumen"
 
-#: src/gtkprefs.c:2135
+#: src/gtkprefs.c:2058
 msgid "Details"
 msgstr "Detalles"
 
-#: src/gtkprefs.c:2177
-msgid "Interface"
-msgstr "Interfaz"
-
-#: src/gtkprefs.c:2180
-msgid "Message Text"
-msgstr "Texto de los mensajes"
-
-#: src/gtkprefs.c:2181
-msgid "Shortcuts"
-msgstr "Atajos"
-
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2101
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: src/gtkprefs.c:2183
+#: src/gtkprefs.c:2102
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/gtkprefs.c:2184
+#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
 msgid "Network"
 msgstr "Red"
 
-#: src/gtkprefs.c:2189
+#: src/gtkprefs.c:2108
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/gtkprefs.c:2192
+#: src/gtkprefs.c:2111
 msgid "Logging"
 msgstr "Registro"
 
-#: src/gtkprefs.c:2193
+#: src/gtkprefs.c:2112
 msgid "Away / Idle"
 msgstr "Ausencia / Inactividad"
 
-#: src/gtkprefs.c:2196
+#: src/gtkprefs.c:2115
 msgid "Plugins"
 msgstr "Complementos"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Permitir sólo a los usuarios en mi lista de amigos"
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Permitir sólo a los siguientes usuarios"
 
-#: src/gtkprivacy.c:81
-msgid "Block all users"
-msgstr "Bloquear todos los usuarios"
-
 #: src/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Bloquear todos los usuarios"
+
+#: src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Bloquear sólo los siguientes usuarios"
 
-#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1508
+#: src/gtkprivacy.c:398
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:411
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Los cambios a la configuración de privacidad tienen efecto inmediatamente."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:413
+#: src/gtkprivacy.c:423
 msgid "Set privacy for:"
 msgstr "Establecer privacidad para:"
 
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Permitir al usuario"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:590
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario al que le permita contactar con vd."
 
-#: src/gtkprivacy.c:584
+#: src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Introduzca el nombre de usuario al que quiere permitir que contacte con vd."
 
-#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:599
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "¿Permitir a %s contactar con vd.?"
 
-#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:601
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "¿Está seguro que quiere permitir que %s le contacte?"
 
-#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
+#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Bloquear al usuario"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:629
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."
 
-#: src/gtkprivacy.c:623
+#: src/gtkprivacy.c:630
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
+msgid "Block"
+msgstr "Bloquear"
+
+#: src/gtkprivacy.c:637
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "¿Está seguro de que quiere bloquear a %s?"
@@ -4550,42 +4560,44 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1235
+#: src/request.h:1257
 msgid "Yes"
 msgstr "Sí"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
-#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902
+#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1235
+#: src/request.h:1257
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:261
+#: src/gtkrequest.c:262
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:332
+#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gtkrequest.c:1483
+#: src/gtkrequest.c:1764
 msgid "That file already exists"
 msgstr "Ese fichero ya existe"
 
-#: src/gtkrequest.c:1484
+#: src/gtkrequest.c:1765
 msgid "Would you like to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"
 
-#: src/gtkrequest.c:1522 src/gtkrequest.c:1543
+#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
 msgid "Save File..."
 msgstr "Enviar archivo..."
 
-#: src/gtkrequest.c:1523 src/gtkrequest.c:1544
+#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
@@ -4598,53 +4610,119 @@
 msgid "_Get List"
 msgstr "Obtener la lista"
 
-#: src/gtksound.c:65
+#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
+msgid "Title"
+msgstr "Título"
+
+#: src/gtksavedstatuses.c:325
+msgid "Type"
+msgstr ""
+
+#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
+#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
+#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
+#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
+#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
+#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
+#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
+#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
+#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
+msgid "Message"
+msgstr "Mensaje"
+
+#: src/gtksavedstatuses.c:399
+#, fuzzy
+msgid "Saved Statuses"
+msgstr "Estado"
+
+#: src/gtksavedstatuses.c:520
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+#: src/gtksavedstatuses.c:611
+#, fuzzy
+msgid "Custom status"
+msgstr "Por estado"
+
+#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
+#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
+#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
+#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
+#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
+msgid "Status"
+msgstr "Estado"
+
+#: src/gtksavedstatuses.c:733
+#, fuzzy
+msgid "_Title:"
+msgstr "Título"
+
+#: src/gtksavedstatuses.c:744
+#, fuzzy
+msgid "Out of the office"
+msgstr "Sin memoria"
+
+#: src/gtksavedstatuses.c:755
+#, fuzzy
+msgid "_Status:"
+msgstr "Estado:"
+
+#. Custom status message disclosure
+#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
+msgid "Use a different status for some accounts"
+msgstr ""
+
+#: src/gtksound.c:60
 msgid "Buddy logs in"
 msgstr "Se conecta un amigo"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:61
 msgid "Buddy logs out"
 msgstr "Se desconecta un amigo"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:62
 msgid "Message received"
 msgstr "Se recibe un mensaje"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:63
 msgid "Message received begins conversation"
 msgstr "Se recibe un mensaje que comienza una conversación"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:64
 msgid "Message sent"
 msgstr "Se envía un mensaje"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:65
 msgid "Person enters chat"
 msgstr "Alguien entra al chat"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:66
 msgid "Person leaves chat"
 msgstr "Alguien deja el chat"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:67
 msgid "You talk in chat"
 msgstr "Usted habla en el chat"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:68
 msgid "Others talk in chat"
 msgstr "Otros hablan en el chat"
 
-#: src/gtksound.c:76
+#: src/gtksound.c:71
 msgid "Someone says your name in chat"
 msgstr "Alguien menciona su nombre en el chat"
 
-#: src/gtksound.c:180
+#: src/gtksound.c:257
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 "Imposible reproducir el sonido porque el archivo elegido (%s) no existe."
 
-#: src/gtksound.c:196
+#: src/gtksound.c:273
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4652,7 +4730,7 @@
 "Imposible reproducir el sonido porque se ha escogido el método de «Orden», "
 "pero no se ha especificado la orden."
 
-#: src/gtksound.c:208
+#: src/gtksound.c:285
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4661,85 +4739,134 @@
 "Imposible reproducir sonido porque el comando de sonido establecido no se ha "
 "podido lanzar: %s"
 
-#: src/gtkstock.c:88
+#: src/gtkstatusbox.c:132
+#, fuzzy
+msgid "Typing"
+msgstr "Ping"
+
+#. connect to the server
+#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
+#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
+#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
+#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
+msgid "Connecting"
+msgstr "Conectando"
+
+#. hacks
+#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
+#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
+#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2810 src/protocols/novell/novell.c:2948
+#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
+#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
+msgid "Available"
+msgstr "Disponible"
+
+#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
+#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
+#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
+msgid "Invisible"
+msgstr "Invisible"
+
+#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
+#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
+#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
+#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
+#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
+msgid "Offline"
+msgstr "Desconectado"
+
+#. TODO: Add saved statuses here?
+#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
+#, fuzzy
+msgid "New Status"
+msgstr "Estado"
+
+#: src/gtkstock.c:101
 msgid "_Alias"
 msgstr "_Apodo:"
 
-#: src/gtkstock.c:90
+#: src/gtkstock.c:103
 msgid "_Invite"
 msgstr "_Invitar"
 
-#: src/gtkstock.c:91
+#: src/gtkstock.c:104
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: src/gtkstock.c:92
+#: src/gtkstock.c:105
 msgid "_Open Mail"
 msgstr "_Abrir correo"
 
-#: src/gtkstock.c:94
+#: src/gtkstock.c:107
 msgid "_Warn"
 msgstr "_Avisar"
 
-#: src/gtkutils.c:1399 src/gtkutils.c:1424
+#: src/gtkutils.c:1386 src/gtkutils.c:1411
 #, fuzzy, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Ha ocurrido un error desconocido al conectarse: %s."
 
-#: src/gtkutils.c:1401 src/gtkutils.c:1426
+#: src/gtkutils.c:1388 src/gtkutils.c:1413
 #, fuzzy
 msgid "Failed to load image"
 msgstr "No se pudo almacenar la imagen: %s\n"
 
-#: src/gtkutils.c:1487
+#: src/gtkutils.c:1488
 #, fuzzy, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar el fichero."
 
-#: src/gtkutils.c:1489
+#: src/gtkutils.c:1490
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
 
-#: src/gtkutils.c:1516 src/gtkutils.c:1525 src/gtkutils.c:1530
+#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
 #, fuzzy
 msgid "You have dragged an image"
 msgstr "El nombre de usuario que ha introducido no es válido"
 
-#: src/gtkutils.c:1517
+#: src/gtkutils.c:1519
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: src/gtkutils.c:1521 src/gtkutils.c:1536
+#: src/gtkutils.c:1523 src/gtkutils.c:1538
 #, fuzzy
 msgid "Set as buddy icon"
 msgstr "Mostrar _iconos de los amigos"
 
-#: src/gtkutils.c:1522 src/gtkutils.c:1537
+#: src/gtkutils.c:1524 src/gtkutils.c:1539
 #, fuzzy
 msgid "Send image file"
 msgstr "Enviar mensaje"
 
-#: src/gtkutils.c:1523 src/gtkutils.c:1537
+#: src/gtkutils.c:1525 src/gtkutils.c:1539
 #, fuzzy
 msgid "Insert in message"
 msgstr "Insertar imagen"
 
-#: src/gtkutils.c:1526
+#: src/gtkutils.c:1528
 #, fuzzy
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "¿Desea unirse a la conversación?"
 
-#: src/gtkutils.c:1531
-msgid ""
-"You can send this image as a file transfer orembed it into this message, or "
+#: src/gtkutils.c:1533
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: src/gtkutils.c:1533
+#: src/gtkutils.c:1535
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4750,27 +4877,27 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1587
+#: src/gtkutils.c:1589
 #, fuzzy
 msgid "Cannot send launcher"
 msgstr "No se puede enviar el fichero."
 
-#: src/gtkutils.c:1587
+#: src/gtkutils.c:1589
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: src/log.c:104
+#: src/log.c:105
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">El registro no tiene función de lectura</font></b>"
 
-#: src/log.c:528
+#: src/log.c:746
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:591
+#: src/log.c:811
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4779,7 +4906,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:593
+#: src/log.c:813
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4788,30 +4915,30 @@
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:644 src/log.c:774
+#: src/log.c:864 src/log.c:995
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>¡No se pudo encontrar la ruta del registro!</b></font>"
 
-#: src/log.c:654 src/log.c:786
+#: src/log.c:874 src/log.c:1007
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 
-#: src/log.c:658
+#: src/log.c:878
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:719
+#: src/log.c:940
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
 
-#: src/log.c:790
+#: src/log.c:1011
 msgid "Plain text"
 msgstr "En claro"
 
-#: src/plugin.c:304
+#: src/plugin.c:324
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4820,29 +4947,19 @@
 "No se encontró el complemento necesario %s. Por favor, instale este "
 "complemento e inténtelo de nuevo."
 
-#: src/plugin.c:309 src/plugin.c:337
+#: src/plugin.c:329 src/plugin.c:357
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim no pudo cargar su complemento."
 
-#: src/plugin.c:333
+#: src/plugin.c:353
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No se pudo cargar el complemento necesario %s."
 
-#: src/prefs.c:114
+#: src/prefs.c:1094
 msgid "Slightly less boring default"
 msgstr "Opción por omisión un poco menos aburrida"
 
-#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:165
-#: src/protocols/msn/msn.c:538 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2808
-#: src/protocols/novell/novell.c:2927 src/protocols/novell/novell.c:2978
-#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6876
-#: src/protocols/yahoo/yahoo.c:3128
-msgid "Available"
-msgstr "Disponible"
-
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "Disponible sólo para los amigos"
@@ -4851,244 +4968,239 @@
 msgid "Away for friends only"
 msgstr "Ausente sólo para los amigos"
 
-#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
-#: src/protocols/oscar/oscar.c:6890 src/protocols/yahoo/yahoo.c:2649
-#: src/protocols/yahoo/yahoo.c:3172
-msgid "Invisible"
-msgstr "Invisible"
-
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "Invisible sólo para los amigos"
 
-#: src/protocols/gg/gg.c:56
+#: src/protocols/gg/gg.c:56 src/status.c:157
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: src/protocols/gg/gg.c:137
+#: src/protocols/gg/gg.c:151
 msgid "Unable to resolve hostname."
 msgstr "No se pudo resolver el nombre del servidor."
 
-#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
-#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
-#: src/protocols/jabber/jabber.c:108
+#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
+#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
+#: src/protocols/jabber/jabber.c:109
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."
 
-#: src/protocols/gg/gg.c:146
+#: src/protocols/gg/gg.c:160
 msgid "Error while reading from socket."
 msgstr "Error al leer del socket."
 
-#: src/protocols/gg/gg.c:149
+#: src/protocols/gg/gg.c:163
 msgid "Error while writing to socket."
 msgstr "Error al escribir al socket."
 
-#: src/protocols/gg/gg.c:152
+#: src/protocols/gg/gg.c:166
 msgid "Authentication failed."
 msgstr "Falló la autenticación."
 
-#: src/protocols/gg/gg.c:155
+#: src/protocols/gg/gg.c:169
 msgid "Unknown Error Code."
 msgstr "Código de error desconocido."
 
-#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:3994
+#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:234 src/protocols/gg/gg.c:1075
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3998
-#: src/protocols/oscar/oscar.c:4223 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
+#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
+#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
+#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
+#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
 msgid "Buddy Information"
 msgstr "Información de amigos"
 
-#: src/protocols/gg/gg.c:268 src/protocols/irc/irc.c:157
-#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:970
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556
-#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739
-#: src/protocols/oscar/oscar.c:6672 src/protocols/oscar/oscar.c:6866
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2653
-#: src/protocols/yahoo/yahoo.c:3122
-msgid "Offline"
-msgstr "Desconectado"
-
-#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284
-#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296
-#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308
-#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:170
-#: src/protocols/jabber/jabber.c:970 src/protocols/jabber/jabber.c:976
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6877
-#: src/protocols/oscar/oscar.c:6884 src/protocols/yahoo/yahoo.c:3134
-#: src/protocols/yahoo/yahoo.c:3168 src/protocols/zephyr/zephyr.c:2226
-msgid "Message"
-msgstr "Mensaje"
-
-#: src/protocols/gg/gg.c:327
+#. TODO: Do we need both an "online" and an "available" state?
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
+#.
+#: src/protocols/gg/gg.c:310 src/protocols/irc/irc.c:172
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
+#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
+#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
+#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
+#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
+msgid "Online"
+msgstr "Conectado"
+
+#: src/protocols/gg/gg.c:365
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: src/protocols/gg/gg.c:481
+#: src/protocols/gg/gg.c:519
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/gg/gg.c:488
+#: src/protocols/gg/gg.c:526
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486
-#: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2309
-#: src/protocols/yahoo/yahoo.c:2372 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
+#: src/protocols/gg/gg.c:818 src/protocols/napster/napster.c:502
+#: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
+#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
 msgid "Unable to connect."
 msgstr "No se pudo conectar."
 
-#: src/protocols/gg/gg.c:754
+#: src/protocols/gg/gg.c:834
 msgid "Reading data"
 msgstr "Leyendo datos"
 
-#: src/protocols/gg/gg.c:757
+#: src/protocols/gg/gg.c:837
 msgid "Balancer handshake"
 msgstr "Negociación del balanceador"
 
-#: src/protocols/gg/gg.c:760
+#: src/protocols/gg/gg.c:840
 msgid "Reading server key"
 msgstr "Leyendo la clave del servidor"
 
-#: src/protocols/gg/gg.c:763
+#: src/protocols/gg/gg.c:843
 msgid "Exchanging key hash"
 msgstr "Intercambiando el hash de la clave"
 
-#: src/protocols/gg/gg.c:773
+#: src/protocols/gg/gg.c:853
 msgid "Critical error in GG library\n"
 msgstr "Error crítico en la biblioteca GG\n"
 
-#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882
-#: src/protocols/toc/toc.c:147
+#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
+#: src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Falló la conexión a %s"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:921
 msgid "Unable to ping server"
 msgstr "No se pudo hacer ping al servidor"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:933
 msgid "Send as message"
 msgstr "Enviar como mensaje"
 
-#: src/protocols/gg/gg.c:856
+#: src/protocols/gg/gg.c:938
 msgid "Looking up GG server"
 msgstr "Buscando servidor GG"
 
-#: src/protocols/gg/gg.c:859
+#: src/protocols/gg/gg.c:941
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "El UIN Gadu-Gadu especificado es inválido"
 
-#: src/protocols/gg/gg.c:906
+#: src/protocols/gg/gg.c:987
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Está intentando enviar un mensaje a un UIN Gadu-Gadu inválido."
 
-#: src/protocols/gg/gg.c:981
+#: src/protocols/gg/gg.c:1040
 msgid "Couldn't get search results"
 msgstr "No se pudieron obtener los resultados de la búsqueda"
 
-#: src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:1045
 msgid "Gadu-Gadu Search Engine"
 msgstr "Motor de búsquedas de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1012
+#: src/protocols/gg/gg.c:1071
 msgid "Active"
 msgstr "Activo"
 
-#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5037
+#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:5048 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "Nombre"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:5049 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1085 src/protocols/jabber/jabber.c:633
+#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5038
+#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
+#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
 #: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "Apodo"
 
-#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040
+#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
 msgid "Birth Year"
 msgstr "Año de nacimiento"
 
-#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048
-#: src/protocols/gg/gg.c:1050
+#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
+#: src/protocols/gg/gg.c:1109
 msgid "Sex"
 msgstr "Sexo"
 
 #. City
-#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:636
-#: src/protocols/oscar/oscar.c:5092 src/protocols/oscar/oscar.c:5100
+#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
+#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "Ciudad"
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1156
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "No hay una lista de amigos almacenada en el servidor Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:1105
+#: src/protocols/gg/gg.c:1164
 msgid "Couldn't Import Buddy List from Server"
 msgstr "No se pudo importar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1167
+#: src/protocols/gg/gg.c:1226
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Se envío la lista de amigos correctamente al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1175
+#: src/protocols/gg/gg.c:1234
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "No se pudo enviar la lista de amigos al servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1183
+#: src/protocols/gg/gg.c:1242
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "La lista de amigos se borró correctamente del servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1191
+#: src/protocols/gg/gg.c:1250
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "No se pudo borrar la lista de amigos del servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1200
+#: src/protocols/gg/gg.c:1259
 msgid "Password changed successfully"
 msgstr "Se cambió con éxito la contraseña"
 
-#: src/protocols/gg/gg.c:1207
+#: src/protocols/gg/gg.c:1266
 msgid "Password couldn't be changed"
 msgstr "No se pudo cambiar la contraseña"
 
-#: src/protocols/gg/gg.c:1326
+#: src/protocols/gg/gg.c:1385
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error comunicándose con el servidor Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1327
+#: src/protocols/gg/gg.c:1386
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -5096,11 +5208,11 @@
 "Gaim no pudo completar su petición debido a problemas al comunicarse con el "
 "servidor HTTP de Gadu-Gadu.  Vuelva a intentarlo más tarde."
 
-#: src/protocols/gg/gg.c:1356
+#: src/protocols/gg/gg.c:1415
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "No se pudo importar la lista de amigos de Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1416
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -5108,26 +5220,26 @@
 "Gaim no pudo conectarse con el servidor de listas de amigos Gadu-Gadu.  Por "
 "favor inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1430
+#: src/protocols/gg/gg.c:1489
 msgid "Couldn't export buddy list"
 msgstr "No se pudo exportar la lista de amigos"
 
-#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454
+#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim no pudo conectarse con el servidor de listas de amigos.  Por favor, "
 "inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1453
+#: src/protocols/gg/gg.c:1512
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "No se pudo borrar la lista de amigos Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1504
+#: src/protocols/gg/gg.c:1563
 msgid "Unable to access directory"
 msgstr "No se pudo acceder al directorio"
 
-#: src/protocols/gg/gg.c:1505
+#: src/protocols/gg/gg.c:1564
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -5135,11 +5247,11 @@
 "Gaim no pudo buscar en el directorio porque no pudo conectarse con el "
 "servidor de directorio. Por favor, inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1539
+#: src/protocols/gg/gg.c:1598
 msgid "Unable to change Gadu-Gadu password"
 msgstr "No se pudo cambiar la contraseña Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1540
+#: src/protocols/gg/gg.c:1599
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -5147,33 +5259,33 @@
 "Gaim no pudo cambiar su contraseña porque no pudo conectarse con el servidor "
 "Gadu-Gadu. Por favor, inténtelo más tarde."
 
-#: src/protocols/gg/gg.c:1556
+#: src/protocols/gg/gg.c:1615
 msgid "Directory Search"
 msgstr "Búsqueda en el directorio"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1104
-#: src/protocols/toc/toc.c:1571
+#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
+#: src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: src/protocols/gg/gg.c:1565
+#: src/protocols/gg/gg.c:1624
 msgid "Import Buddy List from Server"
 msgstr "Importar la lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1569
+#: src/protocols/gg/gg.c:1628
 msgid "Export Buddy List to Server"
 msgstr "Exportar lista de amigos al servidor"
 
-#: src/protocols/gg/gg.c:1573
+#: src/protocols/gg/gg.c:1632
 msgid "Delete Buddy List from Server"
 msgstr "Borrar lista de amigos del servidor"
 
-#: src/protocols/gg/gg.c:1606
+#: src/protocols/gg/gg.c:1665
 msgid "Unable to access user profile."
 msgstr "No se pudo acceder al perfil del usuario."
 
-#: src/protocols/gg/gg.c:1607
+#: src/protocols/gg/gg.c:1666
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5192,102 +5304,121 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756
+#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocol Gadu-Gadu"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
-#: src/protocols/silc/silc.c:1018
+#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1030
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
-#: src/protocols/silc/silc.c:1022
+#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1034
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
-#: src/protocols/yahoo/yahoo_filexfer.c:179
-#: src/protocols/yahoo/yahoo_filexfer.c:188
-#: src/protocols/yahoo/yahoo_filexfer.c:198
-msgid "File Transfer Aborted"
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
+#: src/protocols/yahoo/yahoo_filexfer.c:185
+#: src/protocols/yahoo/yahoo_filexfer.c:194
+#, fuzzy
+msgid "File Transfer Failed"
 msgstr "Transferencia de fichero abortada"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "Gaim no pudo abrir un puerto de escucha."
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Error al mostrar el MOTD"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "No hay MOTD disponible"
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "No hay MOTD asociado con esta conexión."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:412
+#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
+#: src/protocols/irc/irc.c:552
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
-#: src/protocols/irc/irc.c:181
+#: src/protocols/irc/irc.c:192
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: src/protocols/irc/irc.c:193 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: src/protocols/irc/irc.c:198 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "Contra_seña:"
 
-#: src/protocols/irc/irc.c:230
+#: src/protocols/irc/irc.c:242
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
-#: src/protocols/irc/irc.c:249
-#, fuzzy, c-format
-msgid "Logging in: %s"
-msgstr "Registrándose"
-
-#: src/protocols/irc/irc.c:258
+#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
+#: src/protocols/jabber/jabber.c:745
+msgid "SSL support unavailable"
+msgstr "Soporte SSL no disponible"
+
+#: src/protocols/irc/irc.c:281
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"
 
-#: src/protocols/irc/irc.c:273 src/protocols/jabber/jabber.c:301
-#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1757
+#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
+#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: src/protocols/irc/irc.c:409 src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
+msgid "Connection Failed"
+msgstr "Falló la conexión"
+
+#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
+msgid "SSL Handshake Failed"
+msgstr "Falló en la negociación SSL"
+
+#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
+#: src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1373
-#: src/protocols/yahoo/yahoochat.c:1398
+#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1400
 msgid "Users"
 msgstr "Usuarios"
 
-#: src/protocols/irc/irc.c:567 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1407
+#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
 msgid "Topic"
 msgstr "Tema"
 
+#: src/protocols/irc/irc.c:738
+msgid "IRC"
+msgstr ""
+
+#: src/protocols/irc/irc.c:742
+#, fuzzy
+msgid "Quit message"
+msgstr "(1 mensaje)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5296,220 +5427,249 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:674
+#: src/protocols/irc/irc.c:828
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:675
+#: src/protocols/irc/irc.c:829
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin de protocolo IRC menos malo"
 
-#: src/protocols/irc/irc.c:694 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1621 src/protocols/napster/napster.c:691
+#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
+#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
 #: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "Servidor"
 
-#: src/protocols/irc/irc.c:697 src/protocols/jabber/jabber.c:1642
-#: src/protocols/msn/msn.c:1961 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
+#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
+#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "Puerto"
 
-#: src/protocols/irc/irc.c:700
+#: src/protocols/irc/irc.c:854
 #, fuzzy
 msgid "Encodings"
 msgstr "Codificación"
 
-#: src/protocols/irc/irc.c:703 src/protocols/irc/msgs.c:195
-#: src/protocols/jabber/jabber.c:596 src/protocols/silc/buddy.c:1450
+#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
+#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
 #: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
 #: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "Nombre de usuario:"
 
-#: src/protocols/irc/irc.c:706
+#: src/protocols/irc/irc.c:860
 #, fuzzy
 msgid "Real name"
 msgstr "Nombre real"
 
-#: src/protocols/irc/msgs.c:97
+#: src/protocols/irc/irc.c:863
+msgid "Use SSL"
+msgstr "Usar SSL"
+
+#: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
 msgstr "Modo erróneo"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/irc/msgs.c:108
+#: src/protocols/irc/msgs.c:116
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ha sido expulsado de %s."
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:117
 msgid "Banned"
 msgstr "Expulsado"
 
-#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:134
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:184
+#: src/protocols/irc/msgs.c:217
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:185
+#: src/protocols/irc/msgs.c:218
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
-#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1356 src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
+#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
+#: src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
+#: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Realname"
 msgstr "Nombre real"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:245
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactivo desde:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:247
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:250
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adjetivo que lo define:</b> Glorioso</b>"
 
-#: src/protocols/irc/msgs.c:224
+#: src/protocols/irc/msgs.c:257
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Información de amigo para %s:"
 
-#: src/protocols/irc/msgs.c:286
+#: src/protocols/irc/msgs.c:320
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: src/protocols/irc/msgs.c:291
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: src/protocols/irc/msgs.c:308
+#: src/protocols/irc/msgs.c:342
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:343
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: src/protocols/irc/msgs.c:309
+#: src/protocols/irc/msgs.c:343
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ha enviado un mensaje que el servidor IRC no pudo entender."
 
-#: src/protocols/irc/msgs.c:332
+#: src/protocols/irc/msgs.c:366
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:463
+#, fuzzy
+msgid "Time Response"
+msgstr "Zona horaria"
+
+#: src/protocols/irc/msgs.c:464
+msgid "The IRC server's local time is:"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:475
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:437
+#: src/protocols/irc/msgs.c:486
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: src/protocols/irc/msgs.c:440
+#: src/protocols/irc/msgs.c:489
 msgid "User is not logged in"
 msgstr "El usuario no está conectado"
 
-#: src/protocols/irc/msgs.c:445
+#: src/protocols/irc/msgs.c:494
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:514
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: src/protocols/irc/msgs.c:521
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitación."
 
-#: src/protocols/irc/msgs.c:522
+#: src/protocols/irc/msgs.c:571
 msgid "Invitation only"
 msgstr "Sólo con invitación."
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:673
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:678
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: src/protocols/irc/msgs.c:649
+#: src/protocols/irc/msgs.c:702
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: src/protocols/irc/msgs.c:758
+#: src/protocols/irc/msgs.c:786
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+#: src/protocols/irc/msgs.c:825
+msgid "Cannot change nick"
+msgstr "No se puede cambiar el alias"
+
+#: src/protocols/irc/msgs.c:825
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: src/protocols/irc/msgs.c:759
-msgid "Cannot change nick"
-msgstr "No se puede cambiar el alias"
-
-#: src/protocols/irc/msgs.c:780
+#: src/protocols/irc/msgs.c:846
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: src/protocols/irc/msgs.c:820
+#: src/protocols/irc/msgs.c:888
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inválido del servidor"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:890
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: src/protocols/irc/msgs.c:897
+#: src/protocols/irc/msgs.c:965
 #, c-format
 msgid "Cannot join %s:"
 msgstr "No se puede unir a %s:"
 
-#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: src/protocols/irc/msgs.c:934
+#: src/protocols/irc/msgs.c:1000
+#, fuzzy
+msgid "Nick or channel is temporarily unavailable."
+msgstr "Servicio temporalmente no disponible."
+
+#: src/protocols/irc/msgs.c:1012
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
 
-#: src/protocols/irc/parse.c:110
+#: src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acción a realizar&gt;: Realiza una acción."
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5517,7 +5677,7 @@
 "away [mensaje]:  Fija el mensaje cuando se está ausente, o no utilizar un "
 "mensaje al dejar de estar ausente."
 
-#: src/protocols/irc/parse.c:112
+#: src/protocols/irc/parse.c:116
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5525,7 +5685,7 @@
 "deop &lt;apodo1&gt; [apodo2] ....: Quitarle a alguien el estado de operador "
 "de canal. Sólo un operador de canal puede hacerlo."
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:117
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5535,7 +5695,7 @@
 "hablar en el canal si éste está moderado (+m). Sólo lo puede hacer un "
 "operador de canal."
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:118
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5543,7 +5703,7 @@
 "invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal "
 "especificado o al canal actual."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:119
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5551,7 +5711,7 @@
 "j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o más "
 "canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:120
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5559,7 +5719,7 @@
 "join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o "
 "más canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:121
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5567,7 +5727,7 @@
 "kick &lt;apodo&gt; [mensaje]:  Echar a alguien del canal. Sólo lo pueden "
 "hacer los operadores de canal."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:122
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5575,19 +5735,20 @@
 "list:  Mostrar una lista de las salas de chat disponibles en la red. "
 "<i>Aviso: algunos servidores puede que le desconecten si hace ésto.</i>"
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:123
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acción a realizar&gt;:  Realizar una acción."
 
-#: src/protocols/irc/parse.c:120
-msgid ""
-"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+#: src/protocols/irc/parse.c:124
+#, fuzzy
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;apodo|canal&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Fija o elimina un modo "
 "de canal o de usuario."
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:125
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5595,16 +5756,16 @@
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:126
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [canal]:  Obtener la lista de los usuarios que están en el canal."
 
-#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1452
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1465
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:128
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5612,7 +5773,7 @@
 "op &lt;apodo1&gt; [apodo2] ...:  Dar estatus de operador de canal a otra "
 "persona. Sólo lo puede hacer un operador de canal."
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:129
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5620,7 +5781,7 @@
 "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
 "utilizarlo."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:130
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5628,7 +5789,7 @@
 "part [sala] [mensaje]:  Abandonar el canal actual, o un canal específico, "
 "con el mensaje opcional."
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:131
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5636,7 +5797,7 @@
 "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
 "no se especifica un usuario)."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:132
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5644,17 +5805,17 @@
 "query &lt;apodo&gt; &lt;mensaje&gt;:  Envía un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:133
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual indicando un mensaje "
 "(opcional)."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:134
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crudo al servidor."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:135
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5662,16 +5823,20 @@
 "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. Sólo puede "
 "hacerlo un operador de canal."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:136
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+#: src/protocols/irc/parse.c:137
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuevo tema]:  Muestra o cambia el tema del canal."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:138
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:139
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5679,51 +5844,59 @@
 "voice &lt;apodo1&gt; [apodo2] ...:  Dar la posibilidad de hablar en el canal "
 "a alguien. Sólo lo puede hacer un operador de canal."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:140
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
 
-#: src/protocols/irc/parse.c:136
-msgid "whois &lt;nick&gt;:  Get information on a user."
+#: src/protocols/irc/parse.c:141
+#, fuzzy
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;apodo&gt;:  Obtiene información de un usuario."
 
-#: src/protocols/irc/parse.c:414
+#: src/protocols/irc/parse.c:422
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:423
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:415
+#: src/protocols/irc/parse.c:423
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522
-#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:189
-#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
-#: src/protocols/toc/toc.c:690
+#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
+#: src/protocols/oscar/oscar.c:1648 src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Desconectado."
 
 #: src/protocols/jabber/auth.c:51
-msgid "Server requires SSL for login"
+msgid ""
+"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+"account properties"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:53
+#, fuzzy
+msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "El servidor requiere SSL para conectarse"
 
-#: src/protocols/jabber/auth.c:111
+#: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"
 
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Autenticación en texto claro"
 
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5731,105 +5904,100 @@
 "El servidor solicita autenticación en claro sobre un canal no cifrado. "
 "¿Permitir ésto y continuar con el proceso de autenticación?"
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido."
 
-#: src/protocols/jabber/auth.c:386
+#: src/protocols/jabber/auth.c:396
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686
-#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1346
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:822
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
 #: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1002
+#: src/protocols/yahoo/yahoo_profile.c:1009
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:656
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
 msgid "Street Address"
 msgstr "Calle"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
 msgid "Locality"
 msgstr "Localidad"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
 msgid "Region"
 msgstr "Región"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/jabber.c:653
 msgid "Postal Code"
 msgstr "Código postal"
 
 #. Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
-#: src/protocols/jabber/buddy.c:749
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
+#: src/protocols/jabber/buddy.c:755
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760
-#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662
-#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
+#: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:783
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
 msgid "Organization Name"
 msgstr "Nombre de la organización"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:793
-#: src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Título"
-
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689
-#: src/protocols/oscar/oscar.c:5073
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
+#: src/protocols/oscar/oscar.c:5338
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard de Jabber"
 
-#: src/protocols/jabber/buddy.c:561
+#: src/protocols/jabber/buddy.c:565
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5837,607 +6005,576 @@
 "Todos los campos siguientes son opcionales. Introduzca sólo la información "
 "con la que se sienta cómodo."
 
-#: src/protocols/jabber/buddy.c:604
+#: src/protocols/jabber/buddy.c:610
 msgid "Jabber ID"
 msgstr "ID Jabber"
 
-#: src/protocols/jabber/buddy.c:614 src/protocols/jabber/buddy.c:621
-#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:949
-#: src/protocols/msn/msn.c:505 src/protocols/novell/novell.c:2830
-#: src/protocols/novell/novell.c:2834 src/protocols/oscar/oscar.c:731
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
-#: src/protocols/yahoo/yahoo.c:2774
-msgid "Status"
-msgstr "Estado"
-
-#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1624
+#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
 msgid "Resource"
 msgstr "Recurso"
 
-#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:631
-#: src/protocols/oscar/oscar.c:5091 src/protocols/oscar/oscar.c:5099
+#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
+#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Dirección"
 
-#: src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/buddy.c:712
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:824
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:812
+#: src/protocols/jabber/buddy.c:824
 msgid "Logo"
 msgstr "Logotipo"
 
-#: src/protocols/jabber/buddy.c:834
+#: src/protocols/jabber/buddy.c:849
 msgid "Jabber Profile"
 msgstr "Perfil Jabber"
 
-#: src/protocols/jabber/buddy.c:1016
+#: src/protocols/jabber/buddy.c:1031
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: src/protocols/jabber/buddy.c:1019
+#: src/protocols/jabber/buddy.c:1034
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1026
+#: src/protocols/jabber/buddy.c:1041
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: src/protocols/jabber/buddy.c:1032
+#: src/protocols/jabber/buddy.c:1047
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1040
+#: src/protocols/jabber/buddy.c:1055
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669
-#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
 #: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:981
+#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
 msgid "Chatty"
 msgstr "Hablador"
 
-#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
+#: src/status.c:160
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:999
-#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6910
+#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
+#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6371
-#: src/protocols/yahoo/yahoochat.c:1003
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
+#: src/protocols/yahoo/yahoochat.c:995
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: src/protocols/jabber/chat.c:46
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "S_ervidor:"
 
-#: src/protocols/jabber/chat.c:51
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: src/protocols/jabber/chat.c:217
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no es un nombre de sala válido"
 
-#: src/protocols/jabber/chat.c:218
+#: src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nombre de sala inválido"
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no es un nombre de servidor válido"
 
-#: src/protocols/jabber/chat.c:224 src/protocols/jabber/chat.c:225
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no es un indicador de sala válido"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Indicador de sala inválido"
 
-#: src/protocols/jabber/chat.c:387
+#: src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Error de configuración"
 
-#: src/protocols/jabber/chat.c:396 src/protocols/jabber/chat.c:541
+#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "No se pudo configurar"
 
-#: src/protocols/jabber/chat.c:412
+#: src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Error de configuración de sala"
 
-#: src/protocols/jabber/chat.c:413
+#: src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Esta sala no es capaz de ser configurada"
 
-#: src/protocols/jabber/chat.c:463 src/protocols/jabber/chat.c:532
+#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Error de registro"
 
-#: src/protocols/jabber/chat.c:620
+#: src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "El cambio de apodo no está soportado en salas de chat no-MUC"
 
-#: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
+#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
 #: src/protocols/silc/ops.c:1239
 #, fuzzy
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
 
-#: src/protocols/jabber/chat.c:729
+#: src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Nombre de servidor no válido"
 
-#: src/protocols/jabber/chat.c:767
+#: src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Introducir un servidor de conferencias"
 
-#: src/protocols/jabber/chat.c:768
+#: src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Selecciona un servidor de conferencias al que consultar"
 
-#: src/protocols/jabber/chat.c:771
+#: src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: src/protocols/jabber/jabber.c:77
+#: src/protocols/jabber/jabber.c:78
 msgid "Error initializing session"
 msgstr "Error al inicializar la sesión"
 
-#: src/protocols/jabber/jabber.c:210 src/protocols/msn/httpmethod.c:266
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699
-#: src/protocols/trepia/trepia.c:990 src/protocols/trepia/trepia.c:1034
-#: src/protocols/trepia/trepia.c:1133 src/protocols/trepia/trepia.c:1179
+#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
+#: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
+#: src/protocols/trepia/trepia.c:1181
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: src/protocols/jabber/jabber.c:248 src/protocols/jabber/jabber.c:268
+#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: src/protocols/jabber/jabber.c:328
-msgid "Connection Failed"
-msgstr "Falló la conexión"
-
-#: src/protocols/jabber/jabber.c:331
-msgid "SSL Handshake Failed"
-msgstr "Falló en la negociación SSL"
-
-#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708
+#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738
-msgid "SSL support unavailable"
-msgstr "Soporte SSL no disponible"
-
-#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
+#: src/protocols/trepia/trepia.c:1075
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: src/protocols/jabber/jabber.c:441
+#: src/protocols/jabber/jabber.c:448
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
+#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
 msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565
+#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1078
+#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/protocols/jabber/jabber.c:611
+#: src/protocols/jabber/jabber.c:618
 msgid "E-Mail"
 msgstr "Correo electrónico"
 
 #. State
-#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5093
-#: src/protocols/oscar/oscar.c:5101 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Estado"
 
-#: src/protocols/jabber/jabber.c:651 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Teléfono"
 
-#: src/protocols/jabber/jabber.c:661
+#: src/protocols/jabber/jabber.c:668
 msgid "Date"
 msgstr "Fecha"
 
-#: src/protocols/jabber/jabber.c:669
+#: src/protocols/jabber/jabber.c:676
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."
 
-#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673
+#: src/protocols/jabber/jabber.c:679 src/protocols/jabber/jabber.c:680
 msgid "Register New Jabber Account"
 msgstr "Registrando cuenta nueva de Jabber"
 
-#. connect to the server
-#: src/protocols/jabber/jabber.c:800 src/protocols/msn/msn.c:697
-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
-#: src/protocols/oscar/oscar.c:1761 src/protocols/trepia/trepia.c:1067
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/zephyr/zephyr.c:1492
-msgid "Connecting"
-msgstr "Conectando"
-
-#: src/protocols/jabber/jabber.c:804
+#: src/protocols/jabber/jabber.c:811
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: src/protocols/jabber/jabber.c:810
+#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/protocols/jabber/jabber.c:819
+#: src/protocols/jabber/jabber.c:826
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: src/protocols/jabber/jabber.c:891 src/protocols/jabber/jabber.c:1201
-#: src/protocols/jabber/jabber.c:1242 src/protocols/jabber/jabber.c:1275
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6670
+#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
+#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: src/protocols/jabber/jabber.c:924
+#: src/protocols/jabber/jabber.c:930
 msgid "Both"
 msgstr "Ambos"
 
-#: src/protocols/jabber/jabber.c:926
+#: src/protocols/jabber/jabber.c:932
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: src/protocols/jabber/jabber.c:928
+#: src/protocols/jabber/jabber.c:934
 msgid "From"
 msgstr "De"
 
-#: src/protocols/jabber/jabber.c:931
+#: src/protocols/jabber/jabber.c:937
 msgid "To"
 msgstr "A"
 
-#: src/protocols/jabber/jabber.c:933
+#: src/protocols/jabber/jabber.c:939
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:943
 msgid "Subscription"
 msgstr "Subscripción"
 
-#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:981
-#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jabber.c:993
-#: src/protocols/jabber/jabber.c:999
+#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
 #, fuzzy
 msgid "Priority"
 msgstr "Puerto"
 
-#: src/protocols/jabber/jabber.c:1021
+#: src/protocols/jabber/jabber.c:1034
 msgid "Password Changed"
 msgstr "Contraseña modificada"
 
-#: src/protocols/jabber/jabber.c:1022
+#: src/protocols/jabber/jabber.c:1035
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: src/protocols/jabber/jabber.c:1026 src/protocols/jabber/jabber.c:1027
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: src/protocols/jabber/jabber.c:1083
+#: src/protocols/jabber/jabber.c:1096
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: src/protocols/jabber/jabber.c:1088 src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
 msgid "Change Jabber Password"
 msgstr "Cambiar contraseña de Jabber"
 
-#: src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1102
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: src/protocols/jabber/jabber.c:1099 src/protocols/toc/toc.c:1561
+#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Establecer información de usuario"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1194
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1196
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1198
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1200
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: src/protocols/jabber/jabber.c:1189
+#: src/protocols/jabber/jabber.c:1202
 msgid "Gone"
 msgstr "Se fue"
 
-#: src/protocols/jabber/jabber.c:1191 src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1206
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1208
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1210
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1212
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1216
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1218
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1222
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1224
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1226
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1228
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1230
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1232
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1234
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1241
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1243
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1246
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1249
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1252
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1257
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1259
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1263
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1265
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1268
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: src/protocols/jabber/jabber.c:1257 src/protocols/silc/ops.c:1509
+#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1272
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1274
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1276
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1280
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1282
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"
 
-#: src/protocols/jabber/jabber.c:1271
+#: src/protocols/jabber/jabber.c:1284
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1286
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1290
 msgid "Policy Violation"
 msgstr "Violación de la política"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1292
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1294
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: src/protocols/jabber/jabber.c:1283
+#: src/protocols/jabber/jabber.c:1296
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1298
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1300
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1302
 msgid "Undefined Condition"
 msgstr "Condición no definida"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1304
 msgid "Unsupported Encoding"
 msgstr "Codificación no soportada"
 
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1306
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"
 
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1308
 msgid "Unsupported Version"
 msgstr "Versión no soportada"
 
-#: src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1310
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:1312
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1379
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s."
 
-#: src/protocols/jabber/jabber.c:1418
+#: src/protocols/jabber/jabber.c:1431
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s."
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1457
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat"
 
-#: src/protocols/jabber/jabber.c:1448
+#: src/protocols/jabber/jabber.c:1461
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1470
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."
 
-#: src/protocols/jabber/jabber.c:1462
+#: src/protocols/jabber/jabber.c:1475
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: src/protocols/jabber/jabber.c:1468
+#: src/protocols/jabber/jabber.c:1481
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: src/protocols/jabber/jabber.c:1474
+#: src/protocols/jabber/jabber.c:1487
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: src/protocols/jabber/jabber.c:1480
-msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+#: src/protocols/jabber/jabber.c:1493
+#, fuzzy
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [sala]:  Invitar a un usuario a la sala."
 
-#: src/protocols/jabber/jabber.c:1486
+#: src/protocols/jabber/jabber.c:1499
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
 
-#: src/protocols/jabber/jabber.c:1492
+#: src/protocols/jabber/jabber.c:1505
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: src/protocols/jabber/jabber.c:1497
+#: src/protocols/jabber/jabber.c:1510
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;nick&gt; &lt;mensaje&gt;:  Enviar un mensaje en privado a un usuario."
 
-#: src/protocols/jabber/jabber.c:1512
-msgid "Hide Operating System"
-msgstr "Ocultar el sistema operativo"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6448,38 +6585,43 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1599 src/protocols/jabber/jabber.c:1601
+#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: src/protocols/jabber/jabber.c:1627
+#: src/protocols/jabber/jabber.c:1618
 msgid "Use TLS if available"
 msgstr "Usar TLS si está disponible"
 
-#: src/protocols/jabber/jabber.c:1632
-msgid "Force old SSL"
+#: src/protocols/jabber/jabber.c:1623
+msgid "Require TLS"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1626
+#, fuzzy
+msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo"
 
-#: src/protocols/jabber/jabber.c:1637
+#: src/protocols/jabber/jabber.c:1631
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1646 src/protocols/silc/silc.c:1600
+#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: src/protocols/jabber/message.c:177
+#: src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema es: %s"
@@ -6502,30 +6644,32 @@
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: src/protocols/jabber/presence.c:255
+#: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: src/protocols/jabber/presence.c:258
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "El usuario %s quiere añadirle a su lista de amigos."
-
-#: src/protocols/jabber/presence.c:264 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3733 src/protocols/oscar/oscar.c:6300
+#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
+
+#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
+#: src/protocols/yahoo/yahoo.c:861
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: src/protocols/jabber/presence.c:265 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6301
+#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
+#: src/protocols/yahoo/yahoo.c:863
 msgid "Deny"
 msgstr "Denegar"
 
-#: src/protocols/jabber/presence.c:312 src/protocols/jabber/presence.c:313
+#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: src/protocols/jabber/presence.c:314
+#: src/protocols/jabber/presence.c:347
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6533,46 +6677,53 @@
 "Va a crear una sala nueva. ¿Desea configurarla o aceptar los valores por "
 "omisión?"
 
-#: src/protocols/jabber/presence.c:316
+#: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
 msgstr "Configurar sala"
 
-#: src/protocols/jabber/presence.c:318
+#: src/protocols/jabber/presence.c:351
 msgid "Accept Defaults"
 msgstr "Aceptar valores por omisión"
 
-#: src/protocols/jabber/presence.c:355
+#: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: src/protocols/jabber/presence.c:358
+#: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: src/protocols/jabber/si.c:582
+#: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el fichero a %s, el usuario no soporta transferencias de "
 "ficheros"
 
-#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
+#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "Fallo en el envío del fichero"
 
-#: src/protocols/msn/cmdproc.c:358
-msgid "Miscellaneous error"
-msgstr "Error misceláneo"
-
-#: src/protocols/msn/cmdproc.c:361
-msgid "You have signed on from another location."
-msgstr "Ha conectado desde otra ubicación."
-
-#: src/protocols/msn/cmdproc.c:363
-msgid "The MSN servers are going down temporarily."
-msgstr "Los servidores de MSN van a subrir un apagado temporal."
+#: src/protocols/msn/dialog.c:91
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr ""
+
+#: src/protocols/msn/dialog.c:97
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#: src/protocols/msn/dialog.c:105
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6618,7 +6769,7 @@
 msgid "Not on list"
 msgstr "No está en la lista"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:681
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "El usuario no está conectado"
 
@@ -6670,7 +6821,7 @@
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados de un FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:194
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
@@ -6767,8 +6918,8 @@
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2194
-#: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
+#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
@@ -6802,35 +6953,35 @@
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"
 
-#: src/protocols/msn/msn.c:116
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#: src/protocols/msn/msn.c:224
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo"
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Éste es el nombre bajo el que otros amigos MSN le veran."
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "Establezca el número de teléfono de su domicilio."
 
-#: src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "Establezca el número de teléfono de su trabajo."
 
-#: src/protocols/msn/msn.c:271
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "Establezca su número de teléfono móvil."
 
-#: src/protocols/msn/msn.c:284
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "¿Permitir los envíos de MSN Mobile?"
 
-#: src/protocols/msn/msn.c:285
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6838,24 +6989,25 @@
 "¿Quiere permitir o rechazar el envío de mensajes a través de MSN Mobile a su "
 "teléfono móvil (u otro dispositivo móvil) de la gente en su lista de amigos?"
 
-#: src/protocols/msn/msn.c:289
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/protocols/msn/msn.c:290
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "Rechazar"
 
+#: src/protocols/msn/msn.c:311
+msgid "Send a mobile message."
+msgstr "Enviar un mensaje a un móvil."
+
 #: src/protocols/msn/msn.c:313
-msgid "Send a mobile message."
-msgstr "Enviar un mensaje a un móvil."
-
-#: src/protocols/msn/msn.c:315
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512
-#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
+#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
+#: src/protocols/yahoo/yahoo.c:2762
 #, c-format
 msgid ""
 "\n"
@@ -6864,75 +7016,76 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:508
 msgid "Has you"
 msgstr ""
 
-#: src/protocols/msn/msn.c:515
+#: src/protocols/msn/msn.c:511
 #, fuzzy
 msgid "Blocked"
 msgstr "Bloquear"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3139
+#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
-#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1388
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2633
-#: src/protocols/yahoo/yahoo.c:3142
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
+#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
+#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
+#: src/protocols/yahoo/yahoo.c:3189
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3154
+#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
 msgid "On The Phone"
 msgstr "Al teléfono"
 
-#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2645 src/protocols/yahoo/yahoo.c:3160
+#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
 msgid "Out To Lunch"
 msgstr "Salí a comer"
 
-#: src/protocols/msn/msn.c:562 src/protocols/zephyr/zephyr.c:2221
+#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
+#: src/status.c:158
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/protocols/msn/msn.c:574
+#: src/protocols/msn/msn.c:570
 msgid "Set Friendly Name"
 msgstr "Establecer nombre de amigo"
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:575
 msgid "Set Home Phone Number"
 msgstr "Establecer número de teléfono del domicilio"
 
-#: src/protocols/msn/msn.c:583
+#: src/protocols/msn/msn.c:579
 msgid "Set Work Phone Number"
 msgstr "Establecer número de teléfono del trabajo"
 
-#: src/protocols/msn/msn.c:587
+#: src/protocols/msn/msn.c:583
 msgid "Set Mobile Phone Number"
 msgstr "Establecer el número de teléfono movil"
 
-#: src/protocols/msn/msn.c:593
+#: src/protocols/msn/msn.c:589
 msgid "Enable/Disable Mobile Devices"
 msgstr "Permitir/Rechazar dispositivos móviles"
 
-#: src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:594
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Permitir/Rechazar mensajes a móviles"
 
-#: src/protocols/msn/msn.c:621
+#: src/protocols/msn/msn.c:617
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"
 
-#: src/protocols/msn/msn.c:631
-msgid "Initiate Chat"
-msgstr "Iniciar conversación"
-
-#: src/protocols/msn/msn.c:667
+#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
+msgid "Initiate _Chat"
+msgstr "Iniciar _chat"
+
+#: src/protocols/msn/msn.c:663
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6940,91 +7093,96 @@
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada. Para más información, consulte http://gaim.sf.net/faq-ssl.php."
 
-#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
+#: src/protocols/msn/msn.c:691
+#, fuzzy
+msgid "Failed to connect to server."
+msgstr "No se pudo conectar al servidor."
+
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<B>Apodo:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1346 src/protocols/msn/msn.c:1702
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
+#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1695
+#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1432
+#: src/protocols/msn/msn.c:1425
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1689
-#: src/protocols/yahoo/yahoo_profile.c:763
+#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
+#: src/protocols/yahoo/yahoo_profile.c:765
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
 #. Age
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5078
+#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1017
+#: src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Age"
 msgstr "Edad"
 
 #. Gender
-#: src/protocols/msn/msn.c:1515 src/protocols/oscar/oscar.c:5065
+#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1027
+#: src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Gender"
 msgstr "Sexo"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: src/protocols/msn/msn.c:1531 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1012
+#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Location"
 msgstr "Ubicación"
 
-#: src/protocols/msn/msn.c:1539 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: src/protocols/msn/msn.c:1556 src/protocols/msn/msn.c:1562
-#: src/protocols/msn/msn.c:1569 src/protocols/msn/msn.c:1577
-#: src/protocols/msn/msn.c:1584
+#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
+#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
+#: src/protocols/msn/msn.c:1577
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"
 
-#: src/protocols/msn/msn.c:1593 src/protocols/msn/msn.c:1599
-#: src/protocols/msn/msn.c:1606 src/protocols/msn/msn.c:1613
+#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
+#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: src/protocols/msn/msn.c:1622 src/protocols/msn/msn.c:1628
-#: src/protocols/msn/msn.c:1635
+#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1628
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1650
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
+#: src/protocols/yahoo/yahoo_profile.c:1081
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: src/protocols/msn/msn.c:1658 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1651
 msgid "Last Updated"
 msgstr "Actualizado por última vez"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1669 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Página personal"
 
-#: src/protocols/msn/msn.c:1691
+#: src/protocols/msn/msn.c:1684
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil público."
 
-#: src/protocols/msn/msn.c:1692
+#: src/protocols/msn/msn.c:1685
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7034,7 +7192,7 @@
 "que o bien el usuario no existe o que el usuario existe pero no ha creado un "
 "perfil público."
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1689
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7042,18 +7200,10 @@
 "Gaim no pudo encontrar información en el perfil de usuario. Es probable que "
 "el usuario no exista."
 
-#: src/protocols/msn/msn.c:1702 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: src/protocols/msn/msn.c:1843
-msgid "Display conversation closed notices"
-msgstr "Mostrar los avisos de cierre de conversación"
-
-#: src/protocols/msn/msn.c:1848
-msgid "Display timeout notices"
-msgstr "Mostrar avisos de expiración"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7064,51 +7214,75 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1935 src/protocols/msn/msn.c:1937
+#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: src/protocols/msn/msn.c:1956 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "Servidor de conexión"
 
-#: src/protocols/msn/msn.c:1965
+#: src/protocols/msn/msn.c:1929
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: src/protocols/msn/nexus.c:79
-msgid "Unable to connect to server"
-msgstr "No se pudo conectar al servidor"
-
-#: src/protocols/msn/nexus.c:218
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr ""
-"Error desconocido cuando se intentaba obtener autorización del servidor de "
-"registro MSN."
-
-#: src/protocols/msn/notification.c:85
-msgid "Requesting to send password"
-msgstr "Solicitando el envió de contraseña"
-
-#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636
-msgid "Retrieving buddy list"
-msgstr "Recuperando lista de amigos"
-
-#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174
-#: src/protocols/oscar/oscar.c:2483
-msgid "Password sent"
-msgstr "Contraseña enviada"
-
-#: src/protocols/msn/notification.c:732
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr ""
-"La lista de amigos MSN para %s está indisponible temporalmente. Por favor, "
-"espere y vuelva a intentarlo más tarde."
-
-#: src/protocols/msn/notification.c:1128
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/yahoo/yahoochat.c:1350
+msgid "Unable to connect"
+msgstr "No se pudo conectar"
+
+#: src/protocols/msn/notification.c:178
+#, fuzzy, c-format
+msgid "%s is not a valid group."
+msgstr "%s no es un nombre de sala válido"
+
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
+#: src/protocols/msn/session.c:347
+#, fuzzy
+msgid "Unknown error."
+msgstr "Error desconocido"
+
+#: src/protocols/msn/notification.c:187
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "Usuarios en %s: %s"
+
+#: src/protocols/msn/notification.c:496
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Incapaz de añadir al usuario a su lista de privacidad (%s)"
+
+#: src/protocols/msn/notification.c:500
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "No puede expulsar al usuario %s."
+
+#: src/protocols/msn/notification.c:504
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "No se pudo invitar al usuario (%s)."
+
+#: src/protocols/msn/notification.c:512
+#, fuzzy, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Permite añadir salas de chat a su lista de amigos."
+
+#: src/protocols/msn/notification.c:521
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s no es un nombre de servidor válido"
+
+#: src/protocols/msn/notification.c:809
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "No se pudo leer"
+
+#: src/protocols/msn/notification.c:864
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "No se pudo crear el socket"
+
+#: src/protocols/msn/notification.c:1297
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7139,126 +7313,206 @@
 "Después de que se hayan realizado las tareas de mantenimiento debería poder "
 "conectarse con éxito de nuevo."
 
-#: src/protocols/msn/servconn.c:93
-#, c-format
-msgid "Unable to connect to %s server"
-msgstr "No se pudo conectar al servidor %s"
-
-#: src/protocols/msn/servconn.c:97
-#, c-format
-msgid "Error writing to %s server"
-msgstr "Error al leer del servidor %s"
-
-#: src/protocols/msn/servconn.c:101
-#, c-format
-msgid "Error reading from %s server"
-msgstr "Error al leer del servidor %s"
-
-#: src/protocols/msn/servconn.c:105
-#, c-format
-msgid "Unknown error from %s server"
+#: src/protocols/msn/servconn.c:129
+#, fuzzy
+msgid "Writing error"
+msgstr "Error de escritura"
+
+#: src/protocols/msn/servconn.c:131
+#, fuzzy
+msgid "Reading error"
+msgstr "Error de lectura"
+
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/oscar/oscar.c:4296
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: src/protocols/msn/servconn.c:136
+#, fuzzy, c-format
+msgid ""
+"Connection error from %s server (%s):\n"
+"%s"
 msgstr "Código de error desconocido del servidor %s"
 
-#: src/protocols/msn/servconn.c:334
-msgid "Received HTTP error. Please report this."
-msgstr "Se recibió un error HTTP. Por favor, informe de ésto."
+#: src/protocols/msn/session.c:317
+#, fuzzy
+msgid "Our protocol is not supported by the server."
+msgstr "Este protocolo no está soportado en las habitaciones de chats."
+
+#: src/protocols/msn/session.c:321
+#, fuzzy
+msgid "Error parsing HTTP."
+msgstr "Error al mostrar el MOTD"
+
+#. MSG_SERVER_GHOST
+#. Looks like someone logged in as us! =-O
+#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
+#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
+msgid "You have signed on from another location."
+msgstr "Ha conectado desde otra ubicación."
+
+#: src/protocols/msn/session.c:328
+#, fuzzy
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+"La lista de amigos MSN para %s está indisponible temporalmente. Por favor, "
+"espere y vuelva a intentarlo más tarde."
+
+#: src/protocols/msn/session.c:333
+msgid "The MSN servers are going down temporarily."
+msgstr "Los servidores de MSN van a subrir un apagado temporal."
+
+#: src/protocols/msn/session.c:337
+#, fuzzy, c-format
+msgid "Unable to authenticate: %s"
+msgstr "No se pudo enviar el mensaje: %s"
+
+#: src/protocols/msn/session.c:342
+#, fuzzy
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"La lista de amigos MSN para %s está indisponible temporalmente. Por favor, "
+"espere y vuelva a intentarlo más tarde."
+
+#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+msgid "Handshaking"
+msgstr ""
+
+#: src/protocols/msn/session.c:364
+#, fuzzy
+msgid "Transferring"
+msgstr "Transferencia de ficheros"
+
+#: src/protocols/msn/session.c:366
+#, fuzzy
+msgid "Starting authentication"
+msgstr "Autenticación en texto claro"
+
+#: src/protocols/msn/session.c:367
+msgid "Getting cookie"
+msgstr ""
+
+#: src/protocols/msn/session.c:369
+#, fuzzy
+msgid "Sending cookie"
+msgstr "Enviar a un móvil"
+
+#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
+msgid "Retrieving buddy list"
+msgstr "Recuperando lista de amigos"
 
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: src/protocols/msn/switchboard.c:197
-msgid "The conversation has become inactive and timed out."
-msgstr "La conversación ha pasado a ser inactiva y se ha desconectado."
-
-#: src/protocols/msn/switchboard.c:216
+#: src/protocols/msn/switchboard.c:405
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:413
+#, fuzzy
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "Ha sido desconectado por motivos desconocidos."
+
+#: src/protocols/msn/switchboard.c:417
+#, fuzzy
+msgid "Message could not be sent because the user is offline:"
+msgstr "Ha sido desconectado por motivos desconocidos."
+
+#: src/protocols/msn/switchboard.c:421
+#, fuzzy
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "Ha sido desconectado por motivos desconocidos."
+
+#: src/protocols/msn/switchboard.c:425
+#, fuzzy
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr "Ha sido desconectado por motivos desconocidos."
+
+#: src/protocols/msn/switchboard.c:433
+#, fuzzy
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "Ha sido desconectado por motivos desconocidos."
+
+#: src/protocols/msn/switchboard.c:689
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s cerró la ventana de conversación."
 
-#: src/protocols/msn/switchboard.c:485
-msgid "Message could not be sent, not allowed while invisible"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:488
-msgid "Message could not be sent because the user is offline"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:491
-msgid "Message could not be sent because a connection error occured"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:494
-#, fuzzy
-msgid "Message could not be sent for an unknown reason"
-msgstr "Ha sido desconectado por motivos desconocidos."
-
-#: src/protocols/msn/switchboard.c:499
-#, fuzzy, c-format
-msgid ""
-"%s:\n"
-"%s"
-msgstr ""
-"%s\n"
-"%s: %s"
-
-#: src/protocols/msn/userlist.c:86
+#: src/protocols/msn/userlist.c:85
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "El usuario %s (%s) quiere añadir a %s a su lista de amigos."
 
-#: src/protocols/msn/userlist.c:95
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
+#: src/protocols/msn/userlist.c:276
+#, fuzzy, c-format
+msgid "%s has added you to his or her contact list."
 msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
 
-#: src/protocols/napster/napster.c:241
+#: src/protocols/msn/userlist.c:340
+#, c-format
+msgid "%s has removed you from his or her contact list."
+msgstr ""
+
+#: src/protocols/msn/userlist.c:655
+#, fuzzy, c-format
+msgid "Unable to add \"%s\"."
+msgstr "No se pudo añadir un amigo"
+
+#: src/protocols/msn/userlist.c:657
+#, fuzzy
+msgid "The screen name specified is invalid."
+msgstr "El nuevo formato es inválido."
+
+#: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
 msgstr "No se pudo leer las cabeceras del servidor"
 
-#: src/protocols/napster/napster.c:255
+#: src/protocols/napster/napster.c:274
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "No se pudieron leer los mensajes del servidor %s. La orden es %hd, la "
 "longitud es %hd."
 
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:290
+#, fuzzy
+msgid "Unknown server error."
+msgstr "Error desconocido"
+
+#: src/protocols/napster/napster.c:339
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "usuarios: %s, archivos: %s, tamaño: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:329
+#: src/protocols/napster/napster.c:350
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Incapaz de añadir «%s» a su lista de amigos Napster"
 
-#: src/protocols/napster/napster.c:337
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: src/protocols/napster/napster.c:357
 msgid "You were disconnected from the server."
 msgstr "Ha sido desconectado del servidor."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:395
+#: src/protocols/napster/napster.c:414
 #, c-format
 msgid "%s requested your information"
 msgstr "%s solicitó su información de usuario"
 
-#: src/protocols/napster/napster.c:433
-msgid ""
-"You were disconnected from the server, because you logged on from a "
-"different location"
-msgstr ""
-"Ha sido desconectado del servidor porque se conectó desde una ubicación "
-"distinta"
-
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:439
+#: src/protocols/napster/napster.c:455
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s solicitó un PING"
 
-#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275
+#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -7272,7 +7526,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:671 src/protocols/napster/napster.c:673
+#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
 msgid "NAPSTER Protocol Plugin"
 msgstr "Complemento de protocolo NAPSTER"
 
@@ -7517,8 +7771,8 @@
 msgid "Mailstop"
 msgstr "Buzón de correo"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5051
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
+#: src/protocols/oscar/oscar.c:5323
 msgid "Email Address"
 msgstr "Correo electrónico"
 
@@ -7568,11 +7822,11 @@
 msgid "%s has been invited to this conversation."
 msgstr "Se ha invitado a %s a esta conversación."
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1886
 msgid "Invitation to Conversation"
 msgstr "Invitación a una conversación"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1887
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7583,16 +7837,16 @@
 "\n"
 "Enviada: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1889
 msgid "Would you like to join the conversation?"
 msgstr "¿Desea unirse a la conversación?"
 
-#: src/protocols/novell/novell.c:1994
+#: src/protocols/novell/novell.c:1996
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
 
-#: src/protocols/novell/novell.c:2050
+#: src/protocols/novell/novell.c:2052
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7604,7 +7858,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2148
+#: src/protocols/novell/novell.c:2150
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7612,22 +7866,19 @@
 "No se pudo contactar con el servidor. Por favor, indique la dirección del "
 "servidor con el que desea conectarse."
 
-#: src/protocols/novell/novell.c:2170
+#: src/protocols/novell/novell.c:2172
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no está instalado."
 
-#: src/protocols/novell/novell.c:2474
+#: src/protocols/novell/novell.c:2476
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 
-#: src/protocols/novell/novell.c:2930 src/protocols/novell/novell.c:2986
+#: src/protocols/novell/novell.c:2957 src/protocols/novell/novell.c:3045
+#: src/protocols/yahoo/yahoo.c:2808
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: src/protocols/novell/novell.c:3380
-msgid "Initiate _Chat"
-msgstr "Iniciar _chat"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7638,115 +7889,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3479 src/protocols/novell/novell.c:3481
+#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensajería de Grupos de Novell"
 
-#: src/protocols/novell/novell.c:3500
+#: src/protocols/novell/novell.c:3559
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: src/protocols/novell/novell.c:3504
+#: src/protocols/novell/novell.c:3563
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:196
 msgid "Invalid error"
 msgstr "Error inválido"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:197
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:198
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:199
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:201
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:202
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:203
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:204
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:205
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:206
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:207
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:208
 msgid "Responses lost"
 msgstr "Respuestas perdidas"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:209
 msgid "Request denied"
 msgstr "Solicitud denegada"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:210
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:211
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:212
 msgid "In local permit/deny"
 msgstr "En la lista local de autorizar/negar"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:213
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:214
 msgid "Too evil (receiver)"
 msgstr "Demasiado malvado (destinatario)"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:215
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente no disponible."
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:216
 msgid "No match"
 msgstr "No hubo coincidencia"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:217
 msgid "List overflow"
 msgstr "Desbordamiento de la lista"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:218
 msgid "Request ambiguous"
 msgstr "Solicitud ambigua"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:219
 msgid "Queue full"
 msgstr "Cola llena"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:220
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
-#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
 #, fuzzy
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
@@ -7755,154 +8006,158 @@
 "(Se produjo un error al convertir este mensaje. Es posible que el amigo con "
 "el que está hablando tiene un cliente defectuoso.)"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:607
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:610
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660
-#: src/protocols/silc/util.c:506
+#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
+#: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Charlar"
 
-#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7017
+#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
 msgid "Get File"
 msgstr "Recibir fichero"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:623
 msgid "Games"
 msgstr "Juegos"
 
-#: src/protocols/oscar/oscar.c:605
+#: src/protocols/oscar/oscar.c:626
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: src/protocols/oscar/oscar.c:608
-msgid "Send Buddy List"
-msgstr "Enviar lista de amigos"
-
-#: src/protocols/oscar/oscar.c:611
-msgid "ICQ Direct Connect"
-msgstr "Conexión directa ICQ"
-
-#: src/protocols/oscar/oscar.c:614
-msgid "AP User"
-msgstr "Usuario de AP"
-
-#: src/protocols/oscar/oscar.c:617
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:620
-msgid "Nihilist"
-msgstr "Nihilista"
-
-#: src/protocols/oscar/oscar.c:623
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-#: src/protocols/oscar/oscar.c:626
-msgid "Old ICQ UTF8"
-msgstr "Antiguo ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:629
-msgid "Trillian Encryption"
-msgstr "Cifrado Trillian"
+msgid "Send Buddy List"
+msgstr "Enviar lista de amigos"
 
 #: src/protocols/oscar/oscar.c:632
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "ICQ Direct Connect"
+msgstr "Conexión directa ICQ"
 
 #: src/protocols/oscar/oscar.c:635
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "AP User"
+msgstr "Usuario de AP"
 
 #: src/protocols/oscar/oscar.c:638
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:641
+msgid "Nihilist"
+msgstr "Nihilista"
+
+#: src/protocols/oscar/oscar.c:644
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+#: src/protocols/oscar/oscar.c:647
+msgid "Old ICQ UTF8"
+msgstr "Antiguo ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:650
+msgid "Trillian Encryption"
+msgstr "Cifrado Trillian"
+
+#: src/protocols/oscar/oscar.c:653
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:656
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:659
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:662
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:666
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:669
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"
 
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:672
 msgid "Camera"
 msgstr "Cámara"
 
-#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6900
+#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6915
+#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
 msgid "Not Available"
 msgstr "No disponible"
 
-#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6905
+#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:700
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: src/protocols/oscar/oscar.c:755
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
+msgid "Warning Level"
+msgstr "Niveles de aviso"
+
+#: src/protocols/oscar/oscar.c:785
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: src/protocols/oscar/oscar.c:764
+#: src/protocols/oscar/oscar.c:794
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: src/protocols/oscar/oscar.c:899
+#: src/protocols/oscar/oscar.c:951
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Se cerró el MI con %s"
 
-#: src/protocols/oscar/oscar.c:901
+#: src/protocols/oscar/oscar.c:953
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Fallo un MI directo con %s"
 
-#: src/protocols/oscar/oscar.c:909
+#: src/protocols/oscar/oscar.c:961
 msgid "Direct Connect failed"
 msgstr "Falló la conexión directa"
 
-#: src/protocols/oscar/oscar.c:986 src/protocols/oscar/oscar.c:1117
+#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableció un MI directo con %s"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1119
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Intentando conectarse a %s en %s:%hu para IM directo."
 
-#: src/protocols/oscar/oscar.c:1485
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Solicitando a %s que se conecte con nostros en %s:%hu para IM directo."
 
-#: src/protocols/oscar/oscar.c:1490
+#: src/protocols/oscar/oscar.c:1550
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a MI"
 
-#: src/protocols/oscar/oscar.c:1525
+#: src/protocols/oscar/oscar.c:1585
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: src/protocols/oscar/oscar.c:1529
+#: src/protocols/oscar/oscar.c:1589
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7910,24 +8165,24 @@
 "Como ésto revela su dirección IP, puede ser considerado como un riesgo a su "
 "privacidad.  ¿Quiere continuar?"
 
-#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3490
+#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:881
-#, c-format
-msgid "You have been disconnected from chat room %s."
+#: src/protocols/oscar/oscar.c:1657
+#, fuzzy, c-format
+msgid "You have lost your connection to chat room %s."
 msgstr "Ha sido desconectado de la sala de chat: %s"
 
-#: src/protocols/oscar/oscar.c:1619
+#: src/protocols/oscar/oscar.c:1680
 msgid "Chat is currently unavailable"
 msgstr "El chat no está disponible"
 
-#: src/protocols/oscar/oscar.c:1700
+#: src/protocols/oscar/oscar.c:1749
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: src/protocols/oscar/oscar.c:1714
+#: src/protocols/oscar/oscar.c:1773
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7938,47 +8193,52 @@
 "no es válido. Los nombres de usuario deben empezar con letras y sólo pueden "
 "contener letras, números y espacios, o contener sólo numeros."
 
-#: src/protocols/oscar/oscar.c:1745
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar con AIM"
 
-#: src/protocols/oscar/oscar.c:1848 src/protocols/oscar/oscar.c:2286
+#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:1856
+#: src/protocols/oscar/oscar.c:1914
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
-#: src/protocols/oscar/oscar.c:1969 src/protocols/yahoo/yahoo_filexfer.c:180
-#: src/protocols/yahoo/yahoo_filexfer.c:189
-#: src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/oscar/oscar.c:2027
+#, fuzzy, c-format
+msgid "Transfer of file %s timed out."
+msgstr "Transferencia de fichero a %s abortada.\n"
+
+#: src/protocols/oscar/oscar.c:2106 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/yahoo/yahoo_filexfer.c:186
+#: src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
-#: src/protocols/oscar/oscar.c:1974
+#: src/protocols/oscar/oscar.c:2111
 msgid "Unable to create new connection."
 msgstr "No se pudo crear una nueva conexión."
 
-#: src/protocols/oscar/oscar.c:2046
+#: src/protocols/oscar/oscar.c:2190
 msgid "Unable to establish listener socket."
 msgstr "No se pudo crear el socket de escucha."
 
-#: src/protocols/oscar/oscar.c:2171 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
-#: src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2320
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2180
+#: src/protocols/oscar/oscar.c:2324
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
-#: src/protocols/oscar/oscar.c:2185
+#: src/protocols/oscar/oscar.c:2329
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7987,23 +8247,35 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: src/protocols/oscar/oscar.c:2190
+#: src/protocols/oscar/oscar.c:2334
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"
 
-#: src/protocols/oscar/oscar.c:2221
+#: src/protocols/oscar/oscar.c:2365
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:2293
+#: src/protocols/oscar/oscar.c:2435
 msgid "Received authorization"
 msgstr "Se recibió la autorización"
 
-#: src/protocols/oscar/oscar.c:2329 src/protocols/oscar/oscar.c:2359
-#: src/protocols/oscar/oscar.c:2448
+#: src/protocols/oscar/oscar.c:2459
+msgid "The SecurID key entered is invalid."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2473
+msgid "Enter SecurID"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2474
+msgid "Enter the 6 digit number from the digital display."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2514 src/protocols/oscar/oscar.c:2544
+#: src/protocols/oscar/oscar.c:2633
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8012,20 +8284,24 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: src/protocols/oscar/oscar.c:2332 src/protocols/oscar/oscar.c:2362
+#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2547
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim no pudo obtener un «hash» de conexión a AIM válido."
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2636
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim no pudo un «hash» de conexión válido."
 
-#: src/protocols/oscar/oscar.c:3481
+#: src/protocols/oscar/oscar.c:2667
+msgid "Password sent"
+msgstr "Contraseña enviada"
+
+#: src/protocols/oscar/oscar.c:3722
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s pide conectarse directamente a %s"
 
-#: src/protocols/oscar/oscar.c:3484
+#: src/protocols/oscar/oscar.c:3725
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8035,19 +8311,19 @@
 "para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
 "esto como un riesgo a su privacidad."
 
-#: src/protocols/oscar/oscar.c:3523
+#: src/protocols/oscar/oscar.c:3764
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-#: src/protocols/oscar/oscar.c:3531
+#: src/protocols/oscar/oscar.c:3772
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"
 
-#: src/protocols/oscar/oscar.c:3532
+#: src/protocols/oscar/oscar.c:3773
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: src/protocols/oscar/oscar.c:3562
+#: src/protocols/oscar/oscar.c:3803
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8056,35 +8332,34 @@
 "El usuario %s requiere autorización antes permitir que lo incorporen a una "
 "lista de amigos.  ¿Desea enviar una solicitud de autorización?"
 
-#: src/protocols/oscar/oscar.c:3567 src/protocols/oscar/oscar.c:3569
+#: src/protocols/oscar/oscar.c:3808 src/protocols/oscar/oscar.c:3810
 msgid "Request Authorization"
 msgstr "Pedir autorización"
 
-#: src/protocols/oscar/oscar.c:3617 src/protocols/oscar/oscar.c:3619
-#: src/protocols/oscar/oscar.c:3626 src/protocols/oscar/oscar.c:3723
-#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:6292
-#: src/protocols/oscar/oscar.c:6338
+#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
+#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
-#: src/protocols/oscar/oscar.c:3625
+#: src/protocols/oscar/oscar.c:3853
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: src/protocols/oscar/oscar.c:3723
-#, c-format
-msgid ""
-"The user %u wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:3961
+#, fuzzy, c-format
+msgid ""
+"The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "El usuario %u quiere añadirle a su lista de amigos por el siguiente motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3731 src/protocols/oscar/oscar.c:6298
+#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
 msgid "Authorization Request"
 msgstr "Solicitud de autorización"
 
-#: src/protocols/oscar/oscar.c:3743
+#: src/protocols/oscar/oscar.c:3983
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8095,18 +8370,18 @@
 "la siguiente razón:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3744
+#: src/protocols/oscar/oscar.c:3984
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3751
+#: src/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petición de añadirlo a su lista de amigos."
 
-#: src/protocols/oscar/oscar.c:3759
+#: src/protocols/oscar/oscar.c:3999
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8119,7 +8394,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3767
+#: src/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8132,7 +8407,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3775
+#: src/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8145,34 +8420,34 @@
 "Mensaje:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3796
+#: src/protocols/oscar/oscar.c:4036
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3802
+#: src/protocols/oscar/oscar.c:4042
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "¿Desea añadir este amigo a su lista de amigos?"
 
-#: src/protocols/oscar/oscar.c:3806
+#: src/protocols/oscar/oscar.c:4046
 msgid "Decline"
 msgstr "No añadirlo"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:4130
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Usted perdió %hu mensaje de %s porque no era válido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran válidos."
 
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:4139
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Se perdió %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8182,86 +8457,78 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:4157
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Se perdió %hu mensaje de %s porque el/ella es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
 
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/oscar/oscar.c:4166
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Se perdió %hu mensaje de %s porque usted es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
 
-#: src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:4175
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Se perdió %hu mensaje de %s por motivos desconocidos."
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/oscar/oscar.c:4222
+#: src/protocols/oscar/oscar.c:4229 src/protocols/oscar/oscar.c:4463
 #: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "Información para %s:"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4295
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envió el error: %s\n"
 
-#: src/protocols/oscar/oscar.c:4056
-msgid "Unknown error"
-msgstr "Error desconocido"
-
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4092
+#: src/protocols/oscar/oscar.c:4332
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: src/protocols/oscar/oscar.c:4092 src/protocols/oscar/oscar.c:4097
-#: src/protocols/oscar/oscar.c:4155 src/protocols/oscar/oscar.c:4159
+#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
+#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
 msgid "Unknown reason."
 msgstr "Razón desconocida."
 
-#: src/protocols/oscar/oscar.c:4095
+#: src/protocols/oscar/oscar.c:4335
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:4395
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario de no disponible: %s"
 
-#: src/protocols/oscar/oscar.c:4158
+#: src/protocols/oscar/oscar.c:4398
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Información de usuario de %s no disponible:"
 
-#: src/protocols/oscar/oscar.c:4180
-msgid "Warning Level"
-msgstr "Niveles de aviso"
-
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4425
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: src/protocols/oscar/oscar.c:4189 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: src/protocols/oscar/oscar.c:4273
+#: src/protocols/oscar/oscar.c:4514
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4459
+#: src/protocols/oscar/oscar.c:4700
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8269,11 +8536,11 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"
 
-#: src/protocols/oscar/oscar.c:4679
+#: src/protocols/oscar/oscar.c:4925
 msgid "Rate limiting error."
 msgstr "Error del limitador de tasa de mensajes."
 
-#: src/protocols/oscar/oscar.c:4680
+#: src/protocols/oscar/oscar.c:4926
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8282,113 +8549,108 @@
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: src/protocols/oscar/oscar.c:4747
-msgid ""
-"You have been disconnected because you have signed on with this screen name "
-"at another location."
-msgstr ""
-"Ha sido desconectado porque se ha conectado con el mismo nombre de usuario "
-"desde otra ubicación."
-
-#: src/protocols/oscar/oscar.c:4749
+#: src/protocols/oscar/oscar.c:4997
 msgid "You have been signed off for an unknown reason."
 msgstr "Ha sido desconectado por motivos desconocidos."
 
-#: src/protocols/oscar/oscar.c:4780
+#: src/protocols/oscar/oscar.c:5010 src/protocols/toc/toc.c:971
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "Ha sido desconectado de la sala de chat: %s"
+
+#. XXX - Don't call this with ssi
+#: src/protocols/oscar/oscar.c:5035
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#: src/protocols/oscar/oscar.c:5063 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Mujer"
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Hombre"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5346
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: src/protocols/oscar/oscar.c:5085
+#: src/protocols/oscar/oscar.c:5350
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5355
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/oscar/oscar.c:5363
 msgid "Work Address"
 msgstr "Dirección de trabajo"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5371
 msgid "Work Information"
 msgstr "Información de trabajo"
 
-#: src/protocols/oscar/oscar.c:5107
+#: src/protocols/oscar/oscar.c:5372
 msgid "Company"
 msgstr "Compañía"
 
-#: src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5373
 msgid "Division"
 msgstr "Sección"
 
-#: src/protocols/oscar/oscar.c:5109
+#: src/protocols/oscar/oscar.c:5374
 msgid "Position"
 msgstr "Cargo"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5376
 msgid "Web Page"
 msgstr "Página web"
 
-#: src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5386
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Información ICQ para %s:"
 
-#: src/protocols/oscar/oscar.c:5170
+#: src/protocols/oscar/oscar.c:5435
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: src/protocols/oscar/oscar.c:5191
+#. TODO: Need to use ngettext() here
+#: src/protocols/oscar/oscar.c:5457
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Los siguientes nombres de usuarios están asociados a %s"
 
-#: src/protocols/oscar/oscar.c:5195
-msgid "Search Results"
-msgstr "Resultados de la búsqueda"
-
-#: src/protocols/oscar/oscar.c:5212
+#: src/protocols/oscar/oscar.c:5482
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
-#: src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5503
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
-#: src/protocols/oscar/oscar.c:5235
+#: src/protocols/oscar/oscar.c:5505
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"
 
-#: src/protocols/oscar/oscar.c:5266
+#: src/protocols/oscar/oscar.c:5536
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la información de la cuenta"
 
-#: src/protocols/oscar/oscar.c:5269
+#: src/protocols/oscar/oscar.c:5539
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8397,7 +8659,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: src/protocols/oscar/oscar.c:5272
+#: src/protocols/oscar/oscar.c:5542
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8406,7 +8668,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado termina con un espacio."
 
-#: src/protocols/oscar/oscar.c:5275
+#: src/protocols/oscar/oscar.c:5545
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8415,7 +8677,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: src/protocols/oscar/oscar.c:5278
+#: src/protocols/oscar/oscar.c:5548
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8424,7 +8686,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: src/protocols/oscar/oscar.c:5281
+#: src/protocols/oscar/oscar.c:5551
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8433,7 +8695,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada ya tiene demasiados nombres de usuarios asociados."
 
-#: src/protocols/oscar/oscar.c:5284
+#: src/protocols/oscar/oscar.c:5554
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8442,12 +8704,12 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada es inválida."
 
-#: src/protocols/oscar/oscar.c:5287
+#: src/protocols/oscar/oscar.c:5557
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: src/protocols/oscar/oscar.c:5297
+#: src/protocols/oscar/oscar.c:5567
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8456,27 +8718,27 @@
 "El formato de su nombre de usuario es actualmente el siguiente:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5298 src/protocols/oscar/oscar.c:5305
+#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: src/protocols/oscar/oscar.c:5303
+#: src/protocols/oscar/oscar.c:5573
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "La dirección de correo electrónico de %s es %s"
 
-#: src/protocols/oscar/oscar.c:5370
+#: src/protocols/oscar/oscar.c:5640
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
 "imágenes IM."
 
-#: src/protocols/oscar/oscar.c:5505
+#: src/protocols/oscar/oscar.c:5780
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: src/protocols/oscar/oscar.c:5506
+#: src/protocols/oscar/oscar.c:5781
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8486,7 +8748,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: src/protocols/oscar/oscar.c:5533
+#: src/protocols/oscar/oscar.c:5808
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8501,15 +8763,15 @@
 "Se ha excedido el tamaño máximo de perfil de %d bytes.  Gaim lo aplicó "
 "truncado."
 
-#: src/protocols/oscar/oscar.c:5538
+#: src/protocols/oscar/oscar.c:5813
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: src/protocols/oscar/oscar.c:5569
+#: src/protocols/oscar/oscar.c:5843
 msgid "Unable to set AIM away message."
 msgstr "No se pudo establecer el mensaje de ausencia AIM."
 
-#: src/protocols/oscar/oscar.c:5570
+#: src/protocols/oscar/oscar.c:5844
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8519,7 +8781,7 @@
 "finalice el proceso de conexión.  Usted quedará en un estado «presente», "
 "intente volver a aplicarlo cuando esté conectado por completo."
 
-#: src/protocols/oscar/oscar.c:5615
+#: src/protocols/oscar/oscar.c:5891
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8534,11 +8796,11 @@
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia.  "
 "Gaim lo ha truncado.."
 
-#: src/protocols/oscar/oscar.c:5620
+#: src/protocols/oscar/oscar.c:5896
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5994
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8549,16 +8811,16 @@
 "nombres de usuario deben empezar con letras y sólo pueden contener letras, "
 "números y espacios, o contener sólo numeros."
 
-#: src/protocols/oscar/oscar.c:5702 src/protocols/oscar/oscar.c:6158
-#: src/protocols/oscar/oscar.c:6172
+#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6408
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
-#: src/protocols/oscar/oscar.c:5864
+#: src/protocols/oscar/oscar.c:6100
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: src/protocols/oscar/oscar.c:5865
+#: src/protocols/oscar/oscar.c:6101
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -8568,13 +8830,13 @@
 "de AIM. La lista no se ha borrado, y seguramente volverá a estar disponible "
 "en unas horas."
 
-#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6050
-#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6216
-#: src/protocols/oscar/oscar.c:6217 src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6286
+#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
+#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: src/protocols/oscar/oscar.c:6156
+#: src/protocols/oscar/oscar.c:6392
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8583,11 +8845,11 @@
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: src/protocols/oscar/oscar.c:6156 src/protocols/oscar/oscar.c:6170
+#: src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6406
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: src/protocols/oscar/oscar.c:6170
+#: src/protocols/oscar/oscar.c:6406
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8598,7 +8860,7 @@
 "habitual es que ha llegado al máximo número de amigos permitidos en su lista "
 "de amigos."
 
-#: src/protocols/oscar/oscar.c:6253
+#: src/protocols/oscar/oscar.c:6489
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8607,32 +8869,32 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"
 
-#: src/protocols/oscar/oscar.c:6259
+#: src/protocols/oscar/oscar.c:6495
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
-#: src/protocols/oscar/oscar.c:6292
-#, c-format
-msgid ""
-"The user %s wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:6538
+#, fuzzy, c-format
+msgid ""
+"The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "El usuario %s quiere añadirle a su lista de amigos por el siguiente motivo:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6334
+#: src/protocols/oscar/oscar.c:6583
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: src/protocols/oscar/oscar.c:6335
+#: src/protocols/oscar/oscar.c:6584
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6338
+#: src/protocols/oscar/oscar.c:6587
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8643,79 +8905,99 @@
 "la siguiente razón:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6339
+#: src/protocols/oscar/oscar.c:6588
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: src/protocols/oscar/oscar.c:6376 src/protocols/toc/toc.c:1280
+#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:6664
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido"
 
-#: src/protocols/oscar/oscar.c:6503
+#: src/protocols/oscar/oscar.c:6731
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
 
-#: src/protocols/oscar/oscar.c:6638
+#: src/protocols/oscar/oscar.c:6866
 msgid "Away Message"
 msgstr "Mensaje de ausencia"
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7153
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: src/protocols/oscar/oscar.c:6974
+#: src/protocols/oscar/oscar.c:7154
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:7173
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: src/protocols/oscar/oscar.c:6999
+#: src/protocols/oscar/oscar.c:7179
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: src/protocols/oscar/oscar.c:7011
+#: src/protocols/oscar/oscar.c:7191
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: src/protocols/oscar/oscar.c:7028
+#: src/protocols/oscar/oscar.c:7208
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: src/protocols/oscar/oscar.c:7058
+#: src/protocols/oscar/oscar.c:7268
+#, fuzzy
+msgid "Require authorization"
+msgstr "Pedir autorización"
+
+#: src/protocols/oscar/oscar.c:7271
+#, fuzzy
+msgid "Hide IP address"
+msgstr "Dirección IP"
+
+#: src/protocols/oscar/oscar.c:7274
+#, fuzzy
+msgid "Web aware"
+msgstr "Capacidad web"
+
+#: src/protocols/oscar/oscar.c:7279
+#, fuzzy
+msgid "ICQ Privacy Options"
+msgstr "Opciones del proxy"
+
+#: src/protocols/oscar/oscar.c:7296
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: src/protocols/oscar/oscar.c:7059
+#: src/protocols/oscar/oscar.c:7297
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: src/protocols/oscar/oscar.c:7066
+#: src/protocols/oscar/oscar.c:7304
 msgid "New screen name formatting:"
 msgstr "Nuevo formato del nombre de usuario:"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7356
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: src/protocols/oscar/oscar.c:7163
+#: src/protocols/oscar/oscar.c:7401
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: src/protocols/oscar/oscar.c:7166
+#: src/protocols/oscar/oscar.c:7404
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos:"
 
-#: src/protocols/oscar/oscar.c:7167
+#: src/protocols/oscar/oscar.c:7405
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8723,73 +9005,80 @@
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: src/protocols/oscar/oscar.c:7184
+#: src/protocols/oscar/oscar.c:7422
 msgid "Find Buddy by E-mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: src/protocols/oscar/oscar.c:7185
+#: src/protocols/oscar/oscar.c:7423
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: src/protocols/oscar/oscar.c:7186
+#: src/protocols/oscar/oscar.c:7424
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: src/protocols/oscar/oscar.c:7267 src/protocols/silc/silc.c:814
+#: src/protocols/oscar/oscar.c:7505 src/protocols/silc/silc.c:826
 msgid "Set User Info..."
 msgstr "Establecer información de usuario..."
 
-#: src/protocols/oscar/oscar.c:7272
+#: src/protocols/oscar/oscar.c:7511
 msgid "Set User Info (URL)..."
 msgstr "Establecer información de usuario (URL)..."
 
-#: src/protocols/oscar/oscar.c:7277 src/protocols/silc/silc.c:810
+#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
 msgid "Change Password..."
 msgstr "Cambiar contraseña..."
 
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7522
 msgid "Change Password (URL)"
 msgstr "Cambiar contraseña (URL)"
 
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7526
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
-#: src/protocols/oscar/oscar.c:7295
+#. ICQ actions
+#: src/protocols/oscar/oscar.c:7536
+#, fuzzy
+msgid "Show privacy options..."
+msgstr "Mostrar más opciones"
+
+#. AIM actions
+#: src/protocols/oscar/oscar.c:7543
 msgid "Format Screen Name..."
 msgstr "Formato del nombre de usuario..."
 
-#: src/protocols/oscar/oscar.c:7299
+#: src/protocols/oscar/oscar.c:7547
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: src/protocols/oscar/oscar.c:7303
+#: src/protocols/oscar/oscar.c:7551
 msgid "Display Currently Registered Address"
 msgstr "Mostrar dirección registrada actualmente"
 
-#: src/protocols/oscar/oscar.c:7307
+#: src/protocols/oscar/oscar.c:7555
 msgid "Change Currently Registered Address..."
 msgstr "Cambiar la dirección registrada..."
 
-#: src/protocols/oscar/oscar.c:7314
+#: src/protocols/oscar/oscar.c:7562
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: src/protocols/oscar/oscar.c:7320
+#: src/protocols/oscar/oscar.c:7568
 msgid "Search for Buddy by Email..."
 msgstr "Buscar amigo por correo electrónico..."
 
-#: src/protocols/oscar/oscar.c:7325
+#: src/protocols/oscar/oscar.c:7573
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#: src/protocols/oscar/oscar.c:7394
+#: src/protocols/oscar/oscar.c:7643
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "El usuario no está en el grupo"
 
-#: src/protocols/oscar/oscar.c:7397
+#: src/protocols/oscar/oscar.c:7646
 #, fuzzy
 msgid "Show how long you have been idle"
 msgstr "Permite alterar cuánto tiempo se ha estado ausente"
@@ -8804,19 +9093,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7490 src/protocols/oscar/oscar.c:7492
+#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:7511
+#: src/protocols/oscar/oscar.c:7788
 msgid "Auth host"
 msgstr "Servidor de autenticación"
 
-#: src/protocols/oscar/oscar.c:7514
+#: src/protocols/oscar/oscar.c:7791
 msgid "Auth port"
 msgstr "Puerto de autenticación"
 
-#: src/protocols/oscar/oscar.c:7517 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Codificación"
 
@@ -8905,21 +9194,21 @@
 msgstr "Establecer contraseña MI"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1274 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1293
 msgid "Get Public Key"
 msgstr "Obtener clave pública"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1275
-#: src/protocols/silc/ops.c:1286
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1294
 msgid "Cannot fetch the public key"
 msgstr "No se pudo obtener la clave pública"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1549
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
 msgid "Show Public Key"
 msgstr "Mostrar clave pública"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "No se pudo cargar la clave pública"
 
@@ -8989,213 +9278,213 @@
 "Se ha encontrado más de un usuario con el mismo nombre. Seleccione el "
 "usuario que desea añadir a su lista de amigos de la listas mostrada."
 
-#: src/protocols/silc/buddy.c:1382
+#: src/protocols/silc/buddy.c:1410
 msgid "Detached"
 msgstr "Desligado"
 
-#: src/protocols/silc/buddy.c:1386 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
 msgid "Indisposed"
 msgstr "Indispuesto"
 
-#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
 msgid "Wake Me Up"
 msgstr "Despiertame"
 
-#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
 msgid "Hyper Active"
 msgstr "Hiper-activo"
 
-#: src/protocols/silc/buddy.c:1394
+#: src/protocols/silc/buddy.c:1422
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:635
-#: src/protocols/silc/util.c:469
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
+#: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Feliz"
 
-#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:637
-#: src/protocols/silc/util.c:471
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
+#: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Triste"
 
-#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:639
-#: src/protocols/silc/util.c:473
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
+#: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Furioso"
 
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:641
-#: src/protocols/silc/util.c:475
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
+#: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Celoso"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:643
-#: src/protocols/silc/util.c:477
+#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
+#: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:645
-#: src/protocols/silc/util.c:479
+#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
+#: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Invencible"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:647
-#: src/protocols/silc/util.c:481
+#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
+#: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Enamorado"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:649
-#: src/protocols/silc/util.c:483
+#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
+#: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Dormido"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:651
-#: src/protocols/silc/util.c:485
+#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
+#: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Aburrido"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:653
-#: src/protocols/silc/util.c:487
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
+#: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Excitado"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:655
-#: src/protocols/silc/util.c:489
+#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
+#: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Ánimo"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Texto de stado"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Localización"
 
-#: src/protocols/silc/buddy.c:1534
+#: src/protocols/silc/buddy.c:1562
 msgid "Reset IM Key"
 msgstr "Borrar la clave MI"
 
-#: src/protocols/silc/buddy.c:1539
+#: src/protocols/silc/buddy.c:1567
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: src/protocols/silc/buddy.c:1543
+#: src/protocols/silc/buddy.c:1571
 msgid "IM with Password"
 msgstr "MI con contraseña"
 
-#: src/protocols/silc/buddy.c:1554
+#: src/protocols/silc/buddy.c:1583
 msgid "Get Public Key..."
 msgstr "Obtener clave pública..."
 
-#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1407
+#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: src/protocols/silc/chat.c:37
+#: src/protocols/silc/chat.c:38
 msgid "_Passphrase:"
 msgstr "Contra_seña:"
 
-#: src/protocols/silc/chat.c:78
+#: src/protocols/silc/chat.c:79
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "No existe el canal %s en la red"
 
-#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Información de canal"
 
-#: src/protocols/silc/chat.c:80
+#: src/protocols/silc/chat.c:81
 msgid "Cannot get channel information"
 msgstr "No se pudo cambiar la información del canal"
 
-#: src/protocols/silc/chat.c:117
+#: src/protocols/silc/chat.c:118
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nombre del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:120
+#: src/protocols/silc/chat.c:121
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuarios:</b> %d"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:128
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador del canal</b>: %s"
 
-#: src/protocols/silc/chat.c:136
+#: src/protocols/silc/chat.c:137
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifrado del canal:</b> %s"
 
-#: src/protocols/silc/chat.c:139
+#: src/protocols/silc/chat.c:140
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC de canal:</b> %s"
 
-#: src/protocols/silc/chat.c:144
+#: src/protocols/silc/chat.c:145
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
-#: src/protocols/silc/chat.c:149
+#: src/protocols/silc/chat.c:150
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos del canal:</b> "
 
-#: src/protocols/silc/chat.c:162
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Huella dactilar del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Huella Babble del fundador:</b><br>%s"
 
-#: src/protocols/silc/chat.c:233
+#: src/protocols/silc/chat.c:234
 msgid "Add Channel Public Key"
 msgstr "Añadir clave pública del canal"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:288
+#: src/protocols/silc/chat.c:289
 msgid "Open Public Key..."
 msgstr "Abrir clave pública..."
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:398
 msgid "Channel Passphrase"
 msgstr "Contraseña del canal"
 
-#: src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:405
 msgid "Channel Public Keys List"
 msgstr "Lista de claves públicas de canal"
 
-#: src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:410
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9209,127 +9498,127 @@
 "conectarse los usuarios que estén en la lista de claves públicas si se "
 "utilizan claves públicas para el acceso."
 
-#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
-#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
-#: src/protocols/silc/chat.c:886
+#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "Autenticación de canal"
 
-#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Añadir / Quitar"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:576
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: src/protocols/silc/chat.c:590
+#: src/protocols/silc/chat.c:591
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Por favor, indique el nombre del grupo de canales privados %s y una "
 "contraseña."
 
-#: src/protocols/silc/chat.c:592
+#: src/protocols/silc/chat.c:593
 msgid "Add Channel Private Group"
 msgstr "Añadir grupo de canales privados"
 
-#: src/protocols/silc/chat.c:719
+#: src/protocols/silc/chat.c:720
 msgid "User Limit"
 msgstr "Límite de usuarios"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el límite "
 "de usuarios."
 
-#: src/protocols/silc/chat.c:862
+#: src/protocols/silc/chat.c:863
 msgid "Get Info"
 msgstr "Info"
 
-#: src/protocols/silc/chat.c:869
+#: src/protocols/silc/chat.c:871
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:876
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:884
 msgid "Add Private Group"
 msgstr "Añadir grupo privado"
 
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:897
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: src/protocols/silc/chat.c:895
-msgid "Set Permanent"
-msgstr "Fijar permanente"
-
 #: src/protocols/silc/chat.c:902
+msgid "Set Permanent"
+msgstr "Fijar permanente"
+
+#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "Establecer límite de usuarios"
 
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:916
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: src/protocols/silc/chat.c:911
+#: src/protocols/silc/chat.c:921
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: src/protocols/silc/chat.c:917
+#: src/protocols/silc/chat.c:928
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: src/protocols/silc/chat.c:927
+#: src/protocols/silc/chat.c:940
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: src/protocols/silc/chat.c:931
+#: src/protocols/silc/chat.c:945
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:1008
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vd. es fundador de canal en <I>%s</I>."
 
-#: src/protocols/silc/chat.c:997
+#: src/protocols/silc/chat.c:1012
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "El fundador de canal en <I>%s</I> es <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1056
+#: src/protocols/silc/chat.c:1071
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: src/protocols/silc/chat.c:1058
+#: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1074
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
 msgid "Unknown command"
 msgstr "Orden desconocida"
 
@@ -9478,7 +9767,7 @@
 msgid "More..."
 msgstr "Más..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
@@ -9494,31 +9783,39 @@
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: src/protocols/silc/ops.c:1287
+#: src/protocols/silc/ops.c:1250
+msgid "Roomlist"
+msgstr "Lista de salas"
+
+#: src/protocols/silc/ops.c:1250
+msgid "Cannot get room list"
+msgstr "No se pudo obtener la lista de salas"
+
+#: src/protocols/silc/ops.c:1295
 msgid "No public key was received"
 msgstr "No se ha recibido una clave pública"
 
-#: src/protocols/silc/ops.c:1300 src/protocols/silc/ops.c:1314
+#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: src/protocols/silc/ops.c:1301
+#: src/protocols/silc/ops.c:1309
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la información del servidor"
 
-#: src/protocols/silc/ops.c:1332 src/protocols/silc/ops.c:1341
+#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
 msgid "Server Statistics"
 msgstr "Estadísticas del servidor"
 
-#: src/protocols/silc/ops.c:1333
+#: src/protocols/silc/ops.c:1339
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estadísticas del servidor"
 
-#: src/protocols/silc/ops.c:1342
+#: src/protocols/silc/ops.c:1348
 msgid "No server statistics available"
 msgstr "No se disponen de estadísticas del servidor"
 
-#: src/protocols/silc/ops.c:1364
+#: src/protocols/silc/ops.c:1370
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9553,102 +9850,102 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: src/protocols/silc/ops.c:1387
+#: src/protocols/silc/ops.c:1393
 msgid "Network Statistics"
 msgstr "Estadísticas de red"
 
-#: src/protocols/silc/ops.c:1395 src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1395
+#: src/protocols/silc/ops.c:1401
 msgid "Ping failed"
 msgstr "Falló el ping"
 
-#: src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1406
 msgid "Ping reply received from server"
 msgstr "Se recibió una respuesta al ping del servidor"
 
-#: src/protocols/silc/ops.c:1408
+#: src/protocols/silc/ops.c:1414
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: src/protocols/silc/ops.c:1489
+#: src/protocols/silc/ops.c:1498
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexión al servidor SILC"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1503
 msgid "Key Exchange failed"
 msgstr "Falló el intercambio de claves"
 
-#: src/protocols/silc/ops.c:1503
+#: src/protocols/silc/ops.c:1512
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Se produjo un fallo al retomar la sesión desligada. Pulse Reconectar para "
 "crear una nueva conexión."
 
-#: src/protocols/silc/ops.c:1538
+#: src/protocols/silc/ops.c:1547
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#: src/protocols/silc/ops.c:1598 src/protocols/silc/ops.c:1645
-#: src/protocols/silc/silc.c:192
+#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
+#: src/protocols/silc/silc.c:203
 msgid "Resuming session"
 msgstr "Reanudando la sesión"
 
-#: src/protocols/silc/ops.c:1600
+#: src/protocols/silc/ops.c:1611
 msgid "Authenticating connection"
 msgstr "Autenticando la conexión"
 
-#: src/protocols/silc/ops.c:1647
+#: src/protocols/silc/ops.c:1658
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pública del servidor"
 
-#: src/protocols/silc/ops.c:1688
+#: src/protocols/silc/ops.c:1699
 msgid "Passphrase required"
 msgstr "Se necesita una contraseña"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Fallo: Existe una diferencia en las versiones, por favor, actualice su "
 "cliente."
 
-#: src/protocols/silc/ops.c:1720
+#: src/protocols/silc/ops.c:1731
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"
 
-#: src/protocols/silc/ops.c:1723
+#: src/protocols/silc/ops.c:1734
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"
 
-#: src/protocols/silc/ops.c:1726
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
 
-#: src/protocols/silc/ops.c:1729
+#: src/protocols/silc/ops.c:1740
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1743
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"
 
-#: src/protocols/silc/ops.c:1735
+#: src/protocols/silc/ops.c:1746
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1748
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1750
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"
 
-#: src/protocols/silc/ops.c:1750
+#: src/protocols/silc/ops.c:1761
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"
 
@@ -9691,36 +9988,36 @@
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pública no soportada"
 
-#: src/protocols/silc/silc.c:152
+#: src/protocols/silc/silc.c:163
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: src/protocols/silc/silc.c:184
+#: src/protocols/silc/silc.c:195
 msgid "Cannot initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexión del cliente SILC"
 
-#: src/protocols/silc/silc.c:195
+#: src/protocols/silc/silc.c:206
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#: src/protocols/silc/silc.c:267
+#: src/protocols/silc/silc.c:279
 msgid "Out of memory"
 msgstr "Sin memoria"
 
 #. Progress
-#: src/protocols/silc/silc.c:301
+#: src/protocols/silc/silc.c:318
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#: src/protocols/silc/silc.c:631
+#: src/protocols/silc/silc.c:639
 msgid "Your Current Mood"
 msgstr "Su estado de ánimo actual"
 
-#: src/protocols/silc/silc.c:633
+#: src/protocols/silc/silc.c:641
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:658
+#: src/protocols/silc/silc.c:666
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9728,43 +10025,43 @@
 "\n"
 "Sus métodos de contacto preferidos"
 
-#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Video conferencia"
 
-#: src/protocols/silc/silc.c:675
+#: src/protocols/silc/silc.c:683
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:690
 msgid "Online Services"
 msgstr "Servicios en línea"
 
-#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:693
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten qué servicios está utilizando"
 
-#: src/protocols/silc/silc.c:691
+#: src/protocols/silc/silc.c:699
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten qué ordenador está utilizando"
 
-#: src/protocols/silc/silc.c:698
+#: src/protocols/silc/silc.c:706
 msgid "Your VCard File"
 msgstr "Su fichero VCard"
 
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en línea"
 
-#: src/protocols/silc/silc.c:713
+#: src/protocols/silc/silc.c:721
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9774,131 +10071,131 @@
 "línea así como su información personal. Por favor, rellene la información "
 "que desea que otros usuarios vean de vd."
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
-#: src/protocols/silc/silc.c:1159
+#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
+#: src/protocols/silc/silc.c:1171
 msgid "Message of the Day"
 msgstr "Mensaje del día"
 
-#: src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:761
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del día"
 
-#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154
+#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del día asociado con esta conexión."
 
-#: src/protocols/silc/silc.c:797
+#: src/protocols/silc/silc.c:809
 msgid "Online Status"
 msgstr "Estado en línea"
 
-#: src/protocols/silc/silc.c:806
+#: src/protocols/silc/silc.c:818
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del día"
 
-#: src/protocols/silc/silc.c:879
+#: src/protocols/silc/silc.c:891
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "El usuario <I>%s</I> no está en la red"
 
-#: src/protocols/silc/silc.c:1030
+#: src/protocols/silc/silc.c:1042
 msgid "Topic too long"
 msgstr "Tema demasiado largo."
 
-#: src/protocols/silc/silc.c:1111
+#: src/protocols/silc/silc.c:1123
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: src/protocols/silc/silc.c:1213
+#: src/protocols/silc/silc.c:1225
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: src/protocols/silc/silc.c:1218
+#: src/protocols/silc/silc.c:1230
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "los modos de canal de %s son: %s"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/silc/silc.c:1220
+#: src/protocols/silc/silc.c:1232
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no se han definido modos de canal para %s"
 
-#: src/protocols/silc/silc.c:1233
+#: src/protocols/silc/silc.c:1245
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "No se pudieron fijar los modos de canal para %s"
 
-#: src/protocols/silc/silc.c:1263
+#: src/protocols/silc/silc.c:1275
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Orden desconocida: %s, (puede ser un error de Gaim)"
 
-#: src/protocols/silc/silc.c:1326
+#: src/protocols/silc/silc.c:1338
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: src/protocols/silc/silc.c:1330
+#: src/protocols/silc/silc.c:1342
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: src/protocols/silc/silc.c:1334
+#: src/protocols/silc/silc.c:1346
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuevo tema&gt;]:  Ver o cambiar el tema"
 
-#: src/protocols/silc/silc.c:1339
+#: src/protocols/silc/silc.c:1351
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;contraseña&gt;:  Unirse a un chat en esta red"
 
-#: src/protocols/silc/silc.c:1343
+#: src/protocols/silc/silc.c:1355
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: src/protocols/silc/silc.c:1347
+#: src/protocols/silc/silc.c:1359
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: src/protocols/silc/silc.c:1351 src/protocols/zephyr/zephyr.c:2563
+#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: src/protocols/silc/silc.c:1355
+#: src/protocols/silc/silc.c:1367
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1371
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar el mensaje del día del servidor"
 
-#: src/protocols/silc/silc.c:1363
+#: src/protocols/silc/silc.c:1375
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesión"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1379
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual opcionalmente indicando un "
 "mensaje"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1383
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;orden&gt;:  Ejecutar una orden cualquiera del cliente silc"
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1389
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|%lt;razón%gt;]:  Matar un alias"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1393
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: src/protocols/silc/silc.c:1385
+#: src/protocols/silc/silc.c:1397
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1401
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9906,7 +10203,7 @@
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1405
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9914,15 +10211,15 @@
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1409
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos_usuario&gt;:  Establecer sus modos en la red"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1413
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1417
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9930,39 +10227,39 @@
 "invite &lt;canal&gt; [-|+]&lt;apodo&gt;:   invita a un apodo o añade/elimina "
 "el apodo de la lista de invitados para el canal"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1421
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;apodo&gt; [comentario]:  Echar a un cliente del canal"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1425
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: src/protocols/silc/silc.c:1417
+#: src/protocols/silc/silc.c:1429
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;apodo&gt;]:  Expulsar a un cliente del canal"
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1433
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;apodo|servidor&gt;:  Obtiene la clave pública del servidor o del "
 "cliente"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1437
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadísticas del servidor y de la red"
 
-#: src/protocols/silc/silc.c:1429
+#: src/protocols/silc/silc.c:1441
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que está conectado"
 
-#: src/protocols/silc/silc.c:1434
+#: src/protocols/silc/silc.c:1446
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;canal&gt;:  Obtiene la lista de los usuarios que están en el canal"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1450
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9970,42 +10267,30 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;canal(s)&gt;:  Muestra los "
 "usuarios del canal o canales"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1462
 msgid "Instant Messages"
 msgstr "Mensajes instantáneos"
 
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1467
 msgid "Digitally sign all IM messages"
 msgstr "Firmar digitalmente todos los mensajes instantáneos"
 
-#: src/protocols/silc/silc.c:1460
+#: src/protocols/silc/silc.c:1472
 msgid "Verify all IM message signatures"
 msgstr "Verificar todas las firmas de los mensajes MI"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1475
 msgid "Channel Messages"
 msgstr "Mensajes de canal"
 
-#: src/protocols/silc/silc.c:1468
+#: src/protocols/silc/silc.c:1480
 msgid "Digitally sign all channel messages"
 msgstr "Firmar digitalmente todos los mensajes del canal"
 
-#: src/protocols/silc/silc.c:1473
+#: src/protocols/silc/silc.c:1485
 msgid "Verify all channel message signatures"
 msgstr "Verificar todas las firmas de los mensajes de canales"
 
-#: src/protocols/silc/silc.c:1476
-msgid "Default SILC Key Pair"
-msgstr "Par de claves SILC por omisión"
-
-#: src/protocols/silc/silc.c:1481
-msgid "SILC Public Key"
-msgstr "Clave pública SILC"
-
-#: src/protocols/silc/silc.c:1486
-msgid "SILC Private Key"
-msgstr "Clave privada SILC"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10015,91 +10300,93 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1575
+#: src/protocols/silc/silc.c:1573
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1577
+#: src/protocols/silc/silc.c:1575
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vívo en Internet (SILC)"
 
-#: src/protocols/silc/silc.c:1607
-msgid "Public key authentication"
-msgstr "Autenticación de clave pública"
+#: src/protocols/silc/silc.c:1609
+#, fuzzy
+msgid "Public Key file"
+msgstr "Fichero de clave pública"
 
 #: src/protocols/silc/silc.c:1613
-msgid "Public Key File"
-msgstr "Fichero de clave pública"
-
-#: src/protocols/silc/silc.c:1617
-msgid "Private Key File"
+#, fuzzy
+msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: src/protocols/silc/silc.c:1622
+#: src/protocols/silc/silc.c:1616
+msgid "Public key authentication"
+msgstr "Autenticación de clave pública"
+
+#: src/protocols/silc/silc.c:1620
 msgid "Reject watching by other users"
 msgstr "Impedir que otros usuarios miren"
 
-#: src/protocols/silc/silc.c:1625
+#: src/protocols/silc/silc.c:1623
 msgid "Block invites"
 msgstr "Bloquear invitaciones"
 
-#: src/protocols/silc/silc.c:1628
+#: src/protocols/silc/silc.c:1626
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: src/protocols/silc/silc.c:1631
+#: src/protocols/silc/silc.c:1629
 msgid "Reject online status attribute requests"
 msgstr "Rechazar solicitudes de los atributos del estado en línea"
 
-#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
+#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:310
+#: src/protocols/silc/util.c:313
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: src/protocols/silc/util.c:312
+#: src/protocols/silc/util.c:315
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: src/protocols/silc/util.c:314
+#: src/protocols/silc/util.c:317
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "Correo electrónico: \t\t%s\n"
 
-#: src/protocols/silc/util.c:316
+#: src/protocols/silc/util.c:319
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: src/protocols/silc/util.c:318
+#: src/protocols/silc/util.c:321
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organización: \t%s\n"
 
-#: src/protocols/silc/util.c:320
+#: src/protocols/silc/util.c:323
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: src/protocols/silc/util.c:322
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:327
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10110,7 +10397,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10119,137 +10406,137 @@
 "Huella babble de la clave pública:\n"
 "%s"
 
-#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
+#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "Información de clave pública"
 
-#: src/protocols/silc/util.c:512
+#: src/protocols/silc/util.c:515
 msgid "Paging"
 msgstr "Enviar"
 
-#: src/protocols/silc/util.c:536
+#: src/protocols/silc/util.c:539
 msgid "Computer"
 msgstr "Ordenador"
 
-#: src/protocols/silc/util.c:540
+#: src/protocols/silc/util.c:543
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:542
+#: src/protocols/silc/util.c:545
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:138
+#: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Buscando %s"
 
-#: src/protocols/toc/toc.c:199
+#: src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/toc/toc.c:481
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir el archivo %s."
 
-#: src/protocols/toc/toc.c:484
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer el archivo %s."
 
-#: src/protocols/toc/toc.c:487
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, los últimos %s bytes fueron borrados."
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no está conectado ahora."
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "No se permiten advertencias de %s."
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "El mensaje ha sido descartado, usted esta excediendo el límite de velocidad "
 "del servidor."
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "No está disponible el chat en %s."
 
-#: src/protocols/toc/toc.c:502
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta enviando mensajes demasiado rápido a %s."
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Usted perdió un MI de %s porque era demasiado largo."
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Usted perdió un MI de %s porque fue mandado demasiado rápido."
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Fallo."
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Necesito más calificadores."
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio temporalmente no disponible."
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "Búsqueda de direcciones de correo electrónico restringida."
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Palabra clave ignorada."
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "Sin palabras clave."
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "País no soportado."
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo desconocido: %s."
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Servicio temporalmente no disponible."
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:552
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -10258,37 +10545,41 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: src/protocols/toc/toc.c:553
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ha ocurrido un error desconocido al conectarse: %s."
 
-#: src/protocols/toc/toc.c:556
+#: src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido. Info: %s"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:584
+msgid "Invalid Groupname"
+msgstr "Nombre de grupo inválido"
+
+#: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Conexión cerrada"
 
-#: src/protocols/toc/toc.c:617
+#: src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Esperando respuesta..."
 
-#: src/protocols/toc/toc.c:696
+#: src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ha terminado su pausa. Ya puede volver a mandar mensajes."
 
-#: src/protocols/toc/toc.c:899
+#: src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "La contraseña se ha cambiado con éxito"
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC envió una orden de PAUSA."
 
-#: src/protocols/toc/toc.c:904
+#: src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10298,47 +10589,47 @@
 "expulsarle si envía mensajes. Gaim evitará que le llegue cualquier cosa. "
 "Esto es sólo temporal, por favor, sea paciente."
 
-#: src/protocols/toc/toc.c:1430
+#: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Obtener información del directorio"
 
-#: src/protocols/toc/toc.c:1566
+#: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Guardar información del directorio"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "¡No se pudo abrir %s para escritura!"
 
-#: src/protocols/toc/toc.c:1724
+#: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Se produjo un fallo en la transferencia del fichero; posiblemente fue "
 "cancelado por el otro extremo."
 
-#: src/protocols/toc/toc.c:1769 src/protocols/toc/toc.c:1809
-#: src/protocols/toc/toc.c:1933 src/protocols/toc/toc.c:2021
+#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "No se pudo conectar para realizar la transferencia."
 
-#: src/protocols/toc/toc.c:1966
+#: src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "No se pudo escribir la cabecera de archivo.  El archivo no será transferido."
 
-#: src/protocols/toc/toc.c:2066
+#: src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Guardar como..."
 
-#: src/protocols/toc/toc.c:2100
+#: src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s solicita %s para aceptar %d archivo: %s (%.2f %s)%s%s"
 msgstr[1] "%s solicita %s para aceptar %d archivos: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2107
+#: src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le solicita que le mande un archivo"
@@ -10353,15 +10644,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2194 src/protocols/toc/toc.c:2196
+#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: src/protocols/toc/toc.c:2215
+#: src/protocols/toc/toc.c:2337
 msgid "TOC host"
 msgstr "Servidor TOC"
 
-#: src/protocols/toc/toc.c:2219
+#: src/protocols/toc/toc.c:2341
 msgid "TOC port"
 msgstr "Puerto TOC"
 
@@ -10430,7 +10721,7 @@
 msgid "Local Users"
 msgstr "Usuarios locales"
 
-#: src/protocols/trepia/trepia.c:1030
+#: src/protocols/trepia/trepia.c:1032
 msgid "Logging in"
 msgstr "Registrándose"
 
@@ -10444,38 +10735,44 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1277 src/protocols/trepia/trepia.c:1279
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Complemento de protocolo Trepia"
 
-#: src/protocols/yahoo/yahoo.c:400
-msgid ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
-msgstr ""
-"Ha sido desconectado dado que se ha conectado en otro equipo o dispositivo."
-
-#: src/protocols/yahoo/yahoo.c:884
+#: src/protocols/yahoo/yahoo.c:694
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
 
-#: src/protocols/yahoo/yahoo.c:903 src/protocols/yahoo/yahoo.c:3429
+#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
 msgid "Buzz!!"
 msgstr "¡¡Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:948
+#: src/protocols/yahoo/yahoo.c:763
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#: src/protocols/yahoo/yahoo.c:1015
+#. TODO: this is almost exactly the same as what MSN does,
+#. * this should probably be moved to the core.
+#. *
+#: src/protocols/yahoo/yahoo.c:853
+#, fuzzy, c-format
+msgid "The user %s wants to add %s to his or her buddy list%s%s."
+msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
+
+#: src/protocols/yahoo/yahoo.c:859
+#, fuzzy
+msgid "Message (optional) :"
+msgstr "Notificación de mensajes"
+
+#: src/protocols/yahoo/yahoo.c:901
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
 "forma retroactiva)."
 
-#: src/protocols/yahoo/yahoo.c:1018
+#: src/protocols/yahoo/yahoo.c:904
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10484,11 +10781,11 @@
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."
 
-#: src/protocols/yahoo/yahoo.c:1021
+#: src/protocols/yahoo/yahoo.c:907
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
-#: src/protocols/yahoo/yahoo.c:1782
+#: src/protocols/yahoo/yahoo.c:1659
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10499,11 +10796,11 @@
 "desconocido. Esta versión de Gaim posiblemente no sea capaz de conectarse a "
 "Yahoo. Compruebe %s para obtener una actualización."
 
-#: src/protocols/yahoo/yahoo.c:1785
+#: src/protocols/yahoo/yahoo.c:1662
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1858
+#: src/protocols/yahoo/yahoo.c:1735
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10512,19 +10809,19 @@
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."
 
-#: src/protocols/yahoo/yahoo.c:1861
+#: src/protocols/yahoo/yahoo.c:1738
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#: src/protocols/yahoo/yahoo.c:1895
+#: src/protocols/yahoo/yahoo.c:1772
 msgid "Invalid username."
 msgstr "Nombre de usuario no válido."
 
-#: src/protocols/yahoo/yahoo.c:1906
+#: src/protocols/yahoo/yahoo.c:1783
 msgid "Normal authentication failed!"
 msgstr "¡Falló la autenticación habitual!"
 
-#: src/protocols/yahoo/yahoo.c:1907
+#: src/protocols/yahoo/yahoo.c:1784
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10537,100 +10834,124 @@
 "Mensajería web que podrá dar lugar a un acceso a menos funcionalidades y "
 "funciones."
 
-#: src/protocols/yahoo/yahoo.c:1915
+#: src/protocols/yahoo/yahoo.c:1792
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: src/protocols/yahoo/yahoo.c:1918
+#: src/protocols/yahoo/yahoo.c:1795
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1921
+#: src/protocols/yahoo/yahoo.c:1798
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#: src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/yahoo/yahoo.c:1852
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: src/protocols/yahoo/yahoo.c:1978
+#: src/protocols/yahoo/yahoo.c:1855
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2212 src/protocols/yahoo/yahoo.c:2340
-#: src/protocols/yahoo/ycht.c:414
+#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
+#: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "No se pudo leer"
 
-#: src/protocols/yahoo/yahoo.c:2362 src/protocols/yahoo/yahoo.c:2472
-#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2532
-#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
-#: src/protocols/yahoo/ycht.c:518
+#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
+#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
+#: src/protocols/yahoo/ycht.c:519
 msgid "Connection problem"
 msgstr "Error de conexión"
 
-#: src/protocols/yahoo/yahoo.c:2635 src/protocols/yahoo/yahoo.c:3145
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
 msgid "Not At Home"
 msgstr "Fuera de casa"
 
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3148
+#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
 msgid "Not At Desk"
 msgstr "Lejos del escritorio"
 
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3151
+#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
 msgid "Not In Office"
 msgstr "Fuera de la oficina"
 
-#: src/protocols/yahoo/yahoo.c:2643 src/protocols/yahoo/yahoo.c:3157
+#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:3163
+#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2754
+#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
+#, fuzzy
+msgid "Appear Online"
+msgstr "Parecer desconectado"
+
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
+#, fuzzy
+msgid "Appear Permanently Offline"
+msgstr "Parecer desconectado"
+
+#: src/protocols/yahoo/yahoo.c:2763
+#, fuzzy
+msgid "Stealth"
+msgstr "Estado"
+
+#: src/protocols/yahoo/yahoo.c:2818
+#, fuzzy
+msgid "Don't Appear Permanently Offline"
+msgstr "Parecer desconectado"
+
+#: src/protocols/yahoo/yahoo.c:2857
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: src/protocols/yahoo/yahoo.c:2838
+#: src/protocols/yahoo/yahoo.c:2862
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: src/protocols/yahoo/yahoo.c:2890
+#: src/protocols/yahoo/yahoo.c:2887
+msgid "Stealth Settings"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2920
 msgid "Active which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2929
 msgid "Join who in chat?"
 msgstr "¿Juntarse con quién en un chat?"
 
-#: src/protocols/yahoo/yahoo.c:2909
+#: src/protocols/yahoo/yahoo.c:2939
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: src/protocols/yahoo/yahoo.c:2913
+#: src/protocols/yahoo/yahoo.c:2943
 msgid "Join user in chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: src/protocols/yahoo/yahoo.c:3473
+#: src/protocols/yahoo/yahoo.c:3505
 #, fuzzy
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 "join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
 
-#: src/protocols/yahoo/yahoo.c:3477
+#: src/protocols/yahoo/yahoo.c:3509
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
@@ -10644,72 +10965,69 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3557 src/protocols/yahoo/yahoo.c:3559
+#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3578
+#: src/protocols/yahoo/yahoo.c:3609
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"
 
-#: src/protocols/yahoo/yahoo.c:3581
+#: src/protocols/yahoo/yahoo.c:3612
 msgid "Pager host"
 msgstr "Servidor de buscapersonas:"
 
-#: src/protocols/yahoo/yahoo.c:3584
+#: src/protocols/yahoo/yahoo.c:3615
 msgid "Japan Pager host"
 msgstr "Servidor de buscapersonas japonés"
 
-#: src/protocols/yahoo/yahoo.c:3587
+#: src/protocols/yahoo/yahoo.c:3618
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: src/protocols/yahoo/yahoo.c:3590
+#: src/protocols/yahoo/yahoo.c:3621
 msgid "File transfer host"
 msgstr "Servidor de transferencia de ficheros"
 
-#: src/protocols/yahoo/yahoo.c:3593
+#: src/protocols/yahoo/yahoo.c:3624
 msgid "Japan File transfer host"
 msgstr "Servidor de transferencia de ficheros japonés"
 
-#: src/protocols/yahoo/yahoo.c:3596
+#: src/protocols/yahoo/yahoo.c:3627
 msgid "File transfer port"
 msgstr "Puerto de transferencia de ficheros"
 
-#: src/protocols/yahoo/yahoo.c:3599
+#: src/protocols/yahoo/yahoo.c:3630
+#, fuzzy
+msgid "Chat Room Locale"
+msgstr "Url de lista de salas de chat"
+
+#: src/protocols/yahoo/yahoo.c:3633
 msgid "Chat Room List Url"
 msgstr "Url de lista de salas de chat"
 
-#: src/protocols/yahoo/yahoo.c:3602
+#: src/protocols/yahoo/yahoo.c:3636
 msgid "YCHT Host"
 msgstr "Servidor YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3605
+#: src/protocols/yahoo/yahoo.c:3639
 msgid "YCHT Port"
 msgstr "Puerto YCHT"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:170
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-msgstr ""
-"Gaim no puede enviar archivos más grandes que un Megabit (1.408.576 bytes) a "
-"través de Yahoo!"
-
 #: src/protocols/yahoo/yahoo_profile.c:677
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Dirección IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:751
+#: src/protocols/yahoo/yahoo_profile.c:753
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! Japón"
 
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: src/protocols/yahoo/yahoo_profile.c:754
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10717,56 +11035,61 @@
 "Lo siento, los perfiles con contenido sólo para adultos no están soportados "
 "aún."
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:800
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 "Si desea ver este perfil, deberá visitar este enlace con su navegador web"
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: src/protocols/yahoo/yahoo_profile.c:978
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:1045
-#: src/protocols/yahoo/yahoo_profile.c:1049
-#: src/protocols/yahoo/yahoo_profile.c:1053
+#: src/protocols/yahoo/yahoo_profile.c:1052
+#: src/protocols/yahoo/yahoo_profile.c:1056
+#: src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Hobbies"
 msgstr "Aficiones"
 
-#: src/protocols/yahoo/yahoo_profile.c:1063
-#: src/protocols/yahoo/yahoo_profile.c:1067
+#: src/protocols/yahoo/yahoo_profile.c:1070
+#: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Latest News"
 msgstr "Últimas noticias"
 
-#: src/protocols/yahoo/yahoo_profile.c:1088
+#: src/protocols/yahoo/yahoo_profile.c:1095
 msgid "Home Page"
 msgstr "Página personal"
 
-#: src/protocols/yahoo/yahoo_profile.c:1103
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 1"
 msgstr "Enlace interesante 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1108
+#: src/protocols/yahoo/yahoo_profile.c:1115
 msgid "Cool Link 2"
 msgstr "Enlace interesante 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1112
+#: src/protocols/yahoo/yahoo_profile.c:1119
 msgid "Cool Link 3"
 msgstr "Enlace interesante 3"
 
 #: src/protocols/yahoo/yahoo_profile.c:1132
+#, fuzzy
+msgid "Last Update"
+msgstr "Actualizado por última vez"
+
+#: src/protocols/yahoo/yahoo_profile.c:1138
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s no disponible"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1144
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "Lo siento, este perfil parece estar en un idioma aún no soportado."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: src/protocols/yahoo/yahoo_profile.c:1160
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10774,7 +11097,7 @@
 "No se pudo obtener el perfil del usuario. Esto es habitualmente un problema "
 "temporal en el lado del servidor. Por favor, pruebe de nuevo más tarde."
 
-#: src/protocols/yahoo/yahoo_profile.c:1157
+#: src/protocols/yahoo/yahoo_profile.c:1163
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10785,70 +11108,66 @@
 "de usuario. Si está seguro de que el usuario existe inténtelo de nuevo más "
 "tarde."
 
-#: src/protocols/yahoo/yahoo_profile.c:1165
+#: src/protocols/yahoo/yahoo_profile.c:1171
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
-#: src/protocols/yahoo/yahoochat.c:193
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
 
-#: src/protocols/yahoo/yahoochat.c:195
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Invitación rechazada"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:360
 msgid "Failed to join chat"
 msgstr "No se pudo unir al chat"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:360
 msgid "Maybe the room is full?"
 msgstr "¿Quizás la sala está llena?"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: src/protocols/yahoo/yahoochat.c:425
+#: src/protocols/yahoo/yahoochat.c:438
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Ahora está chateando en %s."
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:613
 msgid "Failed to join buddy in chat"
 msgstr "No se pudo unir al amigo al chat"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:614
 msgid "Maybe they're not in a chat?"
 msgstr "¿Quizás no están en un chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1356
-msgid "Unable to connect"
-msgstr "No se pudo conectar"
-
-#: src/protocols/yahoo/yahoochat.c:1356
+#: src/protocols/yahoo/yahoochat.c:1350
 msgid "Fetching the room list failed."
 msgstr "No se pudo obtener la lista de salas."
 
-#: src/protocols/yahoo/yahoochat.c:1401
+#: src/protocols/yahoo/yahoochat.c:1403
 msgid "Voices"
 msgstr "Voces"
 
-#: src/protocols/yahoo/yahoochat.c:1404
+#: src/protocols/yahoo/yahoochat.c:1406
 msgid "Webcams"
 msgstr "Cámaras web"
 
-#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
+#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
 msgid "Unable to fetch room list."
 msgstr "No se pudo obtener la lista de salas."
 
-#: src/protocols/yahoo/yahoochat.c:1469
+#: src/protocols/yahoo/yahoochat.c:1477
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#: src/protocols/yahoo/ycht.c:401
+#: src/protocols/yahoo/ycht.c:402
 msgid "Connection problem with the YCHT server."
 msgstr "Se produjo un problema al conectarse con el servidor YCHT."
 
-#: src/protocols/zephyr/zephyr.c:329
+#: src/protocols/zephyr/zephyr.c:331
 #, fuzzy
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10857,80 +11176,80 @@
 "(Hubo un error convirtiendo este mensaje.  Verifique la opción "
 "«Codificación» en el Editor de cuentas)"
 
-#: src/protocols/zephyr/zephyr.c:677
-#, c-format
-msgid "Unable send to chat %s,%s,%s"
+#: src/protocols/zephyr/zephyr.c:686
+#, fuzzy, c-format
+msgid "Unable to send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Oculto o no conectado"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
+#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: src/protocols/zephyr/zephyr.c:2239
+#: src/protocols/zephyr/zephyr.c:2273
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: src/protocols/zephyr/zephyr.c:2245
+#: src/protocols/zephyr/zephyr.c:2279
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: src/protocols/zephyr/zephyr.c:2251
+#: src/protocols/zephyr/zephyr.c:2285
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: src/protocols/zephyr/zephyr.c:2262
+#: src/protocols/zephyr/zephyr.c:2296
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Falló el intento de suscripción a %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:2568
+#: src/protocols/zephyr/zephyr.c:2602
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocates &lt;apodo&gt;: Localiza un usuario"
 
-#: src/protocols/zephyr/zephyr.c:2573
+#: src/protocols/zephyr/zephyr.c:2607
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;apodo&gt;: Localiza un usuario"
 
-#: src/protocols/zephyr/zephyr.c:2578
+#: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: src/protocols/zephyr/zephyr.c:2583
+#: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: src/protocols/zephyr/zephyr.c:2588
+#: src/protocols/zephyr/zephyr.c:2622
 #, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: src/protocols/zephyr/zephyr.c:2594
+#: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Unirse a un nuevo chat"
 
-#: src/protocols/zephyr/zephyr.c:2599
+#: src/protocols/zephyr/zephyr.c:2633
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar un mensaje a &lt;mensaje,<i>instancia</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2605
+#: src/protocols/zephyr/zephyr.c:2639
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10938,7 +11257,7 @@
 "zci &lt;clase&gt; &lt;instancia&gt;: Enviar un mensaje a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2611
+#: src/protocols/zephyr/zephyr.c:2645
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10946,7 +11265,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a "
 "&lt;<i>clase</i>,<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2651
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10954,15 +11273,15 @@
 "zir &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;MENSAJE,"
 "<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: src/protocols/zephyr/zephyr.c:2656
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar un mensaje a &lt;<i>clase</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2728
+#: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: src/protocols/zephyr/zephyr.c:2731
+#: src/protocols/zephyr/zephyr.c:2765
 msgid "Retrieve subscriptions from server"
 msgstr "Obtener las suscripciones del servidor"
 
@@ -10976,54 +11295,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2814 src/protocols/zephyr/zephyr.c:2816
+#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2841
+#: src/protocols/zephyr/zephyr.c:2874
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2844
+#: src/protocols/zephyr/zephyr.c:2877
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2847
+#: src/protocols/zephyr/zephyr.c:2880
 #, fuzzy
 msgid "Import from .anyone"
 msgstr "Exportar a .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2850
+#: src/protocols/zephyr/zephyr.c:2883
 #, fuzzy
 msgid "Import from .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2853
+#: src/protocols/zephyr/zephyr.c:2886
 #, fuzzy
 msgid "Realm"
 msgstr "Nombre real"
 
-#: src/protocols/zephyr/zephyr.c:2856
+#: src/protocols/zephyr/zephyr.c:2889
 msgid "Exposure"
 msgstr "Exposición"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:953
+#: src/proxy.c:1038
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acceso denegado: el servidor proxy no permite túneles en el puerto %d."
 
-#: src/proxy.c:957
+#: src/proxy.c:1042
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Error de conexión en el proxy %d"
 
-#: src/proxy.c:1612
+#: src/proxy.c:1876
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"
 
-#: src/proxy.c:1612
+#: src/proxy.c:1876
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11034,106 +11353,569 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1254
+#: src/request.h:1276
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/server.c:62
-msgid "Please enter your password"
-msgstr "Por favor, indique su contraseña"
-
-#: src/server.c:471
+#: src/server.c:351
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: src/server.c:895
+#: src/server.c:733
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d mensaje)"
 msgstr[1] "(%d mensajes)"
 
-#: src/server.c:909
+#: src/server.c:747
 msgid "(1 message)"
 msgstr "(1 mensaje)"
 
-# 'Buddy chat room' es una sala de chat en la que se habla
-# con amigos
-#: src/server.c:1164
+#: src/server.c:1008
 #, fuzzy, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
-"<b>%s</b>"
-msgstr ""
-"El usuario '%s' invita a %s a la sala de chat de amigos: '%s'\n"
 "%s"
-
-#: src/server.c:1168
+msgstr "El usuario '%s' invita a %s a la sala de chat de amigos: '%s'\n"
+
+#: src/server.c:1013
 #, fuzzy, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "El usuario '%s' invita a %s a la sala de chat de amigos: '%s'\n"
 
-#: src/server.c:1174
+#: src/server.c:1017
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"
 
-#: src/status.c:553
+#: src/status.c:153
+#, fuzzy
+msgid "Unset"
+msgstr "_Usar"
+
+#: src/status.c:626
 #, c-format
 msgid "%s came back"
 msgstr "%s ha vuelto"
 
-#: src/status.c:558
+#: src/status.c:631
 #, c-format
 msgid "%s went away"
 msgstr "%s se ha marchado"
 
-#: src/status.c:1269
+#: src/status.c:1314
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora está inactivo"
 
-#: src/status.c:1285
+#: src/status.c:1330
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora está activo"
 
-#: src/util.c:2354
+#: src/util.c:2120
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Error al leer %s: \n"
+"%s.\n"
+
+#: src/util.c:2121
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file been renamed to %s~."
+msgstr ""
+"Se ha encontrado un error al interpretar la lista de amigos. No se ha "
+"cargado y el fichero antiguo ha sido movido a blist.xml~."
+
+#: src/util.c:2558
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: src/util.c:2357
+#: src/util.c:2561
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: src/util.c:2387
+#: src/util.c:2591
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: src/util.c:2401
+#: src/util.c:2605
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: src/util.c:2409
+#: src/util.c:2613
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/util.c:2417
+#: src/util.c:2621
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/util.c:2834
+#: src/util.c:3041
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error abriendo la conexión.\n"
 
+#~ msgid "Mail Server"
+#~ msgstr "Servidor de correo"
+
+#~ msgid "%s (%d new/%d total)"
+#~ msgstr "%s (%d nuevos/%d en total)"
+
+#~ msgid "Check Mail"
+#~ msgstr "Comprobar correo"
+
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "Comprobar correo cada X segundos.\n"
+
+#~ msgid "Auto-login"
+#~ msgstr "Conectarse automáticamente"
+
+#, fuzzy
+#~ msgid "Log Out"
+#~ msgstr "Desconectado"
+
+#~ msgid ""
+#~ "When a new conversation is opened this plugin will insert the last "
+#~ "conversation into the current conversation."
+#~ msgstr ""
+#~ "Cuando se abre una nueva conversación este complemento introduce la "
+#~ "última conversación en la conversación actual."
+
+#~ msgid "Docked _Buddy List is always on top"
+#~ msgstr "La lista de _amigos apilada está siempre encima del resto"
+
+#~ msgid "Buddy List Error"
+#~ msgstr "Error en la lista de amigos"
+
+#, fuzzy
+#~ msgid "Unable to send messge to %s."
+#~ msgstr "No se pudo enviar el mensaje a %s:"
+
+#, fuzzy
+#~ msgid "Auto log in"
+#~ msgstr "Conectarse automáticamente"
+
+#~ msgid "Show fewer options"
+#~ msgstr "Mostrar menos opciones"
+
+#, fuzzy
+#~ msgid "Auto Log In"
+#~ msgstr "Auto conectarse"
+
+#~ msgid "Information"
+#~ msgstr "Información"
+
+#, fuzzy
+#~ msgid "/Buddies/_Log Out"
+#~ msgstr "/Amigos/_Salir"
+
+#~ msgid "/Tools/_Away"
+#~ msgstr "/Herramientas/_Ausentarse"
+
+#~ msgid "Rename Group"
+#~ msgstr "Renombrar grupo"
+
+#~ msgid "New group name"
+#~ msgstr "Nuevo nombre de grupo:"
+
+#~ msgid "Please enter a new name for the selected group."
+#~ msgstr "Introduzca un nombre para el grupo seleccionado."
+
+#~ msgid "%d%%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Account:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Cuenta:</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Ausente:</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Warned:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Avisado:</b>"
+
+#~ msgid "Warned (%d%%) "
+#~ msgstr "Avisado (%d%%) "
+
+#~ msgid "/Tools/Away"
+#~ msgstr "/Herramientas/Ausencia"
+
+#~ msgid "Done."
+#~ msgstr "Hecho."
+
+#, fuzzy
+#~ msgid "Logging in: "
+#~ msgstr "Registrándose"
+
+#, fuzzy
+#~ msgid "Logging In"
+#~ msgstr "Registrándose"
+
+#~ msgid "Cancel All"
+#~ msgstr "Cancelar todo"
+
+#~ msgid "/Conversation/_Warn..."
+#~ msgstr "/Conversación/Avi_sar..."
+
+#~ msgid "/Conversation/Warn..."
+#~ msgstr "/Conversación/Avisar..."
+
+#~ msgid "Block the user"
+#~ msgstr "Bloquear al usuario"
+
+#~ msgid "Send a file to the user"
+#~ msgstr "Enviar un fichero al usuario."
+
+#~ msgid "Add the user to your buddy list"
+#~ msgstr "Añadir al usuario a la lista de amigos"
+
+#~ msgid "Remove the user from your buddy list"
+#~ msgstr "Eliminar al usuario de la lista de amigos"
+
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "Send message"
+#~ msgstr "Enviar mensaje"
+
+#~ msgid "Invite"
+#~ msgstr "Invitar"
+
+#~ msgid "Invite a user"
+#~ msgstr "Invitar al usuario"
+
+#~ msgid "Add the chat to your buddy list"
+#~ msgstr "Añadir el chat a su lista de amigos"
+
+#~ msgid "Remove the chat from your buddy list"
+#~ msgstr "Eliminar el chat de su lista de amigos"
+
+#~ msgid "<main>/Conversation/Close"
+#~ msgstr "<main>/Conversación/_Cerrar"
+
+#~ msgid "former lead developer"
+#~ msgstr "desarrollador principal previo"
+
+#~ msgid "former maintainer"
+#~ msgstr "desarrollador previo"
+
+#~ msgid "Chinese"
+#~ msgstr "Chino"
+
+#~ msgid "_Screen name"
+#~ msgstr "_Nombre de usuario"
+
+#~ msgid "Warn User"
+#~ msgstr "Avisar usuario"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+#~ "\n"
+#~ "This will increase %s's warning level and he or she will be subject to "
+#~ "harsher rate limiting.\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">¿Avisar a %s?</span>\n"
+#~ "\n"
+#~ "Ésto incrementará el nivel de aviso de %s y él o ella estará sujeto a un "
+#~ "límite más duro en su tasa de envío de mensajes.\n"
+
+#~ msgid "Warn _anonymously?"
+#~ msgstr "¿Advertir _anónimamente?"
+
+#~ msgid "<b>Anonymous warnings are less severe.</b>"
+#~ msgstr "<b>Las advertencias anónimas son menos duras.</b>"
+
+#~ msgid ""
+#~ "Unable to guess the image type based on the file extension supplied.  "
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Gaim no ha podido deducir el tipo de imagen a partir de la extensión del "
+#~ "archivo. Tomando PNG por omisión."
+
+#~ msgid "Please create an account."
+#~ msgstr "Por favor, cree una cuenta."
+
+#~ msgid "Login"
+#~ msgstr "Conectar"
+
+#~ msgid "<b>_Account:</b>"
+#~ msgstr "<b>_Cuenta:</b>"
+
+#~ msgid "<b>_Password:</b>"
+#~ msgstr "<b>Contra_seña:</b>"
+
+#, fuzzy
+#~ msgid "A_ccounts"
+#~ msgstr "Cuentas"
+
+#, fuzzy
+#~ msgid "P_references"
+#~ msgstr "Preferencias"
+
+#, fuzzy
+#~ msgid "_Log in"
+#~ msgstr "_Entrada"
+
+#~ msgid ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
+#~ "specifies\n"
+#~ "                      name of away message to use)\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      account(s) to use, seperated by commas)\n"
+#~ "  -n, --loginwin      don't automatically login; show login window\n"
+#~ "  -u, --user=NAME     use account NAME\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ msgstr ""
+#~ "Gaim %s\n"
+#~ "Modo de uso: %s [OPCIÓN]...\n"
+#~ "\n"
+#~ "  -a, --acct          muestra la ventana de edición de cuentas\n"
+#~ "  -w, --away[=MENS]   marca como no disponible al conectar (el valor "
+#~ "opcional\n"
+#~ "                      MENS especifica el nombre del mensaje de no "
+#~ "disponibilidad\n"
+#~ "                      a usar)\n"
+#~ "  -l, --login[=NOMBR] conexión automática (el argumento opcional NOMBRE "
+#~ "especifica \n"
+#~ "                      la/s cuenta/s a utilizar, separadas por comas)\n"
+#~ "  -n, --loginwin      no conectarse automáticamente, mostrar ventana de "
+#~ "conexión\n"
+#~ "  -u, --user=NOMBRE   utilizar cuenta NOMBRE\n"
+#~ "  -c, --config=DIR    utilizar DIR para los archivos de configuración\n"
+#~ "  -d, --debug         mostrar mensajes de depuración en salida estándar\n"
+#~ "  -v, --version       mostrar la versión actual y salir\n"
+#~ "  -h, --help          mostrar esta ayuda y salir\n"
+
+#~ msgid "Unable to load preferences"
+#~ msgstr "No se pudieron cargar las preferencias"
+
+#~ msgid ""
+#~ "Gaim was not able to load your preferences because they are stored in an "
+#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "using the Preferences window."
+#~ msgstr ""
+#~ "Gaim no pudo cargar sus preferencias porque están almacenadas en un "
+#~ "formato antigüo que ya no se utiliza. Por favor, reconfigure sus "
+#~ "preferencias utilizando la ventana de Preferencias."
+
+#~ msgid "D_isplay remote nicknames if no alias is set"
+#~ msgstr "_Mostrar los apodos remotos si no se ha establecido un apodo"
+
+#~ msgid "Display"
+#~ msgstr "Mostrar"
+
+#~ msgid "Show _timestamp on messages"
+#~ msgstr "Mostrar la _hora en los mensajes"
+
+#~ msgid "Ignore c_olors"
+#~ msgstr "Ignorar c_olores"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "Ignorar _aspectos de la tipografía"
+
+#~ msgid "Ignore font si_zes"
+#~ msgstr "Ignorar t_amaños de tipografía"
+
+#~ msgid "Default Formatting"
+#~ msgstr "Formato por omisión"
+
+#~ msgid "_Send default formatting with outgoing messages"
+#~ msgstr "_Enviar formato por omisión en los mensajes salientes"
+
+#~ msgid "Window Closing"
+#~ msgstr "Cierre de Ventanas"
+
+#~ msgid "_Escape closes window"
+#~ msgstr "«E_scape» cierra la ventana"
+
+#~ msgid "Show _warning levels"
+#~ msgstr "Mostrar niveles de _aviso"
+
+#~ msgid "Show idle _times"
+#~ msgstr "Mostrar el _tiempo de inactividad"
+
+#~ msgid "_Automatically expand contacts"
+#~ msgstr "Expandir contactos _automáticamente"
+
+#~ msgid "Show _buttons as:"
+#~ msgstr "Mostrar los _botones como:"
+
+#~ msgid "Pictures"
+#~ msgstr "Imágenes"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Pictures and text"
+#~ msgstr "Imágenes y texto"
+
+#~ msgid "Enable \"_slash\" commands"
+#~ msgstr "Activar órdenes \"_barra\""
+
+#~ msgid "Show _formatting toolbar"
+#~ msgstr "Mostrar barra de _formato"
+
+#~ msgid "Show _aliases in tabs/titles"
+#~ msgstr "Mostrar _apodos en las solapas/títulos"
+
+#~ msgid "_Raise IM window on events"
+#~ msgstr "_Alzar ventanas de MI al recibir un evento"
+
+#~ msgid "Raise chat _window on events"
+#~ msgstr "Alzar _ventanas de chat al recibir un evento"
+
+#~ msgid "Tab p_lacement:"
+#~ msgstr "_Ubicación de las solapas:"
+
+#~ msgid "New conversation _placement:"
+#~ msgstr "U_bicación de las nuevas conversaciones:"
+
+#~ msgid "Interface"
+#~ msgstr "Interfaz"
+
+#~ msgid "Message Text"
+#~ msgstr "Texto de los mensajes"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Atajos"
+
+#, fuzzy
+#~ msgid "Logging in: %s"
+#~ msgstr "Registrándose"
+
+#~ msgid "Hide Operating System"
+#~ msgstr "Ocultar el sistema operativo"
+
+#~ msgid "The user %s wants to add you to their buddy list."
+#~ msgstr "El usuario %s quiere añadirle a su lista de amigos."
+
+#~ msgid "Miscellaneous error"
+#~ msgstr "Error misceláneo"
+
+#~ msgid "Initiate Chat"
+#~ msgstr "Iniciar conversación"
+
+#~ msgid "Display conversation closed notices"
+#~ msgstr "Mostrar los avisos de cierre de conversación"
+
+#~ msgid "Display timeout notices"
+#~ msgstr "Mostrar avisos de expiración"
+
+#~ msgid "Unable to connect to server"
+#~ msgstr "No se pudo conectar al servidor"
+
+#~ msgid "Unknown error when attempting to authorize with MSN login server."
+#~ msgstr ""
+#~ "Error desconocido cuando se intentaba obtener autorización del servidor "
+#~ "de registro MSN."
+
+#~ msgid "Requesting to send password"
+#~ msgstr "Solicitando el envió de contraseña"
+
+#~ msgid "Unable to connect to %s server"
+#~ msgstr "No se pudo conectar al servidor %s"
+
+#~ msgid "Error writing to %s server"
+#~ msgstr "Error al leer del servidor %s"
+
+#~ msgid "Error reading from %s server"
+#~ msgstr "Error al leer del servidor %s"
+
+#~ msgid "Received HTTP error. Please report this."
+#~ msgstr "Se recibió un error HTTP. Por favor, informe de ésto."
+
+#~ msgid "The conversation has become inactive and timed out."
+#~ msgstr "La conversación ha pasado a ser inactiva y se ha desconectado."
+
+#, fuzzy
+#~ msgid ""
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s: %s"
+
+#~ msgid ""
+#~ "You were disconnected from the server, because you logged on from a "
+#~ "different location"
+#~ msgstr ""
+#~ "Ha sido desconectado del servidor porque se conectó desde una ubicación "
+#~ "distinta"
+
+#~ msgid ""
+#~ "You have been disconnected because you have signed on with this screen "
+#~ "name at another location."
+#~ msgstr ""
+#~ "Ha sido desconectado porque se ha conectado con el mismo nombre de "
+#~ "usuario desde otra ubicación."
+
+#~ msgid "Default SILC Key Pair"
+#~ msgstr "Par de claves SILC por omisión"
+
+#~ msgid "SILC Public Key"
+#~ msgstr "Clave pública SILC"
+
+#~ msgid "SILC Private Key"
+#~ msgstr "Clave privada SILC"
+
+#~ msgid ""
+#~ "You have been logged off as you have logged in on a different machine or "
+#~ "device."
+#~ msgstr ""
+#~ "Ha sido desconectado dado que se ha conectado en otro equipo o "
+#~ "dispositivo."
+
+#~ msgid ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+#~ "(1,048,576 bytes)."
+#~ msgstr ""
+#~ "Gaim no puede enviar archivos más grandes que un Megabit (1.408.576 "
+#~ "bytes) a través de Yahoo!"
+
+#~ msgid "Please enter your password"
+#~ msgstr "Por favor, indique su contraseña"
+
+# 'Buddy chat room' es una sala de chat en la que se habla
+# con amigos
+#, fuzzy
+#~ msgid ""
+#~ "%s has invited %s to the chat room %s:\n"
+#~ "<b>%s</b>"
+#~ msgstr ""
+#~ "El usuario '%s' invita a %s a la sala de chat de amigos: '%s'\n"
+#~ "%s"
+
 #~ msgid "Restore Away State On Reconnect"
 #~ msgstr "Restaurar el estado de ausencia al reconectarse"
 
@@ -11185,9 +11967,6 @@
 #~ msgid "Sa_ve & Use"
 #~ msgstr "Gua_rdar y usar"
 
-#~ msgid "_Use"
-#~ msgstr "_Usar"
-
 #~ msgid "/Buddies/_Signoff"
 #~ msgstr "/Amigos/_Desconectar"
 
@@ -11317,12 +12096,6 @@
 #~ msgid "Set Available Message..."
 #~ msgstr "Establecer mensaje de disponibilidad..."
 
-#~ msgid "Roomlist"
-#~ msgstr "Lista de salas"
-
-#~ msgid "Cannot get room list"
-#~ msgstr "No se pudo obtener la lista de salas"
-
 #~ msgid "Failed to leave channel"
 #~ msgstr "No se pudo abandonar el canal"
 
@@ -11409,9 +12182,6 @@
 #~ msgid "help:  List available commands."
 #~ msgstr "help:  Muestra las órdenes disponibles"
 
-#~ msgid "_Ignore formatting on incoming messages"
-#~ msgstr "_Ignorar el formato de los mensajes entrantes."
-
 #~ msgid "_Send auto-response"
 #~ msgstr "_Enviar respuesta automática"
 
@@ -11452,9 +12222,6 @@
 #~ msgid "Channels"
 #~ msgstr "Canales"
 
-#~ msgid "Invalid Groupname"
-#~ msgstr "Nombre de grupo inválido"
-
 #~ msgid "Buddy icon file:"
 #~ msgstr "Archivo de icono de amigo:"
 
@@ -11931,9 +12698,6 @@
 #~ msgid "Log"
 #~ msgstr "Histórico"
 
-#~ msgid "Clear"
-#~ msgstr "Limpiar"
-
 #~ msgid ""
 #~ "<span weight='bold' size='larger'>Enter a search phrase\n"
 #~ "</span>"
@@ -12069,9 +12833,6 @@
 #~ msgid "Directory Info"
 #~ msgstr "Información del Directorio"
 
-#~ msgid "Setting Dir Info for %s:"
-#~ msgstr "Guardando la Información de Directorio de %s:"
-
 #~ msgid "Allow Web Searches To Find Your Info"
 #~ msgstr "Dejar que búsquedas en la Web encuentren su información"
 
@@ -12133,9 +12894,6 @@
 #~ msgstr ""
 #~ "El usuario %s es un I.D. de Jabber inválido y por lo tanto no fue añadido."
 
-#~ msgid "Unable to add buddy."
-#~ msgstr "No se pudo añadir un amigo"
-
 #~ msgid "View Error Msg"
 #~ msgstr "Ver mensaje de error"
 
@@ -12145,9 +12903,6 @@
 #~ msgid "Unknown registration error"
 #~ msgstr "Error desconocido al registrar"
 
-#~ msgid "Use SSL"
-#~ msgstr "Usar SSL"
-
 #~ msgid "<B>Status:</B> %s<HR>%s"
 #~ msgstr "<B>Estado:</B> %s<HR>%s"
 
@@ -12434,9 +13189,6 @@
 #~ msgid "List of subscribed chats"
 #~ msgstr "Lista de los chats suscritos"
 
-#~ msgid "Allows you to add chat rooms to your buddy list."
-#~ msgstr "Permite añadir salas de chat a su lista de amigos."
-
 #~ msgid ""
 #~ "Allows you to add chat rooms to your buddy list. Click the configure "
 #~ "button to choose which rooms."
@@ -12595,9 +13347,6 @@
 #~ msgstr ""
 #~ "No dispone de ningún protocolo que permita registrar cuentas nuevas."
 
-#~ msgid "Registration Information"
-#~ msgstr "Información de Registro"
-
 #~ msgid "Buddy Chat Invite"
 #~ msgstr "Invitar a un chat"