changeset 4294:d82850c50cf4

[gaim-migrate @ 4547] Nicola's Lichtmaier (niqueco) updated the spanish translation and the POTFILES.in committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 11 Jan 2003 14:35:37 +0000
parents 79d871c11eb9
children 0bdfcae57be7
files po/POTFILES.in po/es.po
diffstat 2 files changed, 927 insertions(+), 725 deletions(-) [+]
line wrap: on
line diff
--- a/po/POTFILES.in	Sat Jan 11 09:19:39 2003 +0000
+++ b/po/POTFILES.in	Sat Jan 11 14:35:37 2003 +0000
@@ -23,6 +23,7 @@
 src/buddy_chat.c
 src/conversation.c
 src/dialogs.c
+src/ft.c
 src/gaimrc.c
 src/html.c
 src/module.c
--- a/po/es.po	Sat Jan 11 09:19:39 2003 +0000
+++ b/po/es.po	Sat Jan 11 14:35:37 2003 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2003-01-07 01:27-0300\n"
-"PO-Revision-Date: 2003-01-07 01:33-0300\n"
+"POT-Creation-Date: 2003-01-10 22:26-0300\n"
+"PO-Revision-Date: 2003-01-10 22:42-0300\n"
 "Last-Translator: Nicolás Lichtmaier <nick@technisys.com.ar>\n"
 "Language-Team:  <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,16 +20,16 @@
 msgstr "Nuevo..."
 
 #: plugins/docklet/docklet.c:123 src/protocols/gg/gg.c:75
-#: src/protocols/jabber/jabber.c:1164 src/buddy.c:499 src/buddy.c:2532
+#: src/protocols/jabber/jabber.c:1168 src/buddy.c:489 src/buddy.c:2531
 #: src/buddy.c:2662 src/prefs.c:742
 msgid "Away"
 msgstr "Ausente"
 
-#: plugins/docklet/docklet.c:129 src/away.c:485
+#: plugins/docklet/docklet.c:129 src/away.c:494
 msgid "Back"
 msgstr "Retroceder"
 
-#: plugins/docklet/docklet.c:138 src/multi.c:255
+#: plugins/docklet/docklet.c:138 src/multi.c:257
 msgid "Auto-login"
 msgstr "Conectarse Automáticamente"
 
@@ -57,7 +57,7 @@
 msgid "Quit"
 msgstr "Salir"
 
-#: plugins/docklet/docklet.c:402
+#: plugins/docklet/docklet.c:466
 msgid "Tray Icon Configuration"
 msgstr "Configuración del Ícono de Estado"
 
@@ -65,17 +65,17 @@
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:411
+#: plugins/docklet/docklet.c:475
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Ocultar nuevos mensajes hasta que se clickea en el ícono de estado"
 
 #  Me pareció que "bandeja" no suen bien todavía, no es común. Veremos si se
 #  populariza esa traducción en el resto de Gnome. nl.
-#: plugins/docklet/docklet.c:423
+#: plugins/docklet/docklet.c:487
 msgid "Tray Icon"
 msgstr "Ícono de Estado"
 
-#: plugins/docklet/docklet.c:425 plugins/docklet/docklet.c:436
+#: plugins/docklet/docklet.c:489 plugins/docklet/docklet.c:500
 msgid ""
 "Interacts with a System Tray applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -89,13 +89,13 @@
 "ventana de conexión.  También permite encolar los mansajes hasta que se haga "
 "click en el ícono, como lo hace ICQ (aunque el ícono todavía no titila =) )."
 
-#: plugins/docklet/docklet.c:426
+#: plugins/docklet/docklet.c:490
 msgid "Robert McQueen &lt;robot101@debian.org>"
 msgstr ""
 
 #  Me pareció que "bandeja" no suen bien todavía, no es común. Veremos si se
 #  populariza esa traducción en el resto de Gnome. nl.
-#: plugins/docklet/docklet.c:432
+#: plugins/docklet/docklet.c:496
 msgid "System Tray Icon"
 msgstr "Ícono de Estado"
 
@@ -117,16 +117,16 @@
 msgstr "Refrescar"
 
 #. buttons
-#: plugins/chatlist.c:319 src/protocols/icq/gaim_icq.c:279
-#: src/protocols/oscar/oscar.c:2187 src/buddy.c:494 src/buddy.c:2760
-#: src/buddy_chat.c:902 src/buddy_chat.c:1584 src/conversation.c:2309
-#: src/conversation.c:2898 src/dialogs.c:2588 src/prpl.c:638
+#: plugins/chatlist.c:319 src/protocols/icq/gaim_icq.c:284
+#: src/protocols/oscar/oscar.c:2278 src/buddy.c:484 src/buddy.c:2760
+#: src/buddy_chat.c:902 src/buddy_chat.c:1586 src/conversation.c:2201
+#: src/conversation.c:2791 src/dialogs.c:2588 src/prpl.c:670
 msgid "Add"
 msgstr "Añadir"
 
-#: plugins/chatlist.c:320 src/buddy.c:496 src/buddy.c:2762
-#: src/buddy_chat.c:900 src/buddy_chat.c:1586 src/conversation.c:2293
-#: src/conversation.c:2892
+#: plugins/chatlist.c:320 src/buddy.c:486 src/buddy.c:2762
+#: src/buddy_chat.c:900 src/buddy_chat.c:1588 src/conversation.c:2185
+#: src/conversation.c:2785
 msgid "Remove"
 msgstr "Quitar"
 
@@ -167,69 +167,69 @@
 msgid "Change"
 msgstr "Cambios"
 
-#: plugins/notify.c:389
+#: plugins/notify.c:396
 msgid "Unable to write to config file"
 msgstr "No se pudo escribir archivo de configuración."
 
-#: plugins/notify.c:389
+#: plugins/notify.c:396
 msgid "Notify plugin"
 msgstr "Plugin de notificado"
 
-#: plugins/notify.c:561
+#: plugins/notify.c:568
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: plugins/notify.c:562
+#: plugins/notify.c:569
 msgid "_IM windows"
 msgstr "Ventanas de _mensajes"
 
-#: plugins/notify.c:567
+#: plugins/notify.c:574
 msgid "_Chat windows"
 msgstr "Ventanas de _chat"
 
 #. --------------
-#: plugins/notify.c:573
+#: plugins/notify.c:580
 msgid "Notification Methods"
 msgstr "Métodos de Notificación"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:583
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr "Prefijar la _cadena en el título de la ventana (enter para aplicar):"
 
-#: plugins/notify.c:587
+#: plugins/notify.c:594
 msgid "_Quote window title"
 msgstr "_Entrecomillar el título de la ventana"
 
-#: plugins/notify.c:592
+#: plugins/notify.c:599
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "Activar pista \"_URGENT\" (urgente) del Gestor de Ventanas"
 
-#: plugins/notify.c:597
+#: plugins/notify.c:604
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar la c_uenta de los nuevos mensajes en el título de la ventana"
 
-#: plugins/notify.c:602
+#: plugins/notify.c:609
 msgid "_Notify even if conversation is in focus"
 msgstr "_Notificar aun si la conversación está en foco"
 
 #. --------------
-#: plugins/notify.c:608
+#: plugins/notify.c:615
 msgid "Notification Removal"
 msgstr "Eliminado de la Notificación"
 
-#: plugins/notify.c:609
+#: plugins/notify.c:616
 msgid "Remove when conversation window gains _focus"
 msgstr "Eliminar cuando la ventana de la conversación obtiene el _foco"
 
-#: plugins/notify.c:614
+#: plugins/notify.c:621
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversación _recibe un click"
 
-#: plugins/notify.c:619
+#: plugins/notify.c:626
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _tipee en la ventana de la conversación"
 
-#: plugins/notify.c:624
+#: plugins/notify.c:631
 msgid "Appl_y"
 msgstr "_Aplicar"
 
@@ -241,19 +241,27 @@
 msgid "Auto Reconnect"
 msgstr "Auto Reconexión"
 
-#: plugins/timestamp.c:73
+#: plugins/timestamp.c:72
+msgid "iChat Timestamp"
+msgstr "Fechado estilo iChat"
+
+#: plugins/timestamp.c:92
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#: plugins/timestamp.c:129
 msgid "Timestamp"
 msgstr "Fechado"
 
-#: plugins/timestamp.c:75
-msgid "Adds iChat-style timestamps to conversations every 5 minutes."
-msgstr "Añade un fechado estilo iChat en las conversaciones cada 5 minutos."
-
-#: plugins/history.c:72
+#: plugins/timestamp.c:131
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "Añade un fechado estilo iChat en las conversaciones cada N minutos."
+
+#: plugins/history.c:73
 msgid "History"
 msgstr "Historial"
 
-#: plugins/history.c:74
+#: plugins/history.c:75
 msgid "Shows recently logged conversations in new conversations "
 msgstr "Muestra las conversaciones anteriores en las nuevas"
 
@@ -272,7 +280,7 @@
 msgstr "Iconificar en Ausencia"
 
 #: src/protocols/gg/gg.c:73 src/protocols/msn/msn.c:2333
-#: src/protocols/msn/msn.c:2438
+#: src/protocols/msn/msn.c:2436
 msgid "Available"
 msgstr "En línea"
 
@@ -292,7 +300,7 @@
 msgid "Invisible for friends only"
 msgstr "Invisible sólo para los amigos"
 
-#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1160
+#: src/protocols/gg/gg.c:79 src/protocols/jabber/jabber.c:1164
 msgid "Unavailable"
 msgstr "No disponible"
 
@@ -324,7 +332,7 @@
 msgid "Unknown Error Code."
 msgstr "Código de error desconocido."
 
-#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2488
+#: src/protocols/gg/gg.c:288 src/protocols/msn/msn.c:2471
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
@@ -540,7 +548,7 @@
 #. show_set_dir(gc);
 #.
 #: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1181
-#: src/protocols/jabber/jabber.c:4147 src/protocols/jabber/jabber.c:4160
+#: src/protocols/jabber/jabber.c:4156 src/protocols/jabber/jabber.c:4169
 #: src/dialogs.c:2238
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
@@ -569,7 +577,7 @@
 "Gaim no pudo aceder al perfil de este usuario debido a un error al intentar "
 "conectarse al servidor de directorio.  Por favor intente más tarde."
 
-#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:511
+#: src/protocols/gg/gg.c:1293 src/protocols/icq/gaim_icq.c:516
 msgid "Nick:"
 msgstr "Apodo:"
 
@@ -577,50 +585,50 @@
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: src/protocols/icq/gaim_icq.c:229
+#: src/protocols/icq/gaim_icq.c:231
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim encontró un error mientras se comunicaba con el servidor ICQ."
 
-#: src/protocols/icq/gaim_icq.c:279 src/protocols/irc/irc.c:1258
-#: src/protocols/oscar/oscar.c:2033 src/protocols/oscar/oscar.c:4634
-#: src/protocols/toc/toc.c:1987 src/buddy_chat.c:311 src/buddy_chat.c:395
-#: src/dialogs.c:2180 src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577
-#: src/dialogs.c:2759 src/dialogs.c:2936 src/dialogs.c:3003 src/dialogs.c:3622
-#: src/dialogs.c:3820 src/dialogs.c:3977 src/dialogs.c:4466 src/dialogs.c:5208
-#: src/multi.c:1040 src/multi.c:1139 src/multi.c:1457 src/prpl.c:280
-#: src/prpl.c:638
+#: src/protocols/icq/gaim_icq.c:284 src/protocols/irc/irc.c:1264
+#: src/protocols/oscar/oscar.c:2055 src/protocols/oscar/oscar.c:2113
+#: src/protocols/oscar/oscar.c:4873 src/protocols/toc/toc.c:1991
+#: src/buddy_chat.c:311 src/buddy_chat.c:395 src/dialogs.c:2180
+#: src/dialogs.c:2303 src/dialogs.c:2368 src/dialogs.c:2577 src/dialogs.c:2759
+#: src/dialogs.c:2936 src/dialogs.c:3631 src/dialogs.c:3832 src/dialogs.c:3989
+#: src/dialogs.c:4482 src/dialogs.c:5234 src/ft.c:150 src/multi.c:1042
+#: src/multi.c:1141 src/multi.c:1460 src/prpl.c:312 src/prpl.c:670
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1651
-#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
-#: src/protocols/oscar/oscar.c:2133
+#: src/protocols/icq/gaim_icq.c:304 src/protocols/jabber/jabber.c:1661
+#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1303
+#: src/protocols/oscar/oscar.c:2224 src/protocols/oscar/oscar.c:4359
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1651
-#: src/protocols/msn/msn.c:1146 src/protocols/msn/msn.c:1301
-#: src/protocols/oscar/oscar.c:2133 src/protocols/oscar/oscar.c:2187
+#: src/protocols/icq/gaim_icq.c:304 src/protocols/jabber/jabber.c:1661
+#: src/protocols/msn/msn.c:1153 src/protocols/msn/msn.c:1303
+#: src/protocols/oscar/oscar.c:2224 src/protocols/oscar/oscar.c:4359
 #: src/dialogs.c:2576
 msgid "Deny"
 msgstr "Negar"
 
-#: src/protocols/icq/gaim_icq.c:306
+#: src/protocols/icq/gaim_icq.c:313
 msgid "Send message through server"
 msgstr "Enviar mensajes a través del servidor"
 
-#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:2614
-#: src/protocols/jabber/jabber.c:3240 src/protocols/jabber/jabber.c:3273
-#: src/protocols/oscar/oscar.c:4673 src/protocols/oscar/oscar.c:4725
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/icq/gaim_icq.c:476 src/protocols/irc/irc.c:2622
+#: src/protocols/jabber/jabber.c:3249 src/protocols/jabber/jabber.c:3282
+#: src/protocols/oscar/oscar.c:4911 src/protocols/oscar/oscar.c:4961
+#: src/protocols/toc/toc.c:1261
 msgid "Get Info"
 msgstr "Obtener Información"
 
-#: src/protocols/icq/gaim_icq.c:512
+#: src/protocols/icq/gaim_icq.c:517
 msgid "Gaim User"
 msgstr "Usuario de Gaim"
 
-#: src/protocols/irc/irc.c:199
+#: src/protocols/irc/irc.c:201
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -628,80 +636,80 @@
 "(Hubo un error convirtiendo este mensaje.  Verifique la opción "
 "'Codificación' en el Editor de Cuentas)"
 
-#: src/protocols/irc/irc.c:513 src/protocols/irc/irc.c:2324
+#: src/protocols/irc/irc.c:515 src/protocols/irc/irc.c:2332
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "Se cerró la conversación vía DCC con %s"
 
-#: src/protocols/irc/irc.c:578 src/protocols/irc/irc.c:2333
+#: src/protocols/irc/irc.c:580 src/protocols/irc/irc.c:2341
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "Conversación vía DCC con %s establecida"
 
-#: src/protocols/irc/irc.c:689
+#: src/protocols/irc/irc.c:691
 msgid "No topic is set"
 msgstr "No se asignó tema"
 
-#: src/protocols/irc/irc.c:709 src/protocols/irc/irc.c:1514
+#: src/protocols/irc/irc.c:711 src/protocols/irc/irc.c:1520
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s ha cambiado el tema a: %s</B>"
 
-#: src/protocols/irc/irc.c:753
+#: src/protocols/irc/irc.c:755
 #, c-format
-msgid "-:- modo/%s [%c%c %s] por %s"
-msgstr ""
+msgid "-:- mode/%s [%c%c %s] by %s"
+msgstr "-:- modo/%s [%c%c %s] por %s"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1059
+#: src/protocols/irc/irc.c:1061
 msgid "Rehashing server"
 msgstr "El servidor está efectuando la operación \"rehash\""
 
-#: src/protocols/irc/irc.c:1059 src/protocols/irc/irc.c:1409
+#: src/protocols/irc/irc.c:1061 src/protocols/irc/irc.c:1415
 msgid "IRC Operator"
 msgstr "Operador IRC"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1062
+#: src/protocols/irc/irc.c:1064
 msgid "No such nick/channel"
 msgstr "No existe el apodo/canal"
 
-#: src/protocols/irc/irc.c:1062 src/protocols/irc/irc.c:1065
-#: src/protocols/irc/irc.c:1067 src/protocols/irc/irc.c:1070
-#: src/protocols/irc/irc.c:1367
+#: src/protocols/irc/irc.c:1064 src/protocols/irc/irc.c:1067
+#: src/protocols/irc/irc.c:1069 src/protocols/irc/irc.c:1072
+#: src/protocols/irc/irc.c:1373
 msgid "IRC Error"
 msgstr "Error de IRC"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1065
+#: src/protocols/irc/irc.c:1067
 msgid "No such server"
 msgstr "No existe el servidor"
 
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1067
+#: src/protocols/irc/irc.c:1069
 msgid "No nickname given"
 msgstr "No se indicó un apodo"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1070
+#: src/protocols/irc/irc.c:1072
 msgid "You're not an IRC operator!"
 msgstr "¡Usted no es un operador de IRC|"
 
-#: src/protocols/irc/irc.c:1073
+#: src/protocols/irc/irc.c:1075
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "Ese apodo ya está en uso.  Ingrese uno nuevo"
 
-#: src/protocols/irc/irc.c:1220 src/protocols/irc/irc.c:1226
-#: src/protocols/irc/irc.c:1232 src/protocols/irc/irc.c:1246
+#: src/protocols/irc/irc.c:1226 src/protocols/irc/irc.c:1232
+#: src/protocols/irc/irc.c:1238 src/protocols/irc/irc.c:1252
 msgid "IRC CTCP info"
 msgstr "Info IRC CTCP"
 
-#: src/protocols/irc/irc.c:1257
+#: src/protocols/irc/irc.c:1263
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s quiere establecer una conversación vía DCC"
 
-#: src/protocols/irc/irc.c:1258
+#: src/protocols/irc/irc.c:1264
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
@@ -709,66 +717,66 @@
 "Solicita una conexión directa entre las dos computadoras. Los mensajes "
 "enviados no pasaran por el servidor de IRC"
 
-#: src/protocols/irc/irc.c:1258 src/protocols/oscar/oscar.c:2033
-#: src/protocols/oscar/oscar.c:4634
+#: src/protocols/irc/irc.c:1264 src/protocols/oscar/oscar.c:2055
+#: src/protocols/oscar/oscar.c:4873
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/protocols/irc/irc.c:1303 src/protocols/msn/msn.c:307
-#: src/protocols/msn/msn.c:1310 src/protocols/msn/msn.c:1326
+#: src/protocols/irc/irc.c:1309 src/protocols/msn/msn.c:310
+#: src/protocols/msn/msn.c:1312 src/protocols/msn/msn.c:1328
 #: src/protocols/msn/msn.c:1811
 msgid "Unable to write"
 msgstr "No se pudo escribir"
 
-#: src/protocols/irc/irc.c:1365
+#: src/protocols/irc/irc.c:1371
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "Ha sido expulsado de %s: %s"
 
-#: src/protocols/irc/irc.c:1370
+#: src/protocols/irc/irc.c:1376
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Expulsado por %s: %s"
 
-#: src/protocols/irc/irc.c:1426 src/protocols/irc/irc.c:2633
+#: src/protocols/irc/irc.c:1432 src/protocols/irc/irc.c:2641
 msgid "CTCP ClientInfo"
 msgstr "Información del cliente vía CTCP"
 
-#: src/protocols/irc/irc.c:1432 src/protocols/irc/irc.c:2639
+#: src/protocols/irc/irc.c:1438 src/protocols/irc/irc.c:2647
 msgid "CTCP UserInfo"
 msgstr "Información del Usuario vía CTCP"
 
-#: src/protocols/irc/irc.c:1438 src/protocols/irc/irc.c:2645
+#: src/protocols/irc/irc.c:1444 src/protocols/irc/irc.c:2653
 msgid "CTCP Version"
 msgstr "Obtener versión del cliente vía CTCP"
 
-#: src/protocols/irc/irc.c:1465 src/protocols/irc/irc.c:2651
+#: src/protocols/irc/irc.c:1471 src/protocols/irc/irc.c:2659
 msgid "CTCP Ping"
 msgstr "Ping CTCP"
 
-#: src/protocols/irc/irc.c:1942
+#: src/protocols/irc/irc.c:1950
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "El tema de %s es %s"
 
-#: src/protocols/irc/irc.c:2034
+#: src/protocols/irc/irc.c:2042
 #, c-format
 msgid "You have left %s"
 msgstr "Ha abandonado %s"
 
-#: src/protocols/irc/irc.c:2035
+#: src/protocols/irc/irc.c:2043
 msgid "IRC Part"
 msgstr "Salir de IRC"
 
-#: src/protocols/irc/irc.c:2089
+#: src/protocols/irc/irc.c:2097
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>Solicitando conversación vía DCC</I>"
 
-#: src/protocols/irc/irc.c:2106
+#: src/protocols/irc/irc.c:2114
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>Comandos de operador:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2110
+#: src/protocols/irc/irc.c:2118
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -776,11 +784,11 @@
 "<B>Comandos CTCP:<BR>CLIENTINFO <apodo><BR>USERINFO <apodo><BR>VERSION "
 "<apodo><BR>PING <apodo></B><BR>"
 
-#: src/protocols/irc/irc.c:2117
+#: src/protocols/irc/irc.c:2125
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>Comandos DCC:<BR>CHAT <apodo></B>"
 
-#: src/protocols/irc/irc.c:2121
+#: src/protocols/irc/irc.c:2129
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -789,55 +797,55 @@
 msgstr ""
 "<B>Comandos actualmente soportados:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
-"W WHOWAS<BR>Tipee /HELP OPER para comandos del operador<BR>Tipee /HELP "
-"CTCP para comandos CTCP<BR>Tipee /HELP DCC para comandos DCC"
-
-#: src/protocols/irc/irc.c:2143
+"W WHOWAS<BR>Tipee /HELP OPER para comandos del operador<BR>Tipee /HELP CTCP "
+"para comandos CTCP<BR>Tipee /HELP DCC para comandos DCC"
+
+#: src/protocols/irc/irc.c:2151
 msgid "<B>Unknown command</B>"
 msgstr "<B>Comando desconocido</B>"
 
-#: src/protocols/irc/irc.c:2202
+#: src/protocols/irc/irc.c:2210
 msgid "Channel:"
 msgstr "Canal:"
 
-#: src/protocols/irc/irc.c:2206 src/aim.c:325 src/multi.c:641
+#: src/protocols/irc/irc.c:2214 src/aim.c:325 src/multi.c:643
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/protocols/irc/irc.c:2620
+#: src/protocols/irc/irc.c:2628
 msgid "DCC Chat"
 msgstr "Conversar por DCC"
 
-#: src/protocols/irc/irc.c:2691 src/protocols/jabber/jabber.c:2859
-#: src/protocols/msn/msn.c:2886 src/protocols/napster/napster.c:615
+#: src/protocols/irc/irc.c:2697 src/protocols/jabber/jabber.c:2868
+#: src/protocols/msn/msn.c:2854 src/protocols/napster/napster.c:615
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/protocols/irc/irc.c:2697 src/protocols/jabber/jabber.c:4223
-#: src/protocols/msn/msn.c:2892 src/protocols/napster/napster.c:621
+#: src/protocols/irc/irc.c:2703 src/protocols/jabber/jabber.c:4230
+#: src/protocols/msn/msn.c:2860 src/protocols/napster/napster.c:621
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/protocols/irc/irc.c:2703
+#: src/protocols/irc/irc.c:2709
 msgid "Encoding:"
 msgstr "Codificación:"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:975
 msgid "Unable to change password."
 msgstr "No se puede cambiar la contraseña."
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:976
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr ""
 "La ingresada no es la contraseña actual. Su contraseña no ha sido cambiada."
 
-#: src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:981
 msgid "Unable to change password"
 msgstr "No se pudo cambiar la contraseña"
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:982
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
@@ -845,43 +853,43 @@
 "La nueva contraseña que usted ingresó es la misma que la actual.  Su "
 "contraseña seguirá siendo la misma."
 
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1142
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/protocols/jabber/jabber.c:1166 src/protocols/jabber/jabber.c:1184
-#: src/buddy.c:2795 src/multi.c:245
+#: src/protocols/jabber/jabber.c:1170 src/protocols/jabber/jabber.c:1188
+#: src/buddy.c:2795 src/multi.c:247
 msgid "Online"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1172
 msgid "Extended Away"
 msgstr "Ausencia Extendida"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1174
 msgid "Do Not Disturb"
 msgstr "No Molestar"
 
-#: src/protocols/jabber/jabber.c:1367
+#: src/protocols/jabber/jabber.c:1371
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Error Jabber %s"
 
-#: src/protocols/jabber/jabber.c:1473
+#: src/protocols/jabber/jabber.c:1477
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1476
+#: src/protocols/jabber/jabber.c:1480
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: src/protocols/jabber/jabber.c:1646
+#: src/protocols/jabber/jabber.c:1656
 #, 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/jabber.c:1671
+#: src/protocols/jabber/jabber.c:1681
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
@@ -889,179 +897,179 @@
 "El usuario Jabber %s no existe y por lo tanto no se lo añadirá a su \"roster"
 "\"."
 
-#: src/protocols/jabber/jabber.c:1674
+#: src/protocols/jabber/jabber.c:1684
 msgid "No such user."
 msgstr "No existe el usuario."
 
-#: src/protocols/jabber/jabber.c:1756 src/protocols/msn/msn.c:1336
-#: src/dialogs.c:925
+#: src/protocols/jabber/jabber.c:1766 src/protocols/msn/msn.c:1338
+#: src/dialogs.c:926
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/protocols/jabber/jabber.c:1816
+#: src/protocols/jabber/jabber.c:1825
 msgid "Authenticating"
 msgstr "Autentificando"
 
-#: src/protocols/jabber/jabber.c:1853
+#: src/protocols/jabber/jabber.c:1862
 msgid "Unknown login error"
 msgstr "Error de login desconocido."
 
-#: src/protocols/jabber/jabber.c:2241
+#: src/protocols/jabber/jabber.c:2250
 msgid "Password successfully changed."
 msgstr "La contraseña se cambió correctamente."
 
-#: src/protocols/jabber/jabber.c:2285 src/protocols/jabber/jabber.c:4075
+#: src/protocols/jabber/jabber.c:2294 src/protocols/jabber/jabber.c:4084
 msgid "Connection lost"
 msgstr "Se perdió la conexión"
 
-#: src/protocols/jabber/jabber.c:2287 src/protocols/jabber/jabber.c:2319
-#: src/protocols/jabber/jabber.c:4077 src/protocols/jabber/jabber.c:4123
+#: src/protocols/jabber/jabber.c:2296 src/protocols/jabber/jabber.c:2328
+#: src/protocols/jabber/jabber.c:4086 src/protocols/jabber/jabber.c:4132
 #: src/protocols/msn/msn.c:1961 src/protocols/msn/msn.c:1990
 msgid "Unable to connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/jabber/jabber.c:2293
+#: src/protocols/jabber/jabber.c:2302
 msgid "Connected"
 msgstr "Conectado"
 
-#: src/protocols/jabber/jabber.c:2296
+#: src/protocols/jabber/jabber.c:2305
 msgid "Requesting Authentication Method"
 msgstr "Solicitando Método de Autentificación"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2314 src/protocols/msn/msn.c:1982
+#: src/protocols/jabber/jabber.c:2323 src/protocols/msn/msn.c:1982
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/protocols/jabber/jabber.c:2618
+#: src/protocols/jabber/jabber.c:2627
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr ""
 "El usuario %s es un I.D. de Jabber inválido y por lo tanto no fue añadido."
 
-#: src/protocols/jabber/jabber.c:2620
+#: src/protocols/jabber/jabber.c:2629
 msgid "Jabber Error"
 msgstr "Error Jabber"
 
-#: src/protocols/jabber/jabber.c:2855
+#: src/protocols/jabber/jabber.c:2864
 msgid "Room:"
 msgstr "Sala:"
 
-#: src/protocols/jabber/jabber.c:2864
+#: src/protocols/jabber/jabber.c:2873
 msgid "Handle:"
 msgstr "Gestor:"
 
-#: src/protocols/jabber/jabber.c:2888
+#: src/protocols/jabber/jabber.c:2897
 msgid "Unable to join chat"
 msgstr "No se pudo unir a la conversación."
 
-#: src/protocols/jabber/jabber.c:2921
+#: src/protocols/jabber/jabber.c:2930
 msgid "Chats"
 msgstr "Conversaciones"
 
-#: src/protocols/jabber/jabber.c:3228
+#: src/protocols/jabber/jabber.c:3237
 msgid "View Error Msg"
 msgstr "Ver Mensaje de Error"
 
-#: src/protocols/jabber/jabber.c:3245 src/protocols/oscar/oscar.c:4686
+#: src/protocols/jabber/jabber.c:3254 src/protocols/oscar/oscar.c:4924
 #: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "Mensaje de Ausencia"
 
-#: src/protocols/jabber/jabber.c:3252
+#: src/protocols/jabber/jabber.c:3261
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: src/protocols/jabber/jabber.c:3255
+#: src/protocols/jabber/jabber.c:3264
 msgid "Temporarily Hide From"
 msgstr "Ocultarse Temporariamente de"
 
-#: src/protocols/jabber/jabber.c:3278
+#: src/protocols/jabber/jabber.c:3287
 msgid "Remove From Roster"
 msgstr "Sacar del \"roster\""
 
-#: src/protocols/jabber/jabber.c:3283
+#: src/protocols/jabber/jabber.c:3292
 msgid "Cancel Presence Notification"
 msgstr "Cancelar Notificación de Presencia"
 
-#: src/protocols/jabber/jabber.c:3476
+#: src/protocols/jabber/jabber.c:3485
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: src/protocols/jabber/jabber.c:3477
+#: src/protocols/jabber/jabber.c:3486
 msgid "Family Name"
 msgstr "Apellido"
 
-#: src/protocols/jabber/jabber.c:3478
+#: src/protocols/jabber/jabber.c:3487
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3479
+#: src/protocols/jabber/jabber.c:3488
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/protocols/jabber/jabber.c:3480 src/dialogs.c:3016
+#: src/protocols/jabber/jabber.c:3489 src/dialogs.c:3043
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3481
+#: src/protocols/jabber/jabber.c:3490
 msgid "Street Address"
 msgstr "Calle"
 
-#: src/protocols/jabber/jabber.c:3482
+#: src/protocols/jabber/jabber.c:3491
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
-#: src/protocols/jabber/jabber.c:3483
+#: src/protocols/jabber/jabber.c:3492
 msgid "Locality"
 msgstr "Localidad"
 
-#: src/protocols/jabber/jabber.c:3484
+#: src/protocols/jabber/jabber.c:3493
 msgid "Region"
 msgstr "Región"
 
-#: src/protocols/jabber/jabber.c:3485
+#: src/protocols/jabber/jabber.c:3494
 msgid "Postal Code"
 msgstr "Código postal"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3486 src/dialogs.c:2144 src/dialogs.c:2847
+#: src/protocols/jabber/jabber.c:3495 src/dialogs.c:2144 src/dialogs.c:2847
 msgid "Country"
 msgstr "País"
 
-#: src/protocols/jabber/jabber.c:3487
+#: src/protocols/jabber/jabber.c:3496
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: src/protocols/jabber/jabber.c:3488 src/dialogs.c:2921
+#: src/protocols/jabber/jabber.c:3497 src/dialogs.c:2921
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:3498
 msgid "Organization Name"
 msgstr "Nombre de la Organización"
 
-#: src/protocols/jabber/jabber.c:3490
+#: src/protocols/jabber/jabber.c:3499
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: src/protocols/jabber/jabber.c:3491
+#: src/protocols/jabber/jabber.c:3500
 msgid "Title"
 msgstr "Título"
 
-#: src/protocols/jabber/jabber.c:3492
+#: src/protocols/jabber/jabber.c:3501
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/jabber.c:3493
+#: src/protocols/jabber/jabber.c:3502
 msgid "Birthday"
 msgstr "Fecha de nacimiento"
 
-#: src/protocols/jabber/jabber.c:3494 src/dialogs.c:3024 src/prefs.c:996
+#: src/protocols/jabber/jabber.c:3503 src/dialogs.c:3053 src/prefs.c:996
 msgid "Description"
 msgstr "Descripción"
 
-#: src/protocols/jabber/jabber.c:3519
+#: src/protocols/jabber/jabber.c:3528
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -1069,189 +1077,189 @@
 "Todos los campos siguientes son opcionales. Introduzca solo la información "
 "que siente confortable compartir"
 
-#: src/protocols/jabber/jabber.c:3520
+#: src/protocols/jabber/jabber.c:3529
 msgid "User Identity"
 msgstr "Identidad de Usuario"
 
-#: src/protocols/jabber/jabber.c:3932
+#: src/protocols/jabber/jabber.c:3941
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Editar datos en Jabber"
 
-#: src/protocols/jabber/jabber.c:4005
+#: src/protocols/jabber/jabber.c:4014
 msgid "Server Registration successful!"
 msgstr "Registro en el servidor efectuado exitosamente"
 
-#: src/protocols/jabber/jabber.c:4032
+#: src/protocols/jabber/jabber.c:4041
 msgid "Unknown registration error"
 msgstr "Error desconocido al registrar"
 
-#: src/protocols/jabber/jabber.c:4141 src/protocols/jabber/jabber.c:4156
+#: src/protocols/jabber/jabber.c:4150 src/protocols/jabber/jabber.c:4165
 msgid "Set User Info"
 msgstr "Cambiar Información de Usuario"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:225
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Error de sintaxis (probablemente un bug de Gaim)"
 
-#: src/protocols/msn/msn.c:225
+#: src/protocols/msn/msn.c:228
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Parámetro inválido (probablemente un bug de Gaim)"
 
-#: src/protocols/msn/msn.c:228
-msgid "Invalid User"
-msgstr "Usuario no válido"
-
 #: src/protocols/msn/msn.c:231
+msgid "Invalid User"
+msgstr "Usuario no válido"
+
+#: src/protocols/msn/msn.c:234
 msgid "Fully Qualified Domain Name missing"
 msgstr "Falta un nombre de dominio completo"
 
-#: src/protocols/msn/msn.c:234
+#: src/protocols/msn/msn.c:237
 msgid "Already Login"
 msgstr "Ya ingresó"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:240
 msgid "Invalid Username"
 msgstr "Nombre de usuario no válido"
 
-#: src/protocols/msn/msn.c:240
-msgid "Invalid Friendly Name"
-msgstr "Nombre no válido"
-
 #: src/protocols/msn/msn.c:243
+msgid "Invalid Friendly Name"
+msgstr "Nombre no válido"
+
+#: src/protocols/msn/msn.c:246
 msgid "List Full"
 msgstr "Lista llena"
 
-#: src/protocols/msn/msn.c:246
-msgid "Already there"
-msgstr "Ya en lista"
-
 #: src/protocols/msn/msn.c:249
-msgid "Not on list"
-msgstr "No está en la lista"
+msgid "Already there"
+msgstr "Ya en lista"
 
 #: src/protocols/msn/msn.c:252
+msgid "Not on list"
+msgstr "No está en la lista"
+
+#: src/protocols/msn/msn.c:255
 msgid "User is offline"
 msgstr "El usuario no está conectado"
 
-#: src/protocols/msn/msn.c:255
+#: src/protocols/msn/msn.c:258
 msgid "Already in the mode"
 msgstr "Ya en ese modo"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:261
 msgid "Already in opposite list"
 msgstr "Ya está en la lista contraria"
 
-#: src/protocols/msn/msn.c:261
+#: src/protocols/msn/msn.c:264
 msgid "Switchboard failed"
 msgstr "Falló el servidor Switchboard"
 
-#: src/protocols/msn/msn.c:264
+#: src/protocols/msn/msn.c:267
 msgid "Notify Transfer failed"
 msgstr "Falló la Notificación de la Transferencia"
 
-#: src/protocols/msn/msn.c:268
+#: src/protocols/msn/msn.c:271
 msgid "Required fields missing"
 msgstr "Faltan campos obligatorios"
 
-#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:398
+#: src/protocols/msn/msn.c:274 src/protocols/oscar/oscar.c:411
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
-#: src/protocols/msn/msn.c:275
+#: src/protocols/msn/msn.c:278
 msgid "Internal server error"
 msgstr "Error interno del servidor"
 
-#: src/protocols/msn/msn.c:278
+#: src/protocols/msn/msn.c:281
 msgid "Database server error"
 msgstr "Error del servidor de base de datos"
 
-#: src/protocols/msn/msn.c:281
-msgid "File operation error"
-msgstr "Error de archivos"
-
 #: src/protocols/msn/msn.c:284
+msgid "File operation error"
+msgstr "Error de archivos"
+
+#: src/protocols/msn/msn.c:287
 msgid "Memory allocation error"
 msgstr "Error pidiendo memoria"
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:291
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: src/protocols/msn/msn.c:291
+#: src/protocols/msn/msn.c:294
 msgid "Server unavailable"
 msgstr "Servidor no disponible"
 
-#: src/protocols/msn/msn.c:294
-msgid "Peer Notification server down"
-msgstr "Servidor de notificación de pares caído"
-
 #: src/protocols/msn/msn.c:297
+msgid "Peer Notification server down"
+msgstr "Servidor de notificación de pares caído"
+
+#: src/protocols/msn/msn.c:300
 msgid "Database connect error"
 msgstr "Error de conexión con la base de datos"
 
-#: src/protocols/msn/msn.c:300
+#: src/protocols/msn/msn.c:303
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor está apagándose (Sálvese quien pueda)"
 
-#: src/protocols/msn/msn.c:304
+#: src/protocols/msn/msn.c:307
 msgid "Error creating connection"
 msgstr "Error al crear la conexión"
 
-#: src/protocols/msn/msn.c:310
+#: src/protocols/msn/msn.c:313
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:316
 #, fuzzy
 msgid "User is too active"
 msgstr "El usuario no está conectado"
 
-#: src/protocols/msn/msn.c:316
+#: src/protocols/msn/msn.c:319
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
-#: src/protocols/msn/msn.c:319
+#: src/protocols/msn/msn.c:322
 msgid "Not expected"
 msgstr "No se esperaba"
 
-#: src/protocols/msn/msn.c:322
+#: src/protocols/msn/msn.c:325
 msgid "Bad friend file"
 msgstr "Archivo de amigos incorrecto"
 
-#: src/protocols/msn/msn.c:326
-msgid "Authentication failed"
-msgstr "Falló la autentificación"
-
 #: src/protocols/msn/msn.c:329
+msgid "Authentication failed"
+msgstr "Falló la autentificación"
+
+#: src/protocols/msn/msn.c:332
 msgid "Not allowed when offline"
 msgstr "No puede mandar mensajes fuera de línea"
 
-#: src/protocols/msn/msn.c:332
-msgid "Not accepting new users"
-msgstr "No se aceptan nuevos usuarios"
-
 #: src/protocols/msn/msn.c:335
-msgid "User unverified"
-msgstr "Usuario no verificado"
+msgid "Not accepting new users"
+msgstr "No se aceptan nuevos usuarios"
 
 #: src/protocols/msn/msn.c:338
+msgid "User unverified"
+msgstr "Usuario no verificado"
+
+#: src/protocols/msn/msn.c:341
 msgid "Unknown Error Code"
 msgstr "Código de error desconocido"
 
-#: src/protocols/msn/msn.c:491
+#: src/protocols/msn/msn.c:494
 #, c-format
 msgid "%s has closed the conversation window"
 msgstr "%s cerró la ventana con la conversación"
 
-#: src/protocols/msn/msn.c:562
+#: src/protocols/msn/msn.c:565
 msgid "An MSN message may not have been received."
 msgstr "Un mensaje MSN puede no haber llegado a destino."
 
-#: src/protocols/msn/msn.c:1041
+#: src/protocols/msn/msn.c:1044
 msgid "Gaim was unable to send an MSN message"
 msgstr "Gaim no pudo enviar un mensaje MSN"
 
-#: src/protocols/msn/msn.c:1042
+#: src/protocols/msn/msn.c:1045
 msgid ""
 "Gaim encountered an error communicating with the MSN switchboard server.  "
 "Please try again later."
@@ -1259,38 +1267,38 @@
 "Gaim encontró un error mientras se comunicaba con el servidor MSN de "
 "'switchboard'.  Por favor vuelva a intentar más tarde."
 
-#: src/protocols/msn/msn.c:1075 src/protocols/msn/msn.c:1094
+#: src/protocols/msn/msn.c:1079 src/protocols/msn/msn.c:1101
 #: src/protocols/msn/msn.c:2263 src/protocols/msn/msn.c:2385
-#: src/protocols/msn/msn.c:2403 src/protocols/msn/msn.c:2523
-#: src/protocols/msn/msn.c:2536 src/protocols/msn/msn.c:2562
-#: src/protocols/msn/msn.c:2619 src/protocols/msn/msn.c:2637
-#: src/protocols/msn/msn.c:2672 src/protocols/msn/msn.c:2706
-#: src/protocols/msn/msn.c:2747 src/protocols/msn/msn.c:2754
-#: src/protocols/msn/msn.c:2767 src/protocols/msn/msn.c:2775
-#: src/protocols/msn/msn.c:2804 src/protocols/msn/msn.c:2813
-#: src/protocols/msn/msn.c:2826 src/protocols/msn/msn.c:2834
+#: src/protocols/msn/msn.c:2401 src/protocols/msn/msn.c:2506
+#: src/protocols/msn/msn.c:2519 src/protocols/msn/msn.c:2545
+#: src/protocols/msn/msn.c:2589 src/protocols/msn/msn.c:2607
+#: src/protocols/msn/msn.c:2642 src/protocols/msn/msn.c:2676
+#: src/protocols/msn/msn.c:2717 src/protocols/msn/msn.c:2724
+#: src/protocols/msn/msn.c:2737 src/protocols/msn/msn.c:2745
+#: src/protocols/msn/msn.c:2774 src/protocols/msn/msn.c:2783
+#: src/protocols/msn/msn.c:2796 src/protocols/msn/msn.c:2804
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: src/protocols/msn/msn.c:1143
+#: src/protocols/msn/msn.c:1150
 #, 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/msn.c:1193 src/protocols/msn/msn.c:1968
+#: src/protocols/msn/msn.c:1200 src/protocols/msn/msn.c:1968
 msgid "Unable to write to server"
 msgstr "No se pudo escribir al servidor"
 
-#: src/protocols/msn/msn.c:1300
+#: src/protocols/msn/msn.c:1302
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr "El usuario %s (%s) quiere añadirle a su lista de amigos"
 
-#: src/protocols/msn/msn.c:1401
+#: src/protocols/msn/msn.c:1395
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Ha sido desconectado al conectar desde otra ubicación"
 
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1852
+#: src/protocols/msn/msn.c:1534 src/protocols/msn/msn.c:1852
 msgid "Got invalid XFR\n"
 msgstr "Se obtuvo un XFR inválido\n"
 
@@ -1360,7 +1368,7 @@
 msgstr "Vuelvo enseguida"
 
 #: src/protocols/msn/msn.c:2336 src/protocols/msn/msn.c:2365
-#: src/protocols/msn/msn.c:2426
+#: src/protocols/msn/msn.c:2424
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -1376,52 +1384,44 @@
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/protocols/msn/msn.c:2428
+#: src/protocols/msn/msn.c:2426
 msgid "Be right back"
 msgstr "Vuelvo enseguida"
 
-#: src/protocols/msn/msn.c:2430
+#: src/protocols/msn/msn.c:2428
 msgid "Away from the computer"
 msgstr "Ausente"
 
+#: src/protocols/msn/msn.c:2430
+msgid "On the phone"
+msgstr "Al teléfono"
+
 #: src/protocols/msn/msn.c:2432
-msgid "On the phone"
-msgstr "Al teléfono"
-
-#: src/protocols/msn/msn.c:2434
 msgid "Out to lunch"
 msgstr "Salí a comer"
 
-#: src/protocols/msn/msn.c:2436 src/prefs.c:759
+#: src/protocols/msn/msn.c:2434 src/prefs.c:759
 msgid "Idle"
 msgstr "Ausente"
 
-#: src/protocols/msn/msn.c:2473
-msgid "Reset friendly name"
-msgstr "Actualizar nombre"
-
-#: src/protocols/msn/msn.c:2479 src/protocols/oscar/oscar.c:2586
-#: src/protocols/oscar/oscar.c:4699 src/buddy.c:2192
+#: src/protocols/msn/msn.c:2462 src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:4937 src/buddy.c:2175
 msgid "Send File"
 msgstr "Enviar Archivo"
 
-#: src/protocols/msn/msn.c:2555
+#: src/protocols/msn/msn.c:2538
 msgid "New MSN friendly name too long."
 msgstr "El nuevo nombre amistoso MSN es demasiado largo."
 
-#: src/protocols/msn/msn.c:2570 src/protocols/msn/msn.c:2591
+#: src/protocols/msn/msn.c:2553 src/protocols/msn/msn.c:2562
 msgid "Set Friendly Name"
 msgstr "Establecer nombre"
 
-#: src/protocols/msn/msn.c:2571
+#: src/protocols/msn/msn.c:2554
 msgid "Set Friendly Name:"
 msgstr "Establecer nombre:"
 
-#: src/protocols/msn/msn.c:2572 src/protocols/msn/msn.c:2592
-msgid "Reset All Friendly Names"
-msgstr "Actualizar todos los nombres"
-
-#: src/protocols/msn/msn.c:2732
+#: src/protocols/msn/msn.c:2702
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1431,11 +1431,11 @@
 "Quizá quiso decir %s@hotmail.com.  No se modificó su lista de usuarios "
 "aceptados."
 
-#: src/protocols/msn/msn.c:2735 src/protocols/msn/msn.c:2792
+#: src/protocols/msn/msn.c:2705 src/protocols/msn/msn.c:2762
 msgid "Invalid MSN screenname"
 msgstr "Nombre de usuario MSN no válido"
 
-#: src/protocols/msn/msn.c:2789
+#: src/protocols/msn/msn.c:2759
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1445,195 +1445,175 @@
 "Quizá usted quiso decir %s@hotmail.com.  No se efectuaron cambios en su "
 "lista de usuarios bloqueados."
 
-#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4198
-#: src/protocols/toc/toc.c:1144
+#: src/protocols/napster/napster.c:464 src/protocols/oscar/oscar.c:4427
+#: src/protocols/toc/toc.c:1146
 msgid "Join what group:"
 msgstr "Unirse a qué grupo:"
 
-#: src/protocols/oscar/oscar.c:394
+#: src/protocols/oscar/oscar.c:407
 msgid "Invalid error"
 msgstr "Error inválido"
 
-#: src/protocols/oscar/oscar.c:395
+#: src/protocols/oscar/oscar.c:408
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: src/protocols/oscar/oscar.c:396
+#: src/protocols/oscar/oscar.c:409
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"
 
-#: src/protocols/oscar/oscar.c:397
+#: src/protocols/oscar/oscar.c:410
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"
 
-#: src/protocols/oscar/oscar.c:399
+#: src/protocols/oscar/oscar.c:412
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: src/protocols/oscar/oscar.c:400
+#: src/protocols/oscar/oscar.c:413
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: src/protocols/oscar/oscar.c:401
+#: src/protocols/oscar/oscar.c:414
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:415
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:416
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: src/protocols/oscar/oscar.c:404
+#: src/protocols/oscar/oscar.c:417
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:418
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:419
 msgid "Responses lost"
 msgstr "Respuestas perdidas"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:420
 msgid "Request denied"
 msgstr "Pedido negado"
 
-#: src/protocols/oscar/oscar.c:408
+#: src/protocols/oscar/oscar.c:421
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:409
+#: src/protocols/oscar/oscar.c:422
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:423
 #, fuzzy
 msgid "In local permit/deny"
 msgstr "Añadir amigo a autorizar/negar"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:424
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"
 
-#: src/protocols/oscar/oscar.c:412
+#: src/protocols/oscar/oscar.c:425
 msgid "Too evil (receiver)"
 msgstr "Demasiado malvado (destinatario)"
 
-#: src/protocols/oscar/oscar.c:413
+#: src/protocols/oscar/oscar.c:426
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente no disponible."
 
-#: src/protocols/oscar/oscar.c:414
+#: src/protocols/oscar/oscar.c:427
 msgid "No match"
 msgstr "No hubo coincidencia"
 
-#: src/protocols/oscar/oscar.c:415
+#: src/protocols/oscar/oscar.c:428
 msgid "List overflow"
 msgstr "Desbordó la lista"
 
-#: src/protocols/oscar/oscar.c:416
+#: src/protocols/oscar/oscar.c:429
 msgid "Request ambiguous"
 msgstr "Pedido ambiguo"
 
-#: src/protocols/oscar/oscar.c:417
+#: src/protocols/oscar/oscar.c:430
 msgid "Queue full"
 msgstr "Cola llena"
 
-#: src/protocols/oscar/oscar.c:418
+#: src/protocols/oscar/oscar.c:431
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Se cerró el IM con %s"
 
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Fallo un IM directo con %s"
 
-#: src/protocols/oscar/oscar.c:502
-msgid "connection error (rend)\n"
-msgstr "error de conexión (rend)\n"
-
-#: src/protocols/oscar/oscar.c:513
-msgid "major connection error\n"
-msgstr "error de conexión grave\n"
-
-#: src/protocols/oscar/oscar.c:514 src/protocols/toc/toc.c:555
-#: src/protocols/toc/toc.c:568 src/protocols/toc/toc.c:634
+#: src/protocols/oscar/oscar.c:527 src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:570 src/protocols/toc/toc.c:636
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:805
+#: src/protocols/oscar/oscar.c:539 src/protocols/toc/toc.c:807
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala: %s"
 
-#: src/protocols/oscar/oscar.c:539
+#: src/protocols/oscar/oscar.c:552
 msgid "Chat is currently unavailable"
 msgstr "La conversación no está disponible"
 
-#: src/protocols/oscar/oscar.c:560 src/protocols/oscar/oscar.c:1894
+#: src/protocols/oscar/oscar.c:573 src/protocols/oscar/oscar.c:1916
 msgid "Buddy canceled transfer"
 msgstr "La otra parte canceló la transferencia"
 
-#: src/protocols/oscar/oscar.c:613 src/protocols/oscar/oscar.c:676
+#: src/protocols/oscar/oscar.c:626 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al host"
 
-#: src/protocols/oscar/oscar.c:621
-msgid "Password sent, waiting for response\n"
-msgstr "Contraseña enviada, esperando respuesta\n"
-
-#: src/protocols/oscar/oscar.c:657
-msgid "internal connection error\n"
-msgstr "error interno de conexión\n"
-
-#: src/protocols/oscar/oscar.c:658
+#: src/protocols/oscar/oscar.c:671
 msgid "Unable to login to AIM"
 msgstr "No se pudo conectar a AIM"
 
-#: src/protocols/oscar/oscar.c:663
+#: src/protocols/oscar/oscar.c:676
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: src/protocols/oscar/oscar.c:745
-msgid "Signed off.\n"
-msgstr "Desconectado.\n"
-
-#: src/protocols/oscar/oscar.c:765 src/protocols/oscar/oscar.c:913
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:933
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: src/protocols/oscar/oscar.c:773
+#: src/protocols/oscar/oscar.c:786
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:814 src/protocols/toc/toc.c:503
+#: src/protocols/oscar/oscar.c:827 src/protocols/toc/toc.c:505
 msgid "Incorrect nickname or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:819
+#: src/protocols/oscar/oscar.c:832
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:823
+#: src/protocols/oscar/oscar.c:836
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajero Instantáneo AOL está temporalmente no disponible."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:827
+#: src/protocols/oscar/oscar.c:840
 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."
@@ -1643,23 +1623,23 @@
 "tiempo."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:832
+#: src/protocols/oscar/oscar.c:845
 #, 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:837 src/protocols/toc/toc.c:586
+#: src/protocols/oscar/oscar.c:850 src/protocols/toc/toc.c:588
 msgid "Authentication Failed"
 msgstr "Falló la Autorización"
 
-#: src/protocols/oscar/oscar.c:859
+#: src/protocols/oscar/oscar.c:872
 msgid "Internal Error"
 msgstr "Error interno"
 
-#: src/protocols/oscar/oscar.c:952 src/protocols/oscar/oscar.c:981
-#: src/protocols/oscar/oscar.c:1065
+#: src/protocols/oscar/oscar.c:972 src/protocols/oscar/oscar.c:1001
+#: src/protocols/oscar/oscar.c:1085
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1668,46 +1648,65 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Monitoree %s para novedades."
 
-#: src/protocols/oscar/oscar.c:954 src/protocols/oscar/oscar.c:983
+#: src/protocols/oscar/oscar.c:974 src/protocols/oscar/oscar.c:1003
 #, fuzzy
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim no pudo enviar el mensaje"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1087
 #, fuzzy
 msgid "Gaim was Unable to get valid login hash."
 msgstr "Gaim no pudo enviar el mensaje"
 
-#: src/protocols/oscar/oscar.c:1507 src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:1524 src/protocols/oscar/oscar.c:4729
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Se estableció un IM Directo con %s"
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1634
 msgid "Transfer timed out"
 msgstr "Se acabó el tiempo destinado a la transferencia"
 
-#: src/protocols/oscar/oscar.c:1639
+#: src/protocols/oscar/oscar.c:1656
 #, fuzzy
 msgid "Couldn't open listener to send file"
 msgstr "No se pudo abrir el archivo de configuración %s."
 
-#: src/protocols/oscar/oscar.c:1640
+#: src/protocols/oscar/oscar.c:1657
 msgid "File transfer aborted"
 msgstr "Transferencia de archivo abortada"
 
-#: src/protocols/oscar/oscar.c:1839 src/protocols/oscar/oscar.c:1859
+#: src/protocols/oscar/oscar.c:1861 src/protocols/oscar/oscar.c:1881
 msgid "(There was an error receiving this message)"
 msgstr "(Hubo un error recibiendo este mensaje)"
 
-#: src/protocols/oscar/oscar.c:2033
+#: src/protocols/oscar/oscar.c:2055
 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 "
 "considered a privacy risk."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2129
+#: src/protocols/oscar/oscar.c:2109
+#, c-format
+msgid ""
+"The user %s requires authorization before being added to a buddy list.  Do "
+"you want to send an authorization request?"
+msgstr ""
+"El usuario %s requiere autorizarlo antes permitir que lo incorporen a una "
+"lista de amigos.  ¿Desea enviar un peido de autorización?"
+
+#: src/protocols/oscar/oscar.c:2113
+msgid "Request Authorization"
+msgstr "Pedir Autorización"
+
+#: src/protocols/oscar/oscar.c:2147 src/protocols/oscar/oscar.c:2219
+#: src/protocols/oscar/oscar.c:2231 src/protocols/oscar/oscar.c:4354
+#: src/protocols/oscar/oscar.c:4395
+msgid "No reason given."
+msgstr "No se indicó una razón."
+
+#: src/protocols/oscar/oscar.c:2219
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason: %"
@@ -1716,15 +1715,11 @@
 "El usuario %lu quiere añadirle a su lista de amigos por el siguiente motivo: "
 "%s"
 
-#: src/protocols/oscar/oscar.c:2129 src/protocols/oscar/oscar.c:2140
-msgid "No reason given."
-msgstr "No se indicó una razón."
-
-#: src/protocols/oscar/oscar.c:2133
+#: src/protocols/oscar/oscar.c:2224 src/protocols/oscar/oscar.c:4359
 msgid "Authorization Request"
 msgstr "Pedido de Autorización"
 
-#: src/protocols/oscar/oscar.c:2140
+#: src/protocols/oscar/oscar.c:2231
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1735,18 +1730,18 @@
 "la siguiente razón:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2141
+#: src/protocols/oscar/oscar.c:2232
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ negada."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2147
+#: src/protocols/oscar/oscar.c:2238
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "El usuario %lu ha autorizado su petición de añadirlo a su lista de contactos."
 
-#: src/protocols/oscar/oscar.c:2154
+#: src/protocols/oscar/oscar.c:2245
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1759,7 +1754,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2162
+#: src/protocols/oscar/oscar.c:2253
 #, c-format
 msgid ""
 "You have received an ICQ email\n"
@@ -1780,181 +1775,167 @@
 "5=%s\n"
 "6=%s\n"
 
-#: src/protocols/oscar/oscar.c:2183
+#: src/protocols/oscar/oscar.c:2274
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "El usuario ICQ %lu le ha enviado un contacto: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2187
+#: src/protocols/oscar/oscar.c:2278
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "¿Desea añadir este contacto a su lista de amigos?"
 
-#: src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2278
+msgid "Decline"
+msgstr "No añadirlo"
+
+#: src/protocols/oscar/oscar.c:2358
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
-msgstr "Usted perdió %hu mensaje de %s porque era inválido."
-
-#: src/protocols/oscar/oscar.c:2268
-#, c-format
-msgid "You missed %hu messages from %s because they were invalid."
-msgstr "Usted perdió %hu mensajes de %s porque eran inválidos."
-
-#: src/protocols/oscar/oscar.c:2277
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] "Usted perdió %hu mensajes de %s porque eran inválidos."
+msgstr[1] "Usted perdió %hu mensaje de %s porque era inválido."
+
+#: src/protocols/oscar/oscar.c:2369
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
-msgstr "Usted perdió %hu mensaje de %s porque era demasiado grande."
-
-#: src/protocols/oscar/oscar.c:2278
-#, c-format
-msgid "You missed %hu messages from %s because they were too large."
-msgstr "Usted perdió %hu mensajes de %s porque eran demasiado grandes."
-
-#: src/protocols/oscar/oscar.c:2287
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] "Usted perdió %hu mensajes de %s porque eran demasiado grandes."
+msgstr[1] "Usted perdió %hu mensaje de %s porque era demasiado grande."
+
+#: src/protocols/oscar/oscar.c:2380
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
-msgstr ""
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"Usted perdió %hu mensajes de %s porque excedió la tasa de mensajes permitida."
+msgstr[1] ""
 "Usted perdió %hu mensaje de %s porque excedió la tasa de mensajes permitida."
 
-#: src/protocols/oscar/oscar.c:2288
-#, c-format
-msgid ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr ""
-"Usted perdió %hu mensajes de %s porque excedió la tasa de mensajes permitida."
-
-#: src/protocols/oscar/oscar.c:2297
+#: src/protocols/oscar/oscar.c:2391
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
-msgstr "Usted perdió %hu mensaje de %s porque era demasiado malvado."
-
-#: src/protocols/oscar/oscar.c:2298
-#, c-format
-msgid "You missed %hu messages from %s because he/she was too evil."
-msgstr "Usted perdió %hu mensajes de %s porque era demasiado malvado."
-
-#: src/protocols/oscar/oscar.c:2307
+msgid_plural "You missed %hu messages from %s because he/she was too evil."
+msgstr[0] "Usted perdió %hu mensajes de %s porque era demasiado malvado."
+msgstr[1] "Usted perdió %hu mensaje de %s porque era demasiado malvado."
+
+#: src/protocols/oscar/oscar.c:2402
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
-msgstr "Usted perdió %hu mensaje de %s porque usted es demasiado malvado."
-
-#: src/protocols/oscar/oscar.c:2308
-#, c-format
-msgid "You missed %hu messages from %s because you are too evil."
-msgstr "Usted perdió %hu mensajes de %s porque usted es demasiado malvado."
-
-#: src/protocols/oscar/oscar.c:2316
+msgid_plural "You missed %hu messages from %s because you are too evil."
+msgstr[0] "Usted perdió %hu mensajes de %s porque usted es demasiado malvado."
+msgstr[1] "Usted perdió %hu mensaje de %s porque usted es demasiado malvado."
+
+#: src/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
-msgstr "Usted perdió %hu mensaje de %s por motivos desconocidos."
-
-#: src/protocols/oscar/oscar.c:2317
-#, c-format
-msgid "You missed %hu messages from %s for an unknown reason."
-msgstr "Usted perdió %hu mensajes de %s por motivos desconocidos."
-
-#: src/protocols/oscar/oscar.c:2355
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] "Usted perdió %hu mensajes de %s por motivos desconocidos."
+msgstr[1] "Usted perdió %hu mensaje de %s por motivos desconocidos."
+
+#: src/protocols/oscar/oscar.c:2452
 #, c-format
 msgid "%s has declined to receive a file from %s.\n"
 msgstr "%s ha declinado el recibir un archivo de %s.\n"
 
-#: src/protocols/oscar/oscar.c:2400
+#: src/protocols/oscar/oscar.c:2497
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<BR><HR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2402
+#: src/protocols/oscar/oscar.c:2499
 #, c-format
 msgid "<B>Status:</B> %s<BR><HR>%s<BR>"
 msgstr "<B>Estado:</B> %s<BR><HR>%s<BR>"
 
-#: src/protocols/oscar/oscar.c:2458
+#: src/protocols/oscar/oscar.c:2555
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envió el error: %s\n"
 
-#: src/protocols/oscar/oscar.c:2459
+#: src/protocols/oscar/oscar.c:2556
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/protocols/oscar/oscar.c:2482 src/protocols/oscar/oscar.c:2490
-#: src/protocols/oscar/oscar.c:2542
+#: src/protocols/oscar/oscar.c:2579 src/protocols/oscar/oscar.c:2587
+#: src/protocols/oscar/oscar.c:2639
 msgid "No reason was given."
 msgstr "No se indicó una razón."
 
 #. Data is assumed to be the destination sn.
-#: src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2586
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Su mensaje a %s no fue enviado:"
 
-#: src/protocols/oscar/oscar.c:2541
+#: src/protocols/oscar/oscar.c:2638
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Información de usuario de %s no disponible:"
 
-#: src/protocols/oscar/oscar.c:2571 src/buddy.c:2177
+#: src/protocols/oscar/oscar.c:2668 src/buddy.c:2160
 msgid "Buddy Icon"
 msgstr "Ícono de Amigo"
 
-#: src/protocols/oscar/oscar.c:2574 src/buddy.c:2180
+#: src/protocols/oscar/oscar.c:2671 src/buddy.c:2163
 msgid "Voice"
 msgstr "Voz"
 
-#: src/protocols/oscar/oscar.c:2577 src/buddy.c:2183
+#: src/protocols/oscar/oscar.c:2674 src/buddy.c:2166
 msgid "IM Image"
 msgstr "Imagen de IM"
 
-#: src/protocols/oscar/oscar.c:2580 src/buddy.c:500 src/buddy.c:2186
-#: src/buddy.c:2531
+#: src/protocols/oscar/oscar.c:2677 src/buddy.c:490 src/buddy.c:2169
+#: src/buddy.c:2530
 msgid "Chat"
 msgstr "Hablar"
 
-#: src/protocols/oscar/oscar.c:2583 src/buddy.c:2189
+#: src/protocols/oscar/oscar.c:2680 src/buddy.c:2172
 msgid "Get File"
 msgstr "Recibir Archivo"
 
-#: src/protocols/oscar/oscar.c:2590 src/buddy.c:2196
+#: src/protocols/oscar/oscar.c:2687 src/buddy.c:2179
 msgid "Games"
 msgstr "Juegos"
 
-#: src/protocols/oscar/oscar.c:2593 src/buddy.c:2199
+#: src/protocols/oscar/oscar.c:2690 src/buddy.c:2182
 msgid "Stocks"
 msgstr "Bolsa"
 
-#: src/protocols/oscar/oscar.c:2596 src/buddy.c:2202
+#: src/protocols/oscar/oscar.c:2693 src/buddy.c:2185
 msgid "Send Buddy List"
 msgstr "Enviar Lista de Amigos"
 
-#: src/protocols/oscar/oscar.c:2599 src/buddy.c:2205
+#: src/protocols/oscar/oscar.c:2696 src/buddy.c:2188
 msgid "EveryBuddy Bug"
 msgstr "Bug de EveryBuddy"
 
-#: src/protocols/oscar/oscar.c:2602 src/buddy.c:2208
+#: src/protocols/oscar/oscar.c:2699 src/buddy.c:2191
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: src/protocols/oscar/oscar.c:2605 src/buddy.c:2211
+#: src/protocols/oscar/oscar.c:2702 src/buddy.c:2194
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:2608 src/buddy.c:2214
+#: src/protocols/oscar/oscar.c:2705 src/buddy.c:2197
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:2611 src/buddy.c:2217
+#: src/protocols/oscar/oscar.c:2708 src/buddy.c:2200
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:2614 src/buddy.c:2220
+#: src/protocols/oscar/oscar.c:2711 src/buddy.c:2203
 msgid "ICQ Unknown"
 msgstr "ICQ Desconocido"
 
-#: src/protocols/oscar/oscar.c:2617 src/buddy.c:2223
+#: src/protocols/oscar/oscar.c:2714 src/buddy.c:2206
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: src/protocols/oscar/oscar.c:2668
+#: src/protocols/oscar/oscar.c:2765
 msgid ""
 "<I>Unable to display information because it was sent in an unknown encoding."
 "</I>"
@@ -1962,7 +1943,7 @@
 "<I>No se puede mostrar cierta información porque fue enviada con una "
 "codificación desconocida.</I>"
 
-#: src/protocols/oscar/oscar.c:2690
+#: src/protocols/oscar/oscar.c:2787
 #, c-format
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
@@ -1975,27 +1956,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:2722
+#: src/protocols/oscar/oscar.c:2819
 msgid "<i>User has no away message</i>"
 msgstr "<i>El usuario no tiene mensaje de ausencia</i>"
 
-#: src/protocols/oscar/oscar.c:2733
+#: src/protocols/oscar/oscar.c:2830
 msgid "Client Capabilities: "
 msgstr "Funcionalidades del Cliente: "
 
-#: src/protocols/oscar/oscar.c:2740
+#: src/protocols/oscar/oscar.c:2837
 msgid "<i>No Information Provided</i>"
 msgstr "<i>No se aportó información</i>"
 
-#: src/protocols/oscar/oscar.c:2764
+#: src/protocols/oscar/oscar.c:2858
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
-#: src/protocols/oscar/oscar.c:3023
+#: src/protocols/oscar/oscar.c:3113
 msgid "Rate limiting error."
 msgstr "Error del limitador de tasa de mensajes."
 
-#: src/protocols/oscar/oscar.c:3024
+#: src/protocols/oscar/oscar.c:3114
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -2003,62 +1984,62 @@
 "El último mensaje no se envió por haber superado la tasa de envío de "
 "mensajes permitida.  Por favor espere 10 segundos y vuelva a intentarlo."
 
-#: src/protocols/oscar/oscar.c:3476
+#: src/protocols/oscar/oscar.c:3563
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de Cuenta Solicitada"
 
-#: src/protocols/oscar/oscar.c:3503
+#: src/protocols/oscar/oscar.c:3590
 msgid "Error Changing Account Info"
 msgstr "Error Cambiando Info de la Cuenta"
 
-#: src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3593
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3509
+#: src/protocols/oscar/oscar.c:3596
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3512
+#: src/protocols/oscar/oscar.c:3599
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3515
+#: src/protocols/oscar/oscar.c:3602
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:3605
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3521
+#: src/protocols/oscar/oscar.c:3608
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3524
+#: src/protocols/oscar/oscar.c:3611
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: src/protocols/oscar/oscar.c:3534
+#: src/protocols/oscar/oscar.c:3621
 #, c-format
 msgid ""
 "Your screen name is currently formated as follows:\n"
@@ -2067,20 +2048,20 @@
 "El formato de su nombre de usuario es actualmente el siguiente:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3535 src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3622 src/protocols/oscar/oscar.c:3628
 msgid "Account Info"
 msgstr "Información de la Cuenta"
 
-#: src/protocols/oscar/oscar.c:3540
+#: src/protocols/oscar/oscar.c:3627
 #, 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:3733
+#: src/protocols/oscar/oscar.c:3819
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: src/protocols/oscar/oscar.c:3734
+#: src/protocols/oscar/oscar.c:3820
 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 "
@@ -2090,25 +2071,25 @@
 "ingreso se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado del todo."
 
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3826
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated and set it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3777
+#: src/protocols/oscar/oscar.c:3863
 msgid "Unable to set AIM away message."
 msgstr "No se pudo establecer el mensaje de ausencia AIM."
 
-#: src/protocols/oscar/oscar.c:3778
+#: src/protocols/oscar/oscar.c:3864
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3794
+#: src/protocols/oscar/oscar.c:3880
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -2117,27 +2098,83 @@
 "Fue excedido el límite de %d bytes de longitud en el mensaje de ausencia.  "
 "Gaim lo truncó y ya está usted marcado como ausente."
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4253
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4202 src/protocols/toc/toc.c:1148
+#: src/protocols/oscar/oscar.c:4320
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+"El usuario %s le ha dado a usted permiso de añadirle a su lista de amigos.  "
+"¿Desea hacerlo?"
+
+#: src/protocols/oscar/oscar.c:4325
+msgid "Authorization Given"
+msgstr "Autorización Dada"
+
+#: src/protocols/oscar/oscar.c:4325 src/server.c:979
+msgid "Yes"
+msgstr "Sí"
+
+#: src/protocols/oscar/oscar.c:4325 src/server.c:980
+msgid "No"
+msgstr "No"
+
+#: src/protocols/oscar/oscar.c:4354
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason: %s"
+msgstr ""
+"El usuario %s quiere añadirle a su lista de amigos por el siguiente motivo: %"
+"s"
+
+#. Granted
+#: src/protocols/oscar/oscar.c:4391
+#, c-format
+msgid "The user %s has granted your request to add them to your contact list."
+msgstr ""
+"El usuario %s ha autorizado su petición de añadirlo a su lista de contactos."
+
+#: src/protocols/oscar/oscar.c:4392
+msgid "Authorization Granted"
+msgstr "Autorización Aceptada"
+
+#. Denied
+#: src/protocols/oscar/oscar.c:4395
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your contact list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"El usuario %s ha negado su petición de añadirlo a su lista de contactos por "
+"la siguiente razón:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:4396
+msgid "Authorization Denied"
+msgstr "Autorización Denegada"
+
+#: src/protocols/oscar/oscar.c:4431 src/protocols/toc/toc.c:1150
 msgid "Exchange:"
 msgstr "Intercambio:"
 
-#: src/protocols/oscar/oscar.c:4623
+#: src/protocols/oscar/oscar.c:4860
 msgid "Unable to open Direct IM"
 msgstr "No se pudo conectar a IM"
 
-#: src/protocols/oscar/oscar.c:4633
+#: src/protocols/oscar/oscar.c:4872
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión IM directa con %s."
 
-#: src/protocols/oscar/oscar.c:4634
+#: src/protocols/oscar/oscar.c:4873
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -2145,7 +2182,7 @@
 "Como ésto revela su dirección IP, puede ser considerado como un riesgo a su "
 "privacidad.  ¿Quiere continuar?"
 
-#: src/protocols/oscar/oscar.c:4648
+#: src/protocols/oscar/oscar.c:4887
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not support "
@@ -2154,7 +2191,7 @@
 "<B>UIN:</B> %s<BR><B>Estado:</B> %s<BR><HR><I>El cliente remoto no soporta "
 "el envío de mensajes de estado.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4655
+#: src/protocols/oscar/oscar.c:4894
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message.</"
@@ -2163,119 +2200,123 @@
 "<B>UIN:</B> %s<BR><B>Estado:</B> %s<BR><HR><I>El usuario no tiene mensaje de "
 "estado.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:4680
+#: src/protocols/oscar/oscar.c:4918
 msgid "Get Status Msg"
 msgstr "Obtener Msj de Estado"
 
-#: src/protocols/oscar/oscar.c:4693
+#: src/protocols/oscar/oscar.c:4931
 msgid "Direct IM"
 msgstr "IM Directo"
 
-#: src/protocols/oscar/oscar.c:4707
+#: src/protocols/oscar/oscar.c:4945
 msgid "Get Capabilities"
 msgstr "Obtener funcionalidades"
 
-#: src/protocols/toc/toc.c:442
+#: src/protocols/oscar/oscar.c:4970
+msgid "Re-Request Authorization"
+msgstr "Volver a Pedir Autorización"
+
+#: src/protocols/toc/toc.c:444
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir archivo %s."
 
-#: src/protocols/toc/toc.c:445
+#: src/protocols/toc/toc.c:447
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer archivo %s."
 
-#: src/protocols/toc/toc.c:448
+#: src/protocols/toc/toc.c:450
 #, 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:451
+#: src/protocols/toc/toc.c:453
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no está conectado ahora."
 
-#: src/protocols/toc/toc.c:454
+#: src/protocols/toc/toc.c:456
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "No se permiten advertencias a %s."
 
-#: src/protocols/toc/toc.c:457
+#: src/protocols/toc/toc.c:459
 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:460
+#: src/protocols/toc/toc.c:462
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Conversación en %s no está disponible."
 
-#: src/protocols/toc/toc.c:463
+#: src/protocols/toc/toc.c:465
 #, 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:466
+#: src/protocols/toc/toc.c:468
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Usted perdió un mensaje de %s porque era demasiado largo."
 
-#: src/protocols/toc/toc.c:469
+#: src/protocols/toc/toc.c:471
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Usted perdió un mensaje de %s porque fue mandado demasiado rápido."
 
-#: src/protocols/toc/toc.c:472
+#: src/protocols/toc/toc.c:474
 msgid "Failure."
 msgstr "Fallo."
 
-#: src/protocols/toc/toc.c:475
+#: src/protocols/toc/toc.c:477
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
-#: src/protocols/toc/toc.c:478
+#: src/protocols/toc/toc.c:480
 msgid "Need more qualifiers."
 msgstr "Necesito más calificadores."
 
-#: src/protocols/toc/toc.c:481
+#: src/protocols/toc/toc.c:483
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio temporalmente no disponible."
 
-#: src/protocols/toc/toc.c:484
+#: src/protocols/toc/toc.c:486
 msgid "Email lookup restricted."
 msgstr "Búsqueda de direcciones de correo electrónico restringida."
 
-#: src/protocols/toc/toc.c:487
+#: src/protocols/toc/toc.c:489
 msgid "Keyword ignored."
 msgstr "Palabra clave ignorada."
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:492
 msgid "No keywords."
 msgstr "Sin palabras clave."
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:495
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:499
 msgid "Country not supported."
 msgstr "País no soportado."
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:502
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo desconocido: %s."
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:508
 msgid "The service is temporarily unavailable."
 msgstr "Servicio temporalmente no disponible."
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:511
 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:512
+#: src/protocols/toc/toc.c:514
 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."
@@ -2284,37 +2325,37 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:517
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ha ocurrido un error desconocido al conectarse: %s."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:520
 #, 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:535
+#: src/protocols/toc/toc.c:537
 msgid "Connection Closed"
 msgstr "Conexión Cerrada"
 
-#: src/protocols/toc/toc.c:573
+#: src/protocols/toc/toc.c:575
 msgid "Waiting for reply..."
 msgstr "Esperando respuesta..."
 
-#: src/protocols/toc/toc.c:642
+#: src/protocols/toc/toc.c:644
 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:826
+#: src/protocols/toc/toc.c:828
 msgid "Password Change Successful"
 msgstr "Cambio del Contraseña Exitoso"
 
-#: src/protocols/toc/toc.c:829
+#: src/protocols/toc/toc.c:831
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC envió un comando PAUSE."
 
-#: src/protocols/toc/toc.c:829
+#: src/protocols/toc/toc.c:831
 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 "
@@ -2324,7 +2365,7 @@
 "expulsarle si envía mensajes. Gaim evitará que le llegue nada. Esto es sólo "
 "temporal, por favor, sea paciente."
 
-#: src/protocols/toc/toc.c:1265
+#: src/protocols/toc/toc.c:1267
 msgid "Get Dir Info"
 msgstr "Obtener Información del Directorio"
 
@@ -2355,26 +2396,23 @@
 msgstr ""
 "No se pudo escribir la cabecera de archivo.  El archivo no será transferido."
 
-#: src/protocols/toc/toc.c:1947
+#: src/protocols/toc/toc.c:1948 src/ft.c:406
 msgid "Gaim - Save As..."
 msgstr "Gaim - Guardar Como..."
 
-#: src/protocols/toc/toc.c:1979
+#: src/protocols/toc/toc.c:1982
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr "%s le pide a %s que acepte el archivo %d: %s (%.2f %s)%s%s"
-
-#: src/protocols/toc/toc.c:1980
-#, c-format
-msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr "%s le pide a %s que acepte %d archivos: %s (%.2f %s)%s%s"
-
-#: src/protocols/toc/toc.c:1985
+msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr[0] "%s le pide a %s que acepte %d archivos: %s (%.2f %s)%s%s"
+msgstr[1] "%s le pide a %s que acepte %d archivo: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1989
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le pide que le mande un archivo"
 
-#: src/protocols/toc/toc.c:1987 src/prpl.c:276
+#: src/protocols/toc/toc.c:1991 src/ft.c:150 src/prpl.c:308
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -2462,8 +2500,8 @@
 "\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (autor original) &lt;<A "
 "HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
 
-#: src/about.c:174 src/dialogs.c:4243 src/prpl.c:493 src/prpl.c:740
-#: src/server.c:1159
+#: src/about.c:174 src/dialogs.c:4255 src/prpl.c:525 src/prpl.c:772
+#: src/server.c:1172
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2479,139 +2517,167 @@
 msgid "Screen Name:"
 msgstr "Nombre de Usuario:"
 
-#: src/away.c:188
+#: src/away.c:197
 msgid "Gaim - Away!"
 msgstr "Gaim - ¡Ausente!"
 
-#: src/away.c:235
+#: src/away.c:244
 msgid "I'm Back!"
 msgstr "¡Ya he vuelto!"
 
-#: src/away.c:353
+#: src/away.c:362
 msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/away.c:373
+#: src/away.c:382
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
 
-#: src/away.c:561
+#: src/away.c:570
 msgid "Set All Away"
 msgstr "Ausente en todas las cuentas"
 
-#: src/buddy.c:495 src/buddy.c:2761 src/dialogs.c:1130
+#: src/buddy.c:485 src/buddy.c:2761 src/dialogs.c:1130
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:501 src/buddy.c:644 src/buddy.c:812 src/buddy.c:2529
+#: src/buddy.c:491 src/buddy.c:634 src/buddy.c:798 src/buddy.c:2528
 #: src/buddy_chat.c:863
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:502 src/buddy.c:2530 src/buddy_chat.c:880 src/buddy_chat.c:1593
-#: src/conversation.c:2917
+#: src/buddy.c:492 src/buddy.c:2529 src/buddy_chat.c:880 src/buddy_chat.c:1595
+#: src/conversation.c:2810
 msgid "Info"
 msgstr "Info"
 
-#: src/buddy.c:649 src/buddy.c:817 src/dialogs.c:1120 src/dialogs.c:3806
-#: src/dialogs.c:3819
+#: src/buddy.c:639 src/buddy.c:803 src/dialogs.c:1120 src/dialogs.c:3818
+#: src/dialogs.c:3831
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:654 src/buddy.c:836
+#: src/buddy.c:644 src/buddy.c:822
 msgid "Add Buddy Pounce"
 msgstr "Añadir Aviso de Amigo"
 
-#: src/buddy.c:661 src/buddy.c:842
+#: src/buddy.c:651 src/buddy.c:828
 msgid "View Log"
 msgstr "Ver registro"
 
-#: src/buddy.c:799 src/buddy.c:830
+#: src/buddy.c:785 src/buddy.c:816
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/buddy.c:824
+#: src/buddy.c:810
 msgid "Un-Alias"
 msgstr "Quitar Alias"
 
-#: src/buddy.c:1683
+#: src/buddy.c:1580
+#, c-format
+msgid "%s has started typing to you"
+msgstr "%s ha comenzado a escribirte algo"
+
+#: src/buddy.c:1581
+#, c-format
+msgid "%s has signed on"
+msgstr "%s se conectó"
+
+#: src/buddy.c:1582
+#, c-format
+msgid "%s has returned from being idle"
+msgstr "%s volvió de su inactividad"
+
+#: src/buddy.c:1583
+#, c-format
+msgid "%s has returned from being away"
+msgstr "%s dejó de estar ausente"
+
+#: src/buddy.c:1667
 msgid "New Buddy Pounce"
 msgstr "Nuevo Aviso de Amigo"
 
-#: src/buddy.c:1701
+#: src/buddy.c:1685
 msgid "Remove Buddy Pounce"
 msgstr "Quitar Aviso de Amigo"
 
-#: src/buddy.c:1730
+#: src/buddy.c:1714
 msgid "[no message]"
 msgstr "[ningún mensaje]"
 
-#: src/buddy.c:1732
+#: src/buddy.c:1716
 msgid "[Click to edit]"
 msgstr "[Haga click para editar]"
 
-#: src/buddy.c:2299
+#: src/buddy.c:2284
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Conectado: %s\n"
 
-#: src/buddy.c:2311
+#: src/buddy.c:2296
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:2323
+#: src/buddy.c:2308
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Capacidades: %s\n"
 
-#: src/buddy.c:2327
+#: src/buddy.c:2313
+#, c-format
+msgid "Alias: %s\n"
+msgstr "Alias: %s\n"
+
+#: src/buddy.c:2318
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Apodo: %s\n"
+
+#: src/buddy.c:2323
 #, c-format
 msgid ""
-"Alias: %s               \n"
-"Screen Name: %s\n"
+"%s%sScreen Name: %s\n"
 "%s%s%s%s%s%s"
 msgstr ""
-"Alias: %s              \n"
-"Nombre de Usuario: %s\n"
+"%s%sNombre de Usuario: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2331
+#: src/buddy.c:2325
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:2400 src/buddy.c:2405
+#: src/buddy.c:2394 src/buddy.c:2400
 #, c-format
 msgid "%s logged in."
 msgstr "%s conectado."
 
-#: src/buddy.c:2459 src/buddy.c:2464
+#: src/buddy.c:2455 src/buddy.c:2462
 #, c-format
 msgid "%s logged out."
 msgstr "%s desconectado."
 
-#: src/buddy.c:2562
+#: src/buddy.c:2561
 msgid "Information on selected Buddy"
 msgstr "Información sobre el Amigo seleccionado"
 
-#: src/buddy.c:2563
+#: src/buddy.c:2562
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantáneo"
 
+#: src/buddy.c:2563
+msgid "Start/join a Buddy Chat"
+msgstr "Empezar/unirse a Conversación de Amigos"
+
 #: src/buddy.c:2564
-msgid "Start/join a Buddy Chat"
-msgstr "Empezar/unirse a Conversación de Amigos"
-
-#: src/buddy.c:2565
 msgid "Activate Away Message"
 msgstr "Activar Mensaje de Ausencia"
 
-#: src/buddy.c:2615
+#: src/buddy.c:2613
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
 #. The file menu
-#: src/buddy.c:2628 src/conversation.c:2039
+#: src/buddy.c:2628 src/conversation.c:1932
 msgid "File"
 msgstr "Archivo"
 
@@ -2715,12 +2781,12 @@
 msgid "Join"
 msgstr "Unirse"
 
-#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1450
-#: src/buddy_chat.c:1544
+#: src/buddy_chat.c:396 src/buddy_chat.c:399 src/buddy_chat.c:1452
+#: src/buddy_chat.c:1546
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3796
+#: src/buddy_chat.c:415 src/dialogs.c:1789 src/dialogs.c:3808
 msgid "Buddy"
 msgstr "Amigo"
 
@@ -2741,11 +2807,13 @@
 msgstr "Ignorar"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1655
-#: src/buddy_chat.c:1688
+#: src/buddy_chat.c:948 src/buddy_chat.c:1087 src/buddy_chat.c:1657
+#: src/buddy_chat.c:1690
 #, c-format
-msgid "%d %s in room"
-msgstr "%d %s en la sala"
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d personas en la sala"
+msgstr[1] "%d persona en la sala"
 
 #: src/buddy_chat.c:957
 #, c-format
@@ -2780,117 +2848,117 @@
 msgid "Topic:"
 msgstr "Tema:"
 
-#: src/buddy_chat.c:1325
+#: src/buddy_chat.c:1327
 msgid "0 people in room"
 msgstr "0 personas en la sala"
 
-#: src/buddy_chat.c:1434 src/buddy_chat.c:1543 src/buddy_chat.c:1575
-#: src/conversation.c:2876
+#: src/buddy_chat.c:1436 src/buddy_chat.c:1545 src/buddy_chat.c:1577
+#: src/conversation.c:2769
 msgid "Send"
 msgstr "Enviar"
 
-#: src/buddy_chat.c:1590 src/conversation.c:2908
+#: src/buddy_chat.c:1592 src/conversation.c:2801
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/buddy_chat.c:1596 src/conversation.c:2927
+#: src/buddy_chat.c:1598 src/conversation.c:2820
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/conversation.c:443
+#: src/conversation.c:336
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Insertar Imagen"
 
-#: src/conversation.c:1305
+#: src/conversation.c:1198
 msgid "Unable to send message.  The message is too large"
 msgstr "No se pudo enviar el mensaje.  Es demasiado grande"
 
-#: src/conversation.c:1309
+#: src/conversation.c:1202
 msgid "Unable to send message"
 msgstr "No se pudo enviar el mensaje"
 
-#: src/conversation.c:2043
+#: src/conversation.c:1936
 msgid "_Save Conversation"
 msgstr "_Guardar Conversación"
 
-#: src/conversation.c:2045
+#: src/conversation.c:1938
 msgid "View _History"
 msgstr "Ver _Historial"
 
 #.
 #. c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL);
-#: src/conversation.c:2052
+#: src/conversation.c:1945
 msgid "Insert _URL"
 msgstr "Insertar _URL"
 
-#: src/conversation.c:2053
+#: src/conversation.c:1946
 msgid "Insert _Image"
 msgstr "Insertar _Imagen"
 
-#: src/conversation.c:2058
+#: src/conversation.c:1951
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/conversation.c:2063
+#: src/conversation.c:1956
 msgid "Options"
 msgstr "Opciones"
 
 #. Logging
-#: src/conversation.c:2068
+#: src/conversation.c:1961
 msgid "Enable _Logging"
 msgstr "_Habilitar registro"
 
-#: src/conversation.c:2086
+#: src/conversation.c:1979
 msgid "Enable _Sounds"
 msgstr "Habilitar _Sonidos"
 
-#: src/conversation.c:2598 src/conversation.c:2600 src/conversation.c:2611
+#: src/conversation.c:2489 src/conversation.c:2491 src/conversation.c:2502
 msgid " [TYPING]"
 msgstr " [TIPEANDO]"
 
-#: src/conversation.c:2601 src/conversation.c:2603 src/conversation.c:2615
+#: src/conversation.c:2492 src/conversation.c:2494 src/conversation.c:2506
 msgid " [TYPED]"
 msgstr " [TIPEÓ]"
 
-#: src/conversation.c:2689
+#: src/conversation.c:2580
 msgid "Gaim - Conversations"
 msgstr "Gaim - Conversaciones"
 
-#: src/conversation.c:2804
+#: src/conversation.c:2697
 msgid "Send message as: "
 msgstr "Enviar mensaje como: "
 
-#: src/conversation.c:3233 src/dialogs.c:2661
+#: src/conversation.c:3126 src/dialogs.c:2661
 #, c-format
 msgid "%s - Gaim (logged)"
 msgstr "%s - Gaim (registrada)"
 
-#: src/conversation.c:3235
+#: src/conversation.c:3128
 #, c-format
 msgid "%s - Gaim"
 msgstr "%s - Gaim"
 
-#: src/conversation.c:3427
+#: src/conversation.c:3320
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Guardar Ícono"
 
-#: src/conversation.c:3461
+#: src/conversation.c:3354
 msgid "Disable Animation"
 msgstr "Deshabilitar Animaciones"
 
-#: src/conversation.c:3468
+#: src/conversation.c:3361
 msgid "Enable Animation"
 msgstr "Habilitar Animaciones"
 
-#: src/conversation.c:3474
+#: src/conversation.c:3367
 msgid "Hide Icon"
 msgstr "Ocultar Ícono"
 
-#: src/conversation.c:3480
+#: src/conversation.c:3373
 msgid "Save Icon As..."
 msgstr "Guardar Ícono Como..."
 
-#: src/dialogs.c:422
+#: src/dialogs.c:423
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -2899,34 +2967,34 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:431
+#: src/dialogs.c:432
 msgid "Warn _anonymously?"
 msgstr "¿Advertir _anónimamente?"
 
-#: src/dialogs.c:438
+#: src/dialogs.c:439
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Las advertencias anónimas son menos duras.</b>"
 
-#: src/dialogs.c:458
+#: src/dialogs.c:459
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "Quitando '%s' de la lista de amigos.\n"
 
-#: src/dialogs.c:706
+#: src/dialogs.c:707
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 "Por favor ingrese el nombre de usuario de la persona con la que se quiere "
 "comunicar.\n"
 
-#: src/dialogs.c:722 src/dialogs.c:816
+#: src/dialogs.c:723 src/dialogs.c:817
 msgid "_Screenname:"
 msgstr "_Nombre de Usuario:"
 
-#: src/dialogs.c:735 src/dialogs.c:829
+#: src/dialogs.c:736 src/dialogs.c:830
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: src/dialogs.c:804
+#: src/dialogs.c:805
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
@@ -2934,15 +3002,15 @@
 "Por favor ingrese el nombre de usuario de la persona de la que quiere ver "
 "información.\n"
 
-#: src/dialogs.c:956
+#: src/dialogs.c:957
 msgid "Gaim - Add Group"
 msgstr "Gaim - Añadir Grupo"
 
-#: src/dialogs.c:973
+#: src/dialogs.c:974
 msgid "Please enter the name of the group to be added.\n"
 msgstr "Por favor ingrese el nombre del grupo a agregar.\n"
 
-#: src/dialogs.c:982 src/dialogs.c:4356
+#: src/dialogs.c:983 src/dialogs.c:4368
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -3117,8 +3185,8 @@
 msgid "State"
 msgstr "Estado"
 
-#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3610 src/dialogs.c:4252
-#: src/dialogs.c:5216
+#: src/dialogs.c:2176 src/dialogs.c:2364 src/dialogs.c:3619 src/dialogs.c:4264
+#: src/dialogs.c:5228
 msgid "Save"
 msgstr "Guardar"
 
@@ -3148,7 +3216,7 @@
 
 #. Build OK Button
 #: src/dialogs.c:2299 src/dialogs.c:2457 src/dialogs.c:2758 src/dialogs.c:2932
-#: src/dialogs.c:3002 src/dialogs.c:4471
+#: src/dialogs.c:4476
 msgid "OK"
 msgstr "Aceptar"
 
@@ -3188,40 +3256,48 @@
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrónico"
 
-#: src/dialogs.c:2997
-msgid "Insert Link"
-msgstr "Insertar Enlace"
-
-#: src/dialogs.c:3048
-msgid "Gaim - Add URL"
-msgstr "Gaim - Añadir URL"
-
-#: src/dialogs.c:3147 src/dialogs.c:3164
+#: src/dialogs.c:3004
+msgid "Gaim - Insert Link"
+msgstr "Gaim - Insertar Enlace"
+
+#: src/dialogs.c:3005
+msgid "Insert"
+msgstr "Insertar"
+
+#: src/dialogs.c:3023
+msgid ""
+"Please enter the URL and description of the link that you want to insert.  "
+"The description is optional.\n"
+msgstr ""
+"Por favor ingrese el URL y la descripción del enlace que quiere insertar.  "
+"La descripción es opcional.\n"
+
+#: src/dialogs.c:3156 src/dialogs.c:3173
 msgid "Select Text Color"
 msgstr "Seleccionar Color del Texto"
 
-#: src/dialogs.c:3192 src/dialogs.c:3209
+#: src/dialogs.c:3201 src/dialogs.c:3218
 msgid "Select Background Color"
 msgstr "Seleccionar Color de Fondo"
 
-#: src/dialogs.c:3284 src/dialogs.c:3308
+#: src/dialogs.c:3293 src/dialogs.c:3317
 msgid "Select Font"
 msgstr "Seleccionar fuente"
 
-#: src/dialogs.c:3385
+#: src/dialogs.c:3394
 msgid "Import to:"
 msgstr "Importar a:"
 
-#: src/dialogs.c:3409
+#: src/dialogs.c:3418
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar Lista de Amigos"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3470
+#: src/dialogs.c:3479
 msgid "You cannot save an away message with a blank title"
 msgstr "No se puede guardar un mensaje de ausencia sin título"
 
-#: src/dialogs.c:3471
+#: src/dialogs.c:3480
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
@@ -3230,99 +3306,173 @@
 "sin grabarlo."
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3478
+#: src/dialogs.c:3487
 msgid "You cannot create an empty away message"
 msgstr "No se puede crear un mensaje de ausencia vacío"
 
-#: src/dialogs.c:3541
+#: src/dialogs.c:3550
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3550
+#: src/dialogs.c:3559
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3563
+#: src/dialogs.c:3572
 msgid "Away title: "
 msgstr "Título del mensaje de ausencia: "
 
-#: src/dialogs.c:3614
+#: src/dialogs.c:3623
 msgid "Save & Use"
 msgstr "Guardar y Usar"
 
-#: src/dialogs.c:3618
+#: src/dialogs.c:3627
 msgid "Use"
 msgstr "Usar"
 
 #. show everything
-#: src/dialogs.c:3752
+#: src/dialogs.c:3761
 msgid "Smile!"
 msgstr "¡Sonría!"
 
-#: src/dialogs.c:3841
+#: src/dialogs.c:3853
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Añadir Alias al Amigo"
 
-#: src/dialogs.c:3879 src/dialogs.c:3886
+#: src/dialogs.c:3891 src/dialogs.c:3898
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "No se pudo escribir en %s."
 
-#: src/dialogs.c:3910
+#: src/dialogs.c:3922
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Guardar Archivo de Registro"
 
-#: src/dialogs.c:3940
+#: src/dialogs.c:3952
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "No se pudo borrar el archivo %s."
 
-#: src/dialogs.c:3967
+#: src/dialogs.c:3979
 msgid "Really clear log?"
 msgstr "¿En serio quiere limpiar el registro?"
 
-#: src/dialogs.c:3982
+#: src/dialogs.c:3994
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:4163
+#: src/dialogs.c:4175
 msgid "Date"
 msgstr "Fecha"
 
-#: src/dialogs.c:4226
+#: src/dialogs.c:4238
 msgid "Conversation"
 msgstr "Conversación"
 
-#: src/dialogs.c:4247
+#: src/dialogs.c:4259
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/dialogs.c:4330
+#: src/dialogs.c:4342
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renombrar Grupo"
 
-#: src/dialogs.c:4347
+#: src/dialogs.c:4359
 msgid "Please enter a new name for the selected group.\n"
 msgstr "Por favor ingrese un nuevo nombre para el grupo seleccionado.\n"
 
-#: src/dialogs.c:4436
+#: src/dialogs.c:4446
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renombrar Amigo"
 
-#: src/dialogs.c:4445
+#: src/dialogs.c:4455
 msgid "Rename Buddy"
 msgstr "Renombrar Amigo"
 
-#: src/dialogs.c:4452
+#: src/dialogs.c:4462
 msgid "New name:"
 msgstr "Nuevo Nombre:"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:4529
+#: src/dialogs.c:4539
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Seleccionar Script en Perl"
 
-#: src/gaimrc.c:1348
+#: src/ft.c:129
+msgid "Unkown"
+msgstr "Desconocido"
+
+#: src/ft.c:134
+#, c-format
+msgid "%s requests that %s accept a file: %s (%s)"
+msgstr "%s pide que %s acepte un archivo: %s (%s)"
+
+#: src/ft.c:137
+#, c-format
+msgid "%s requests that %s accept %d files: %s (%s)"
+msgstr "%s pide que %s acepte %d archivos: %s (%s)"
+
+#: src/ft.c:256
+#, c-format
+msgid "File transfer to %s aborted."
+msgstr "Transferencia de archivo a %s abortada."
+
+#: src/ft.c:258
+#, c-format
+msgid "File transfer from %s aborted."
+msgstr "Transferencia de archivo de %s abortada"
+
+#. XXX overwrite/append/cancel prompt
+#: src/ft.c:294
+msgid "That file already exists; please choose another name."
+msgstr "Ese archivo ya existe. Por favor elija otro nombre."
+
+#: src/ft.c:313 src/ft.c:324
+msgid "File not found."
+msgstr "Archivo no encontrado."
+
+#: src/ft.c:327
+msgid "You may only choose one new directory."
+msgstr "Sólo puede elegir un directorio nuevo."
+
+#: src/ft.c:331
+msgid "Unable to create directory."
+msgstr "No se pudo crear el directorio."
+
+#. (xfer->type == FILE_TRANSFER_TYPE_SEND)
+#: src/ft.c:408
+msgid "Gaim - Open..."
+msgstr "Gaim - Abrir..."
+
+#: src/ft.c:445
+#, c-format
+msgid "Could not open %s for writing: %s"
+msgstr "No se pudo abrir %s para escritura: %s"
+
+#: src/ft.c:452
+#, c-format
+msgid "Could not open %s for reading: %s"
+msgstr "No se pudo abrir %s para leer: %s"
+
+#: src/ft.c:523
+msgid "Invalid incoming filename component"
+msgstr "Componente del nombre del archivo entrante inválido"
+
+#: src/ft.c:537
+msgid "Invalid incoming filename"
+msgstr "Nombre de archivo entrante inválido"
+
+#: src/ft.c:669 src/ft.c:672
+#, c-format
+msgid "File transfer from %s to %s completed successfully."
+msgstr "La transferencia de archivo de %s a %s se completó con éxito."
+
+#: src/ft.c:677
+#, c-format
+msgid "%d files transferred."
+msgstr "%d archivos transferidos."
+
+#: src/gaimrc.c:1349
 #, c-format
 msgid "Could not open config file %s."
 msgstr "No se pudo abrir el archivo de configuración %s."
@@ -3336,105 +3486,105 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error abriendo la conexión. \n"
 
-#: src/multi.c:235
+#: src/multi.c:237
 msgid "Screenname"
 msgstr "Nombre de Usuario"
 
-#: src/multi.c:263
+#: src/multi.c:265
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/multi.c:542
+#: src/multi.c:544
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Cargar Ícono de Amigo"
 
-#: src/multi.c:585
+#: src/multi.c:587
 msgid "Buddy Icon File:"
 msgstr "Ícono de Amigo:"
 
-#: src/multi.c:598
+#: src/multi.c:600
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/multi.c:603 src/prefs.c:1232
+#: src/multi.c:605 src/prefs.c:1232
 msgid "Reset"
 msgstr "Resetear"
 
-#: src/multi.c:620
+#: src/multi.c:622
 #, fuzzy
 msgid "Login Options"
 msgstr "Opciones de Conexión"
 
-#: src/multi.c:630
+#: src/multi.c:632
 msgid "Screenname:"
 msgstr "Nombre de Usuario:"
 
-#: src/multi.c:653
+#: src/multi.c:655
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/multi.c:665
+#: src/multi.c:667
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/multi.c:672
+#: src/multi.c:674
 msgid "Remember Password"
 msgstr "Recordar Contraseña"
 
-#: src/multi.c:673
+#: src/multi.c:675
 msgid "Auto-Login"
 msgstr "Auto Conectarse"
 
-#: src/multi.c:706
+#: src/multi.c:708
 msgid "User Options"
 msgstr "Opciones de Usuario"
 
-#: src/multi.c:715
+#: src/multi.c:717
 msgid "New Mail Notifications"
 msgstr "Notificaciones de Correo Nuevo"
 
-#: src/multi.c:767
-#, fuzzy, c-format
+#: src/multi.c:769
+#, c-format
 msgid "%s Options"
-msgstr "Opciones"
-
-#: src/multi.c:809
+msgstr "Opciones de %s"
+
+#: src/multi.c:811
 msgid "Register with server"
 msgstr "Registrarse en el servidor"
 
-#: src/multi.c:868
+#: src/multi.c:870
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Modificar Cuenta"
 
-#: src/multi.c:1013
+#: src/multi.c:1015
 msgid "Enter Password"
 msgstr "Introduzca Contraseña"
 
-#: src/multi.c:1024
+#: src/multi.c:1026
 #, c-format
 msgid "Password for %s:"
 msgstr "Contraseña para %s:"
 
-#: src/multi.c:1044
+#: src/multi.c:1046
 msgid "Signon"
 msgstr "Conectar"
 
-#: src/multi.c:1077
+#: src/multi.c:1079
 msgid "TOC not found."
 msgstr "TOC no encontrado."
 
-#: src/multi.c:1078
+#: src/multi.c:1080
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
 
-#: src/multi.c:1084
+#: src/multi.c:1086
 msgid "Protocol not found."
 msgstr "Protocolo no encontrado."
 
-#: src/multi.c:1085
+#: src/multi.c:1087
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -3442,40 +3592,40 @@
 "No se puede conectar con esta cuenta; no se dispone del protocolo que usa, o "
 "el protocolo no dispone de la función de conexión."
 
-#: src/multi.c:1138
+#: src/multi.c:1140
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
 
-#: src/multi.c:1139
+#: src/multi.c:1141
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/multi.c:1187
+#: src/multi.c:1189
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Editor de Cuentas"
 
-#: src/multi.c:1257
+#: src/multi.c:1259
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: src/multi.c:1308
+#: src/multi.c:1310
 msgid "Done."
 msgstr "Hecho."
 
-#: src/multi.c:1448
+#: src/multi.c:1450
 msgid "Signon: "
 msgstr "Conectado: "
 
-#: src/multi.c:1505
+#: src/multi.c:1508
 msgid "Gaim Account Signon"
 msgstr "Gaim - Intentando Conectar ..."
 
-#: src/multi.c:1517
+#: src/multi.c:1520
 msgid "Cancel All"
 msgstr "Cancelar Todo"
 
-#: src/multi.c:1574
+#: src/multi.c:1577
 #, c-format
 msgid ""
 "%s\n"
@@ -3484,25 +3634,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1593
+#: src/multi.c:1596
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s no pudo conectarse"
 
-#: src/multi.c:1594
+#: src/multi.c:1597
 msgid "Signon Error"
 msgstr "Error de Conexión"
 
-#: src/multi.c:1604
+#: src/multi.c:1607
 msgid "Notice"
 msgstr "Aviso"
 
-#: src/multi.c:1614
+#: src/multi.c:1617
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s ha sido desconectado"
 
-#: src/multi.c:1615
+#: src/multi.c:1618
 msgid "Connection Error"
 msgstr "Error de Conexión"
 
@@ -3510,16 +3660,20 @@
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr ""
 
-#: src/prefs.c:191
+#: src/prefs.c:189
 msgid "Interface Options"
 msgstr "Opciones de Interfaz"
 
 #. This shouldn't have to wait for user to click OK or APPLY or whatnot
 #. This really shouldn't be in preferences at all
-#: src/prefs.c:194
+#: src/prefs.c:192
 msgid "Show _debug window"
 msgstr "Mostrar ventana de _Depuración"
 
+#: src/prefs.c:194
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "_Mostrar el apodo remoto si no se le dio un alias a alguien"
+
 #: src/prefs.c:211
 msgid "Style"
 msgstr "Estilo"
@@ -4165,11 +4319,11 @@
 msgid "Gaim - Debug Window"
 msgstr "Gaim - Ventana de Depuración"
 
-#: src/prpl.c:100
+#: src/prpl.c:101
 msgid "ICQ Protocol detected."
 msgstr "Protocolo ICQ detectado."
 
-#: src/prpl.c:101
+#: src/prpl.c:102
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -4177,28 +4331,45 @@
 "you use the AIM/ICQ protocol to connect to ICQ"
 msgstr ""
 
-#: src/prpl.c:252
+#: src/prpl.c:284
 msgid "Gaim - Prompt"
 msgstr "Gaim - Preguntar"
 
-#: src/prpl.c:453
+#: src/prpl.c:485
+#, fuzzy, c-format
+msgid "%s has mail from %s: %s"
+msgstr "Ha sido expulsado de %s: %s"
+
+#: src/prpl.c:485
 msgid "No Subject"
 msgstr "Sin tema"
 
-#: src/prpl.c:474
+#: src/prpl.c:487
+#, c-format
+msgid "%s has new mail."
+msgstr "%s tiene nuevo correo."
+
+#: src/prpl.c:490
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s tiene %d nuevos mensajes."
+msgstr[1] "%s tiene %d nuevo mensaje."
+
+#: src/prpl.c:506
 msgid "Gaim - New Mail"
 msgstr "Gaim - Correo Nuevo"
 
-#: src/prpl.c:500
+#: src/prpl.c:532
 msgid "Open Mail"
 msgstr "Abrir Correo"
 
-#: src/prpl.c:626
+#: src/prpl.c:658
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ha hecho %s su amigo/a%s%s%s"
 
-#: src/prpl.c:634
+#: src/prpl.c:666
 msgid ""
 "\n"
 "\n"
@@ -4208,21 +4379,29 @@
 "\n"
 "¿Desea añadirlo/a a su lista de amigos?"
 
-#: src/prpl.c:677
+#: src/prpl.c:668
+msgid "Gaim - Information"
+msgstr "Gaim - Información"
+
+#: src/prpl.c:670
+msgid "Gaim - Confirm"
+msgstr "Gaim - Confirmar"
+
+#: src/prpl.c:709
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "No dispone de ningún protocolo que permita registrar cuentas nuevas."
 
-#: src/prpl.c:714
+#: src/prpl.c:746
 msgid "Gaim - Registration"
 msgstr "Gaim - Registro"
 
-#: src/prpl.c:728
+#: src/prpl.c:760
 msgid "Registration Information"
 msgstr "Información de Registro"
 
-#: src/prpl.c:745
+#: src/prpl.c:777
 msgid "Register"
 msgstr "Registrar"
 
@@ -4230,24 +4409,16 @@
 msgid "Please enter your password"
 msgstr "Por favor, indique su contraseña"
 
-#: src/server.c:648
+#: src/server.c:661
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d mensajes)"
 
-#: src/server.c:654
+#: src/server.c:667
 msgid "(1 message)"
 msgstr "(1 mensaje)"
 
-#: src/server.c:966
-msgid "Yes"
-msgstr "Sí"
-
-#: src/server.c:967
-msgid "No"
-msgstr "No"
-
-#: src/server.c:1163
+#: src/server.c:1176
 msgid "More Info"
 msgstr "Más Información"
 
@@ -4291,6 +4462,51 @@
 msgid "Someone says your name in chat"
 msgstr "Alguien menciona su nombre en la conversación"
 
+#~ msgid "Reset friendly name"
+#~ msgstr "Actualizar nombre"
+
+#~ msgid "Reset All Friendly Names"
+#~ msgstr "Actualizar todos los nombres"
+
+#~ msgid "connection error (rend)\n"
+#~ msgstr "error de conexión (rend)\n"
+
+#~ msgid "major connection error\n"
+#~ msgstr "error de conexión grave\n"
+
+#~ msgid "Password sent, waiting for response\n"
+#~ msgstr "Contraseña enviada, esperando respuesta\n"
+
+#~ msgid "internal connection error\n"
+#~ msgstr "error interno de conexión\n"
+
+#~ msgid "Signed off.\n"
+#~ msgstr "Desconectado.\n"
+
+#~ msgid "You missed %hu messages from %s because they were invalid."
+#~ msgstr "Usted perdió %hu mensajes de %s porque eran inválidos."
+
+#~ msgid "You missed %hu messages from %s because they were too large."
+#~ msgstr "Usted perdió %hu mensajes de %s porque eran demasiado grandes."
+
+#~ msgid ""
+#~ "You missed %hu messages from %s because the rate limit has been exceeded."
+#~ msgstr ""
+#~ "Usted perdió %hu mensajes de %s porque excedió la tasa de mensajes "
+#~ "permitida."
+
+#~ msgid "You missed %hu messages from %s because he/she was too evil."
+#~ msgstr "Usted perdió %hu mensajes de %s porque era demasiado malvado."
+
+#~ msgid "You missed %hu messages from %s because you are too evil."
+#~ msgstr "Usted perdió %hu mensajes de %s porque usted es demasiado malvado."
+
+#~ msgid "You missed %hu messages from %s for an unknown reason."
+#~ msgstr "Usted perdió %hu mensajes de %s por motivos desconocidos."
+
+#~ msgid "Gaim - Add URL"
+#~ msgstr "Gaim - Añadir URL"
+
 #~ msgid ""
 #~ "<BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
 #~ "\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG "
@@ -4338,9 +4554,6 @@
 #~ msgid "Alias Buddy"
 #~ msgstr "Añadir Alias al Amigo"
 
-#~ msgid "ICQ Authorization Granted"
-#~ msgstr "Autorizacion ICQ aceptada"
-
 #~ msgid ""
 #~ "%s has requested a DCC chat.  Would you like to establish the direct "
 #~ "connection?"
@@ -4437,9 +4650,6 @@
 #~ msgid "Underline Text"
 #~ msgstr "Subrayar Texto"
 
-#~ msgid "Underline"
-#~ msgstr "Subrayar"
-
 #~ msgid "Strike through Text"
 #~ msgstr "Tachar el Texto"
 
@@ -4619,9 +4829,6 @@
 #~ msgid "Gadu-Gadu Error"
 #~ msgstr "Error de Gadu-Gadu"
 
-#~ msgid "Gadu-Gadu Information"
-#~ msgstr "Información de Gadu-Gadu"
-
 #~ msgid "Couldn't send http request"
 #~ msgstr "No se pudo enviar una petición http"
 
@@ -4661,9 +4868,6 @@
 #~ msgid "Gaim - Chat"
 #~ msgstr "Gaim - Conversaciones"
 
-#~ msgid "Gaim - Error"
-#~ msgstr "Error de Gaim"
-
 #~ msgid "Gaim - Oscar SNAC Error"
 #~ msgstr "Gaim - Error de OSCAR SNAC"
 
@@ -5123,6 +5327,3 @@
 
 #~ msgid "Buddy Chats"
 #~ msgstr "Conversaciones con amigos"
-
-#~ msgid "Create new message"
-#~ msgstr "Crear un nuevo mensaje"