diff po/es.po @ 15595:8e3734ea23ba

commit these updated translations here also
author Luke Schierer <lschiere@pidgin.im>
date Fri, 09 Feb 2007 13:43:36 +0000
parents 4972fc6bc3bd
children ab7791faefa1
line wrap: on
line diff
--- a/po/es.po	Fri Feb 09 13:42:33 2007 +0000
+++ b/po/es.po	Fri Feb 09 13:43:36 2007 +0000
@@ -6,7 +6,7 @@
 # Copyright (c) December 2003, Francisco Javier F. Serrador
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
-# 	      January 2005, January/February 2006, October 2006
+# 	      January 2005, January/February 2006, October 2006, January 2007
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisión realizada por:
@@ -52,8 +52,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-29 00:00-0400\n"
-"PO-Revision-Date: 2006-10-15 21:55+0200\n"
+"POT-Creation-Date: 2007-01-19 00:00-0500\n"
+"PO-Revision-Date: 2007-01-19 23:51+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -73,16 +73,16 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Cliente de mensajería instantánea multiprotocolo"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:240
-#: ../console/gntblist.c:357 ../console/gntblist.c:370
-#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
-#: ../console/gntstatus.c:240 ../console/gntstatus.c:248
-#: ../libgaim/protocols/jabber/buddy.c:1363
-#: ../libgaim/protocols/jabber/chat.c:677
-#: ../libgaim/protocols/jabber/chat.c:688
-#: ../libgaim/protocols/jabber/jabber.c:1197
-#: ../libgaim/protocols/qq/group_join.c:322
-#: ../libgaim/protocols/silc/ops.c:1448
+#: ../console/gntaccount.c:119 ../console/gntblist.c:272
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
+#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
+#: ../libgaim/protocols/jabber/buddy.c:1399
+#: ../libgaim/protocols/jabber/chat.c:679
+#: ../libgaim/protocols/jabber/chat.c:690
+#: ../libgaim/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/qq/group_join.c:324
+#: ../libgaim/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Error"
 
@@ -94,15 +94,15 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vacío."
 
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:557
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:486
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
 msgid "Remember password"
 msgstr "Recordar contraseña"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1399 ../gtk/gtkblist.c:3771
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
@@ -110,100 +110,91 @@
 msgid "New Account"
 msgstr "Nueva cuenta"
 
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:398 ../gtk/gtkft.c:695
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:403 ../gtk/gtkblist.c:4895
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
 #: ../gtk/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Nombre de usuario:"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:477
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4916 ../gtk/gtkblist.c:5281
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
 msgid "Alias:"
 msgstr "Apodo:"
 
 #. Cancel
 #: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:281
-#: ../console/gntblist.c:347 ../console/gntblist.c:380
-#: ../console/gntblist.c:699 ../console/gntblist.c:863
-#: ../console/gntblist.c:951 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:132 ../console/gntstatus.c:404
-#: ../console/gntstatus.c:524 ../gtk/gtkaccount.c:1832
-#: ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5337 ../gtk/gtkdialogs.c:667
-#: ../gtk/gtkdialogs.c:804 ../gtk/gtkdialogs.c:895 ../gtk/gtkdialogs.c:914
-#: ../gtk/gtkdialogs.c:936 ../gtk/gtkdialogs.c:956 ../gtk/gtkdialogs.c:1000
-#: ../gtk/gtkdialogs.c:1038 ../gtk/gtkdialogs.c:1092 ../gtk/gtkdialogs.c:1129
-#: ../gtk/gtkdialogs.c:1154 ../gtk/gtkimhtmltoolbar.c:419
-#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
-#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
-#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
-#: ../libgaim/account.c:963 ../libgaim/account.c:1134
-#: ../libgaim/account.c:1168 ../libgaim/conversation.c:1164
+#: ../console/gntaccount.c:834 ../console/gntblist.c:313
+#: ../console/gntblist.c:380 ../console/gntblist.c:413
+#: ../console/gntblist.c:737 ../console/gntblist.c:906
+#: ../console/gntblist.c:997 ../console/gntblist.c:2021
+#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
+#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
+#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
+#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
+#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
+#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
+#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
+#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
 #: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
 #: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
 #: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1725
-#: ../libgaim/protocols/jabber/buddy.c:1759
-#: ../libgaim/protocols/jabber/chat.c:780
-#: ../libgaim/protocols/jabber/jabber.c:854
-#: ../libgaim/protocols/jabber/jabber.c:1352
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
-#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
-#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
-#: ../libgaim/protocols/oscar/oscar.c:1387
-#: ../libgaim/protocols/oscar/oscar.c:2151
-#: ../libgaim/protocols/oscar/oscar.c:2190
-#: ../libgaim/protocols/oscar/oscar.c:2238
-#: ../libgaim/protocols/oscar/oscar.c:5732
-#: ../libgaim/protocols/oscar/oscar.c:5784
-#: ../libgaim/protocols/oscar/oscar.c:5936
-#: ../libgaim/protocols/oscar/oscar.c:5961
-#: ../libgaim/protocols/oscar/oscar.c:6017
-#: ../libgaim/protocols/oscar/oscar.c:6086
-#: ../libgaim/protocols/oscar/peer.c:991
-#: ../libgaim/protocols/qq/buddy_info.c:480
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_join.c:357
-#: ../libgaim/protocols/qq/group_opt.c:140
-#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
-#: ../libgaim/protocols/qq/sendqueue.c:201
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:3364
-#: ../libgaim/protocols/sametime/sametime.c:3449
-#: ../libgaim/protocols/sametime/sametime.c:3619
-#: ../libgaim/protocols/sametime/sametime.c:5320
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/buddy.c:1795
+#: ../libgaim/protocols/jabber/chat.c:788
+#: ../libgaim/protocols/jabber/jabber.c:861
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
+#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
+#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/peer.c:1021
+#: ../libgaim/protocols/qq/buddy_info.c:484
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3410
+#: ../libgaim/protocols/sametime/sametime.c:3495
+#: ../libgaim/protocols/sametime/sametime.c:3665
 #: ../libgaim/protocols/sametime/sametime.c:5409
-#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/sametime/sametime.c:5498
+#: ../libgaim/protocols/sametime/sametime.c:5622
 #: ../libgaim/protocols/silc/buddy.c:467
 #: ../libgaim/protocols/silc/buddy.c:1078
 #: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:754 ../libgaim/protocols/silc/silc.c:959
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
-#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
-#: ../libgaim/request.h:1354
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
+#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:3208
+#: ../libgaim/protocols/yahoo/yahoo.c:3217
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save
 #: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:407 ../console/gntstatus.c:512 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1167
-#: ../libgaim/protocols/jabber/buddy.c:587
+#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
+#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
 msgid "Save"
 msgstr "Guardar"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1826
-#: ../gtk/gtksavedstatuses.c:293
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
+#: ../gtk/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
@@ -214,15 +205,14 @@
 msgstr "Borrar cuenta"
 
 #: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:132 ../console/gntstatus.c:194
-#: ../gtk/gtkaccount.c:1831 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:295
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:335
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1638
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2134
-#: ../gtk/plugins/docklet/docklet.c:519
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -231,14 +221,13 @@
 msgstr "Puede (desh)habilitar cuentas de la lista a continuación."
 
 #: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:281 ../console/gntblist.c:347
-#: ../console/gntblist.c:380 ../console/gntnotify.c:306
-#: ../console/gntstatus.c:184 ../gtk/gtkaccount.c:2301 ../gtk/gtkblist.c:5336
-#: ../gtk/gtkconv.c:1626 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../console/gntblist.c:313 ../console/gntblist.c:380
+#: ../console/gntblist.c:413 ../console/gntnotify.c:309
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
+#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5497
 #: ../libgaim/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Añadir"
@@ -247,206 +236,239 @@
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2250
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha hecho a %s su amigo o amiga%s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2299
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
 msgid "Add buddy to your list?"
 msgstr "¿Desea añadir el amigo a su lista?"
 
-#: ../console/gntblist.c:232
+#: ../console/gntblist.c:264
 msgid "You must provide a screename for the buddy."
 msgstr "Debe dar un nombre de usuario para el amigo."
 
-#: ../console/gntblist.c:234
+#: ../console/gntblist.c:266
 msgid "You must provide a group."
 msgstr "Debe indicar un grupo."
 
-#: ../console/gntblist.c:236
+#: ../console/gntblist.c:268
 msgid "You must select an account."
 msgstr "Debe seleccionar una cuenta."
 
-#: ../console/gntblist.c:240
+#: ../console/gntblist.c:272
 msgid "Error adding buddy"
-msgstr "Error al añadiro al amigo"
-
-#: ../console/gntblist.c:265 ../gtk/gtkaccount.c:1895
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
+msgstr "Error al añadir al amigo"
+
+#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
 msgid "Screen Name"
 msgstr "Nombre de usuario"
 
-#: ../console/gntblist.c:268 ../console/gntblist.c:339 ../gtk/gtkdialogs.c:913
-#: ../gtk/gtkdialogs.c:935 ../gtk/gtkdialogs.c:955 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/silc/chat.c:587
+#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
+#: ../libgaim/protocols/zephyr/zephyr.c:789
+#: ../libgaim/protocols/zephyr/zephyr.c:1207
 msgid "Alias"
 msgstr "Apodo"
 
-#: ../console/gntblist.c:271 ../console/gntblist.c:342
+#: ../console/gntblist.c:303 ../console/gntblist.c:375
 msgid "Group"
 msgstr "Grupo"
 
-#: ../console/gntblist.c:274 ../console/gntblist.c:330
-#: ../console/gntnotify.c:155 ../console/gntstatus.c:495
-#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
-#: ../gtk/plugins/gevolution/gevolution.c:450 ../libgaim/plugins/idle.c:153
-#: ../libgaim/plugins/idle.c:189
+#: ../console/gntblist.c:306 ../console/gntblist.c:363
+#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
+#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
+#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../console/gntblist.c:280 ../console/gntblist.c:739 ../gtk/gtkblist.c:4849
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:442
+#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
 #: ../libgaim/protocols/silc/buddy.c:736
 #: ../libgaim/protocols/silc/buddy.c:1030
 #: ../libgaim/protocols/silc/buddy.c:1075
 #: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3128
+#: ../libgaim/protocols/yahoo/yahoo.c:3122
 msgid "Add Buddy"
 msgstr "Añadir amigo"
 
-#: ../console/gntblist.c:280
+#: ../console/gntblist.c:312
 msgid "Please enter buddy information."
 msgstr "Introduzca la información del amigo."
 
-#: ../console/gntblist.c:303 ../libgaim/blist.c:1182
+#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#. Contact Info
-#. Personal
-#. Business
-#: ../console/gntblist.c:336 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:131
-#: ../gtk/plugins/gevolution/assoc-buddy.c:119
-#: ../libgaim/protocols/jabber/jabber.c:785
-#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
-#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
+#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:792
+#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
 msgid "Name"
 msgstr "Nombre"
 
-#: ../console/gntblist.c:345 ../console/gntblist.c:741 ../gtk/gtkblist.c:5227
+#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
 msgid "Add Chat"
 msgstr "Añadir chat"
 
-#: ../console/gntblist.c:346
+#: ../console/gntblist.c:379
 msgid "You can edit more information from the context menu later."
-msgstr "Puede editar más información más adelante a través del menú contextual."
-
-#: ../console/gntblist.c:357 ../console/gntblist.c:370
+msgstr ""
+"Puede editar más información más adelante a través del menú contextual."
+
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
 msgid "Error adding group"
 msgstr "Error al añadir al grupo"
 
-#: ../console/gntblist.c:358
+#: ../console/gntblist.c:391
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a añadir."
 
-#: ../console/gntblist.c:371
+#: ../console/gntblist.c:404
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: ../console/gntblist.c:378 ../console/gntblist.c:743 ../gtk/gtkblist.c:5333
-#: ../libgaim/protocols/sametime/sametime.c:5319
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/sametime/sametime.c:5495
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: ../console/gntblist.c:378
+#: ../console/gntblist.c:411
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"
 
-#: ../console/gntblist.c:698
+#: ../console/gntblist.c:736
 msgid "Edit Chat"
 msgstr "Editar chat"
 
-#: ../console/gntblist.c:698
+#: ../console/gntblist.c:736
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."
 
-#: ../console/gntblist.c:699 ../console/gntstatus.c:189
+#: ../console/gntblist.c:737 ../console/gntstatus.c:196
 msgid "Edit"
 msgstr "Editar"
 
-#: ../console/gntblist.c:705
+#: ../console/gntblist.c:751
 msgid "Auto-join"
 msgstr "Conectarse automáticamente"
 
-#: ../console/gntblist.c:713
+#: ../console/gntblist.c:760
 msgid "Edit Settings"
 msgstr "Editar configuración"
 
 # No se traduce como «Obtener Información» porque sino hace muy grande el 
 # botón que utiliza este texto y, consecuentemente, la pantalla de Gaim, jfs
-#: ../console/gntblist.c:761 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Info"
 
-#: ../console/gntblist.c:766
+#: ../console/gntblist.c:811
 msgid "Add Buddy Pounce"
 msgstr "Añadir aviso de amigo"
 
-#: ../console/gntblist.c:773 ../gtk/gtkconv.c:1574
-#: ../libgaim/protocols/oscar/oscar.c:615
+#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
+#: ../libgaim/protocols/oscar/oscar.c:633
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../console/gntblist.c:777
+#: ../console/gntblist.c:822
 msgid "View Log"
 msgstr "Ver registro"
 
-#: ../console/gntblist.c:859
+#: ../console/gntblist.c:902
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"
 
-#. These are common for everything
-#: ../console/gntblist.c:861 ../console/gntblist.c:862
-#: ../console/gntblist.c:1005
+#: ../console/gntblist.c:904 ../console/gntblist.c:905
+#: ../console/gntblist.c:1116
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../console/gntblist.c:861
+#: ../console/gntblist.c:904
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vacía para resetear el nombre."
 
-#: ../console/gntblist.c:939
+#: ../console/gntblist.c:977
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+"Si elimina este contacto también eliminará a todos los amigos en el contacto"
+
+#: ../console/gntblist.c:985
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Si elimina este grupo también eliminará a todos los amigos en el grupo"
 
-#: ../console/gntblist.c:944
+#: ../console/gntblist.c:990
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "¿Está seguro que quiere borrar a %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:947
+#: ../console/gntblist.c:993
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"
 
-#: ../console/gntblist.c:950 ../console/gntblist.c:1007 ../gtk/gtkblist.c:1033
-#: ../gtk/gtkconv.c:1623 ../gtk/gtkrequest.c:275
+#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
+#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../console/gntblist.c:1040 ../console/gntblist.c:1144
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Cuenta: %s (%s)"
-
-#: ../console/gntblist.c:1065
-#, c-format
-msgid ""
-"\n"
-"Idle: %s"
-msgstr "\nInactivo: %s"
+#. Buddy List
+#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+msgid "Buddy List"
+msgstr "Lista de amigos"
 
 #: ../console/gntblist.c:1123
-#, c-format
-msgid "Nickname: %s\n"
-msgstr "Apodo: %s\n"
-
-#: ../console/gntblist.c:1135
+msgid "Place tagged"
+msgstr "Lugares marcados"
+
+#: ../console/gntblist.c:1128
+msgid "Toggle Tag"
+msgstr "Cambiar marca"
+
+#. General
+#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:814
+#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libgaim/protocols/jabber/buddy.c:1744
+#: ../libgaim/protocols/jabber/jabber.c:802
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+msgid "Nickname"
+msgstr "Apodo"
+
+#. Idle stuff
+#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
+#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:645
+#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:2876
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+msgid "Idle"
+msgstr "Está inactivo"
+
+#: ../console/gntblist.c:1270
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -455,28 +477,98 @@
 "En línea: %d\n"
 "Total: %d"
 
-#: ../console/gntblist.c:1156
+#: ../console/gntblist.c:1279
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Cuenta: %s (%s)"
+
+#: ../console/gntblist.c:1291
 #, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
-msgstr "\nVisto por última vez: hace %s"
-
-#: ../console/gntblist.c:1375 ../gtk/gtkstatusbox.c:947
-#: ../gtk/plugins/docklet/docklet.c:467
+msgstr ""
+"\n"
+"Visto por última vez: hace %s"
+
+#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1000
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../console/gntblist.c:1382 ../gtk/gtkstatusbox.c:948
-#: ../gtk/plugins/docklet/docklet.c:468
+#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1001
 msgid "Saved..."
 msgstr "Guardado..."
 
-#. Buddy List
-#: ../console/gntblist.c:1695 ../console/gntprefs.c:219 ../console/gntui.c:71
-#: ../gtk/gtkblist.c:3888 ../gtk/plugins/win32/winprefs/winprefs.c:451
-msgid "Buddy List"
-msgstr "Lista de amigos"
+#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
+msgid "Plugins"
+msgstr "Complementos"
+
+#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:883
+msgid "_Name"
+msgstr "_Nombre"
+
+#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:888
+msgid "_Account"
+msgstr "_Cuenta"
+
+#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
+msgid "New Instant Message"
+msgstr "Mensaje instantáneo nuevo"
+
+#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Introduzca el nombre de usuario o apodo de la persona con la que quiere "
+"comunicarse."
+
+#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
+#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
+#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
+#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:3207
+#: ../libgaim/protocols/yahoo/yahoo.c:3216
+msgid "OK"
+msgstr "Aceptar"
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
+msgid "Options"
+msgstr "Opciones"
+
+#: ../console/gntblist.c:2045
+msgid "Send IM..."
+msgstr "Enviar MI..."
+
+#: ../console/gntblist.c:2049
+msgid "Toggle offline buddies"
+msgstr "Mostrar amigos desconectados"
+
+#: ../console/gntblist.c:2053
+msgid "Sort by status"
+msgstr "Ordenar por estado"
+
+#: ../console/gntblist.c:2057
+msgid "Sort alphabetically"
+msgstr "Ordenar alfabéticamente"
+
+#: ../console/gntblist.c:2061
+msgid "Sort by log size"
+msgstr "Ordenar por tamaño de registro"
 
 #: ../console/gntconn.c:36
 #, c-format
@@ -497,33 +589,33 @@
 "%s se ha desconectado por el siguiente error:\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3768 ../libgaim/account.c:990
-#: ../libgaim/connection.c:106
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
+#: ../libgaim/connection.c:107
 msgid "Connection Error"
 msgstr "Error de conexión"
 
-#: ../console/gntconv.c:102 ../gtk/gtkconv.c:478
+#: ../console/gntconv.c:102
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:485
+#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error sintáctico:  Vd. no escribió suficientes argumentos para esa orden."
 
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:490
+#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:496
+#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sólo funciona en chats, no en MIs."
 
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:499
+#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sólo funciona en MIs, no en chats."
 
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:503
+#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
@@ -531,34 +623,41 @@
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "Órdenes no soportadas. NO se ha enviado el mensaje."
 
-#: ../console/gntconv.c:224
+#: ../console/gntconv.c:232
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:244
+#: ../console/gntconv.c:255
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:374
+#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr "\n%s está escribiendo..."
+
+#: ../console/gntconv.c:399
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOMÁTICA> "
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:468
+#: ../console/gntconv.c:501
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../console/gntconv.c:592 ../gtk/gtkconv.c:372
+#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"
 
-#: ../console/gntconv.c:627 ../gtk/gtkconv.c:408
+#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: ../console/gntconv.c:630 ../gtk/gtkconv.c:411
+#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -566,7 +665,7 @@
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes órdenes están disponibles en este contexto:\n"
 
-#: ../console/gntconv.c:669 ../gtk/gtkconv.c:6639
+#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -574,12 +673,12 @@
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: ../console/gntconv.c:672 ../gtk/gtkconv.c:6642
+#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
 
-#: ../console/gntconv.c:675 ../gtk/gtkconv.c:6645
+#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -587,48 +686,64 @@
 "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
 "actual."
 
-#: ../console/gntconv.c:678 ../gtk/gtkconv.c:6648
+#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histórico de la ventana de conversación."
 
-#: ../console/gntconv.c:681 ../gtk/gtkconv.c:6651
+#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: ../console/gntconv.c:686
+#: ../console/gntconv.c:719
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostrar la ventana de complementos."
 
-#: ../console/gntconv.c:689
+#: ../console/gntconv.c:722
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostrar la lista de amigos."
 
-#: ../console/gntconv.c:692
+#: ../console/gntconv.c:725
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Muestra la ventana de cuentas."
 
-#: ../console/gntconv.c:695
+#: ../console/gntconv.c:728
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Muestra la ventana de depuración."
 
-#: ../console/gntconv.c:698
+#: ../console/gntconv.c:731
 msgid "prefs: Show the preference window."
 msgstr "prefs: Muestra la ventana de preferencias."
 
-#: ../console/gntconv.c:701
+#: ../console/gntconv.c:734
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana «savedstatuses»."
 
-#: ../console/gntdebug.c:119 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
 msgid "Debug Window"
 msgstr "Ventana de depuración"
 
-#: ../console/gntgaim.c:166
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+msgid "Clear"
+msgstr "Limpiar"
+
+#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "Pausar"
+
+#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Marcas de tiempo"
+
+#: ../console/gntgaim.c:227
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Intente `%s -h' para más información.\n"
 
-#: ../console/gntgaim.c:168
+#: ../console/gntgaim.c:229
 #, c-format
 msgid ""
 "%s\n"
@@ -643,39 +758,14 @@
 "%s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
+"configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida "
+"estándar\n"
 "  -h, --help           mostrar este mensaje y salir\n"
 "  -n, --nologin        no conectarse de forma automática\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3770 ../gtk/gtkdialogs.c:666
-#: ../gtk/gtkdialogs.c:803 ../gtk/gtkdialogs.c:894 ../gtk/gtkrequest.c:269
-#: ../libgaim/account.c:962 ../libgaim/account.c:1133
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1351
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
-#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
-#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
-#: ../libgaim/protocols/oscar/oscar.c:2150
-#: ../libgaim/protocols/oscar/oscar.c:2237
-#: ../libgaim/protocols/oscar/oscar.c:5731
-#: ../libgaim/protocols/oscar/oscar.c:5935
-#: ../libgaim/protocols/oscar/oscar.c:5960
-#: ../libgaim/protocols/oscar/oscar.c:6016
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1296 ../libgaim/protocols/silc/ops.c:1908
-#: ../libgaim/protocols/silc/silc.c:753
-#: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
-msgid "OK"
-msgstr "Aceptar"
-
 #: ../console/gntnotify.c:146
 msgid "Emails"
 msgstr "Correos"
@@ -684,19 +774,18 @@
 msgid "You have mail!"
 msgstr "¡Tiene correo!"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
-#: ../libgaim/protocols/jabber/jabber.c:1147
+#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
 msgid "From"
 msgstr "De"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
-#: ../console/gntplugin.c:274 ../console/gntstatus.c:199
-#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
-#: ../libgaim/protocols/silc/util.c:377
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
+#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
+#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
 msgid "Close"
 msgstr "Cerrar"
 
@@ -707,46 +796,45 @@
 msgstr[0] "%s (%s) tiene %d mensaje nuevo."
 msgstr[1] "%s (%s) tiene %d nuevos mensajes."
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
 msgid "New Mail"
 msgstr "Nuevo correo"
 
-#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
-#: ../libgaim/protocols/oscar/oscar.c:2610
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s:"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
 #: ../libgaim/protocols/toc/toc.c:476
 msgid "Buddy Information"
 msgstr "Información de amigos"
 
-#: ../console/gntnotify.c:303
+#: ../console/gntnotify.c:306
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1602 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
 msgid "Info"
 msgstr "Info"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1563
+#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
 msgid "IM"
 msgstr "MI"
 
-#: ../console/gntnotify.c:315
+#: ../console/gntnotify.c:318
 msgid "Join"
 msgstr "Unirse"
 
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3448
+#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../console/gntnotify.c:321
+#: ../console/gntnotify.c:324
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../console/gntplugin.c:117
+#: ../console/gntplugin.c:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -763,32 +851,27 @@
 "Sitio web: %s\n"
 "Nombre de fichero: %s\n"
 
-#: ../console/gntplugin.c:170
+#: ../console/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Debe cargar el complemento antes de poder configurarlo."
 
-#: ../console/gntplugin.c:208
+#: ../console/gntplugin.c:193
 msgid "..."
 msgstr "..."
 
-#: ../console/gntplugin.c:209
+#: ../console/gntplugin.c:194
 msgid "Still need to do something about this."
 msgstr "Aún hay que hacer algo sobre esto."
 
-#: ../console/gntplugin.c:215
+#: ../console/gntplugin.c:200
 msgid "No configuration options for this plugin."
 msgstr "No hay opciones de configuración para este complemento."
 
-#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkplugin.c:538
-#: ../gtk/plugins/docklet/docklet.c:520
-msgid "Plugins"
-msgstr "Complementos"
-
-#: ../console/gntplugin.c:236
+#: ../console/gntplugin.c:221
 msgid "You can (un)load plugins from the following list."
 msgstr "Puede (des)cargar complementos de la lista mostrada a continuación."
 
-#: ../console/gntplugin.c:279
+#: ../console/gntplugin.c:264
 msgid "Configure Plugin"
 msgstr "Configurar complemento"
 
@@ -825,17 +908,17 @@
 msgstr "Registrar los eventos de cambios de estado"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1884
-#: ../gtk/plugins/win32/winprefs/winprefs.c:465
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1314 ../gtk/gtkprefs.c:1895
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
 msgid "Logging"
 msgstr "Registro"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkprefs.c:1920
-#: ../gtk/plugins/docklet/docklet.c:521
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1951
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -843,131 +926,137 @@
 msgid "Not implemented yet."
 msgstr "No implementado aún."
 
-#: ../console/gntstatus.c:128
+#: ../console/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "¿Está seguro que quiere borrar a «%s»?"
 
-#: ../console/gntstatus.c:131
+#: ../console/gntstatus.c:138
 msgid "Delete Status"
 msgstr "Borrar estado"
 
-#: ../console/gntstatus.c:160 ../gtk/gtksavedstatuses.c:526
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
 msgid "Saved Statuses"
 msgstr "Estados guardados"
 
-#: ../console/gntstatus.c:167 ../console/gntstatus.c:458
-#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
+#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:931
 #: ../libgaim/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Título"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:448
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
 msgid "Type"
 msgstr "Tipo"
 
-#: ../console/gntstatus.c:167 ../console/gntstatus.c:483
-#: ../console/gntstatus.c:495 ../gtk/gtksavedstatuses.c:459
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
+#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
+#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
 #: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
-#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
-#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1214
-#: ../libgaim/protocols/jabber/jabber.c:1224
-#: ../libgaim/protocols/jabber/jabber.c:1234
-#: ../libgaim/protocols/jabber/jabber.c:1244
-#: ../libgaim/protocols/jabber/jabber.c:1254
-#: ../libgaim/protocols/jabber/jabber.c:1266
-#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
+#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
+#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
+#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1227
+#: ../libgaim/protocols/jabber/jabber.c:1237
+#: ../libgaim/protocols/jabber/jabber.c:1247
+#: ../libgaim/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/jabber/jabber.c:1267
+#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/novell/novell.c:2873
+#: ../libgaim/protocols/novell/novell.c:2976
 #: ../libgaim/protocols/novell/novell.c:2982
 #: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/novell/novell.c:2994
-#: ../libgaim/protocols/oscar/oscar.c:5395
-#: ../libgaim/protocols/oscar/oscar.c:5410
-#: ../libgaim/protocols/oscar/oscar.c:5415
-#: ../libgaim/protocols/oscar/oscar.c:5623
-#: ../libgaim/protocols/oscar/oscar.c:5635
-#: ../libgaim/protocols/oscar/oscar.c:5648
-#: ../libgaim/protocols/oscar/oscar.c:5655
-#: ../libgaim/protocols/oscar/oscar.c:5662
-#: ../libgaim/protocols/sametime/sametime.c:3262
-#: ../libgaim/protocols/sametime/sametime.c:3268
-#: ../libgaim/protocols/sametime/sametime.c:3274
-#: ../libgaim/protocols/sametime/sametime.c:3353
+#: ../libgaim/protocols/oscar/oscar.c:5501
+#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5741
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/sametime/sametime.c:3314
+#: ../libgaim/protocols/sametime/sametime.c:3320
+#: ../libgaim/protocols/sametime/sametime.c:3399
 #: ../libgaim/protocols/silc/buddy.c:1544
 #: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3450
 #: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/yahoo/yahoo.c:3462
-#: ../libgaim/protocols/zephyr/zephyr.c:2333
+#: ../libgaim/protocols/zephyr/zephyr.c:2337
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../console/gntstatus.c:179
+#. Use
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
 msgid "Use"
 msgstr "Usar"
 
-#: ../console/gntstatus.c:240
+#: ../console/gntstatus.c:291
 msgid "Invalid title"
 msgstr "Título no válido"
 
-#: ../console/gntstatus.c:241
+#: ../console/gntstatus.c:292
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduzca un título no vacío para el estado."
 
-#: ../console/gntstatus.c:248
+#: ../console/gntstatus.c:299
 msgid "Duplicate title"
 msgstr "Título duplicado"
 
-#: ../console/gntstatus.c:249
+#: ../console/gntstatus.c:300
 msgid "Please enter a different title for the status."
 msgstr "Introduzca un título distinto para el estado."
 
-#: ../console/gntstatus.c:372
+#: ../console/gntstatus.c:440
 msgid "Substatus"
 msgstr "Sub-estado"
 
 #. Set up stuff for the account box
-#: ../console/gntstatus.c:375 ../gtk/gtkblist.c:4943 ../gtk/gtkblist.c:5261
+#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: ../console/gntstatus.c:383 ../gtk/gtkft.c:698
+#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../console/gntstatus.c:398
+#: ../console/gntstatus.c:466
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: ../console/gntstatus.c:447
+#: ../console/gntstatus.c:515
 msgid "Edit Status"
 msgstr "Editar estado"
 
-#: ../console/gntstatus.c:466 ../console/gntstatus.c:495
-#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
-#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
-#: ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/jabber.c:1185
-#: ../libgaim/protocols/msn/msn.c:546
-#: ../libgaim/protocols/novell/novell.c:2875
-#: ../libgaim/protocols/novell/novell.c:2879
-#: ../libgaim/protocols/oscar/oscar.c:759
-#: ../libgaim/protocols/oscar/oscar.c:765
-#: ../libgaim/protocols/oscar/oscar.c:768
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
+#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
+#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:674
+#: ../libgaim/protocols/jabber/jabber.c:1195
+#: ../libgaim/protocols/msn/msn.c:547
+#: ../libgaim/protocols/novell/novell.c:2870
+#: ../libgaim/protocols/oscar/oscar.c:800
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:2655
+#: ../libgaim/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/sametime/sametime.c:4170
+#: ../libgaim/protocols/yahoo/yahoo.c:3027
 msgid "Status"
 msgstr "Estado"
 
-#: ../console/gntstatus.c:489
+#: ../console/gntstatus.c:557
 msgid "Use different status for following accounts"
 msgstr "Usar un estado diferente para las siguientes cuentas"
 
 #. Save & Use
-#: ../console/gntstatus.c:518
+#: ../console/gntstatus.c:591
 msgid "Save & Use"
 msgstr "Guardar y usar"
 
@@ -1033,19 +1122,19 @@
 msgstr "GntFg"
 
 #: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for GntGaim."
-msgstr "Complemento «toaster» para GntGaim."
-
-#: ../console/plugins/gnthistory.c:119 ../gtk/plugins/history.c:120
+msgid "Toaster plugin for Gaim-Text."
+msgstr "Complemento «toaster» para Gaim-Text."
+
+#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversación con %s sobre %s:</b><br>"
 
-#: ../console/plugins/gnthistory.c:140 ../gtk/plugins/history.c:147
+#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Debe estar conectad para utilizar el complemento de histórico"
 
-#: ../console/plugins/gnthistory.c:141 ../gtk/plugins/history.c:148
+#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1057,17 +1146,17 @@
 "La activación del registro en mensajes instantáneos y/o chats activará el "
 "histórico para los mismos tipos de conversación."
 
-#: ../console/plugins/gnthistory.c:181
+#: ../console/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "HistóricoGnt"
 
-#: ../console/plugins/gnthistory.c:183 ../gtk/plugins/history.c:190
+#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."
 
-#: ../console/plugins/gnthistory.c:184 ../gtk/plugins/history.c:191
+#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1075,13 +1164,37 @@
 "Cuando se abre una nueva conversación este complemento introduce la última "
 "conversación en la conversación actual."
 
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr "Lastlog"
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: Busca sub-cadenas en el registro pasado."
+
+#: ../console/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin for gaim-text."
+msgstr "Complemento «Lastlog» para gaim-text."
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Orientación"
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "La orientación en el área de notificación."
+
 #: ../gtk/gaimstock.c:137
 msgid "_Alias"
 msgstr "_Apodo:"
 
 #. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1114 ../gtk/gtkroomlist.c:285
-#: ../gtk/gtkroomlist.c:442
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
+#: ../gtk/gtkroomlist.c:463
 msgid "_Join"
 msgstr "_Unirse"
 
@@ -1089,7 +1202,7 @@
 msgid "Close _tabs"
 msgstr "Cerrar _solapas"
 
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:998
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
 msgid "I_M"
 msgstr "_MI"
 
@@ -1115,51 +1228,55 @@
 msgstr "_Pausar"
 
 #. Build the login options frame.
-#: ../gtk/gtkaccount.c:381
+#: ../gtk/gtkaccount.c:390
 msgid "Login Options"
 msgstr "Opciones de conexión"
 
-#: ../gtk/gtkaccount.c:482
+#: ../gtk/gtkaccount.c:492
 msgid "Local alias:"
 msgstr "Apodo local:"
 
 #. Build the user options frame.
-#: ../gtk/gtkaccount.c:544
+#: ../gtk/gtkaccount.c:554
 msgid "User Options"
 msgstr "Opciones de usuario"
 
 #. Buddy icon
-#: ../gtk/gtkaccount.c:562
+#: ../gtk/gtkaccount.c:572
 msgid "Use this buddy icon for this account:"
 msgstr "Utilizar este icono de amigo para esta cuenta:"
 
 #. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:670
+#: ../gtk/gtkaccount.c:684
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#: ../gtk/gtkaccount.c:866
+#: ../gtk/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "Usar configuración del proxy de GNOME"
+
+#: ../gtk/gtkaccount.c:882
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global del proxy"
 
-#: ../gtk/gtkaccount.c:872
+#: ../gtk/gtkaccount.c:888
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#: ../gtk/gtkaccount.c:878
+#: ../gtk/gtkaccount.c:894
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../gtk/gtkaccount.c:884
+#: ../gtk/gtkaccount.c:900
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../gtk/gtkaccount.c:890
+#: ../gtk/gtkaccount.c:906
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../gtk/gtkaccount.c:896 ../gtk/gtkprefs.c:1061
+#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"
 
@@ -1168,268 +1285,308 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:935
+#: ../gtk/gtkaccount.c:951
 msgid "If you look real closely"
 msgstr "Si miras de cerca"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:938
+#: ../gtk/gtkaccount.c:954
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"
 
-#: ../gtk/gtkaccount.c:959
+#: ../gtk/gtkaccount.c:975
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../gtk/gtkaccount.c:973 ../gtk/gtkprefs.c:1055
+#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../gtk/gtkaccount.c:982 ../gtk/gtkprefs.c:1076
+#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../gtk/gtkaccount.c:986 ../gtk/gtkprefs.c:1094
+#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../gtk/gtkaccount.c:994
+#: ../gtk/gtkaccount.c:1010
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../gtk/gtkaccount.c:1000 ../gtk/gtkprefs.c:1131
+#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
-#: ../gtk/gtkaccount.c:1397
+#: ../gtk/gtkaccount.c:1428
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: ../gtk/gtkaccount.c:1421
+#: ../gtk/gtkaccount.c:1452
 msgid "_Basic"
 msgstr "_Básica"
 
-#: ../gtk/gtkaccount.c:1432
+#: ../gtk/gtkaccount.c:1463
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
 #. Register button
-#: ../gtk/gtkaccount.c:1447 ../libgaim/protocols/jabber/jabber.c:853
+#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
 msgid "Register"
 msgstr "Registrar"
 
-#. add enabled / disabled
-#: ../gtk/gtkaccount.c:1918 ../gtk/gtkplugin.c:576
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:345
+#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../gtk/gtkaccount.c:1926
+#: ../gtk/gtkaccount.c:1961
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../gtk/gtkblist.c:700
+#: ../gtk/gtkaccount.c:2133
+msgid ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with Gaim press the "
+"<b>Add</b> button below and configure your first account. If you want Gaim "
+"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>¡Bienvenido a Gaim!</span>\n"
+"\n"
+"No tiene configurada ninguna cuenta de MI. Para conectarse con Gaim debe \n"
+"pulsar el botón <b>Añadir</b> que tiene más abajo y configurar su primera cuenta. Si quiere que Gaim se conecte a múltiples cuentas de MI deberá pulsar <b>Añadir</b> otra vez para configurarlas todas."
+
+#: ../gtk/gtkaccount.c:2483
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s quiere añadir a %s a su lista de amigos%s%s."
+
+#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
+msgid "Authorize buddy?"
+msgstr "¿Autorizar al amigo?"
+
+#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
+msgid "Deny"
+msgstr "Denegar"
+
+#: ../gtk/gtkblist.c:709
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: ../gtk/gtkblist.c:721
+#: ../gtk/gtkblist.c:730
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
-#: ../gtk/gtkblist.c:732 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
+#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../gtk/gtkblist.c:995
+#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Bloquear"
+
+#: ../gtk/gtkblist.c:1015
+msgid "Un_block"
+msgstr "Des_bloquear"
+
+#: ../gtk/gtkblist.c:1066
 msgid "Get _Info"
 msgstr "Obtener _información"
 
-#: ../gtk/gtkblist.c:1004
+#: ../gtk/gtkblist.c:1075
 msgid "_Send File"
 msgstr "_Enviar archivo"
 
-#: ../gtk/gtkblist.c:1011
+#: ../gtk/gtkblist.c:1082
 msgid "Add Buddy _Pounce"
 msgstr "Añadir _aviso de amigo"
 
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkblist.c:1019 ../gtk/gtkblist.c:1118
-#: ../gtk/gtkblist.c:1141
+#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1213
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: ../gtk/gtkblist.c:1030
+#: ../gtk/gtkblist.c:1103
 msgid "Alias..."
 msgstr "_Apodo..."
 
-#: ../gtk/gtkblist.c:1039 ../gtk/gtkblist.c:1126 ../gtk/gtkblist.c:1147
+#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../gtk/gtkblist.c:1041 ../gtk/gtkblist.c:1128 ../gtk/gtkblist.c:1149
+#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../gtk/gtkblist.c:1089
+#: ../gtk/gtkblist.c:1161
 msgid "Add a _Buddy"
 msgstr "Añadir un _amigo"
 
-#: ../gtk/gtkblist.c:1091
+#: ../gtk/gtkblist.c:1163
 msgid "Add a C_hat"
 msgstr "Añadir un _chat"
 
-#: ../gtk/gtkblist.c:1094
+#: ../gtk/gtkblist.c:1166
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../gtk/gtkblist.c:1096
+#: ../gtk/gtkblist.c:1168
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: ../gtk/gtkblist.c:1116
+#: ../gtk/gtkblist.c:1188
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: ../gtk/gtkblist.c:1154 ../gtk/gtkblist.c:1177
+#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../gtk/gtkblist.c:1182
+#: ../gtk/gtkblist.c:1254
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../gtk/gtkblist.c:1428 ../gtk/gtkblist.c:1440 ../gtk/gtkblist.c:4077
-#: ../gtk/gtkblist.c:4087
+#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
+#: ../gtk/gtkblist.c:4384
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../gtk/gtkblist.c:1900 ../gtk/gtkconv.c:4271 ../gtk/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 
 #. Buddies menu
-#: ../gtk/gtkblist.c:2474
+#: ../gtk/gtkblist.c:2567
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../gtk/gtkblist.c:2475
+#: ../gtk/gtkblist.c:2568
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo..."
 
-#: ../gtk/gtkblist.c:2476
+#: ../gtk/gtkblist.c:2569
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../gtk/gtkblist.c:2477
+#: ../gtk/gtkblist.c:2570
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."
 
-#: ../gtk/gtkblist.c:2478
+#: ../gtk/gtkblist.c:2571
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../gtk/gtkblist.c:2480
+#: ../gtk/gtkblist.c:2573
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Mostrar amigos _desconectados"
 
-#: ../gtk/gtkblist.c:2481
+#: ../gtk/gtkblist.c:2574
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Mostrar grupos _vacíos"
 
-#: ../gtk/gtkblist.c:2482
+#: ../gtk/gtkblist.c:2575
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Mostrar _detalles de amigo"
 
-#: ../gtk/gtkblist.c:2483
+#: ../gtk/gtkblist.c:2576
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Mostrar _tiempo de inactividad"
 
-#: ../gtk/gtkblist.c:2484
+#: ../gtk/gtkblist.c:2577
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
-#: ../gtk/gtkblist.c:2486
+#: ../gtk/gtkblist.c:2579
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: ../gtk/gtkblist.c:2487
+#: ../gtk/gtkblist.c:2580
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: ../gtk/gtkblist.c:2488
+#: ../gtk/gtkblist.c:2581
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: ../gtk/gtkblist.c:2490
+#: ../gtk/gtkblist.c:2583
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: ../gtk/gtkblist.c:2493
+#: ../gtk/gtkblist.c:2586
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: ../gtk/gtkblist.c:2494 ../gtk/gtkblist.c:5920
+#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Cuentas/Añadir\\/Editar"
 
 #. Tools
-#: ../gtk/gtkblist.c:2497
+#: ../gtk/gtkblist.c:2590
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: ../gtk/gtkblist.c:2498
+#: ../gtk/gtkblist.c:2591
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../gtk/gtkblist.c:2499
+#: ../gtk/gtkblist.c:2592
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../gtk/gtkblist.c:2500
+#: ../gtk/gtkblist.c:2593
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: ../gtk/gtkblist.c:2501
+#: ../gtk/gtkblist.c:2594
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../gtk/gtkblist.c:2503
+#: ../gtk/gtkblist.c:2596
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../gtk/gtkblist.c:2504
+#: ../gtk/gtkblist.c:2597
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: ../gtk/gtkblist.c:2505
+#: ../gtk/gtkblist.c:2598
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/Registro del sistema"
 
-#: ../gtk/gtkblist.c:2507
+#: ../gtk/gtkblist.c:2600
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../gtk/gtkblist.c:2510
+#: ../gtk/gtkblist.c:2603
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../gtk/gtkblist.c:2511
+#: ../gtk/gtkblist.c:2604
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#: ../gtk/gtkblist.c:2512
+#: ../gtk/gtkblist.c:2605
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#: ../gtk/gtkblist.c:2513
+#: ../gtk/gtkblist.c:2606
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../gtk/gtkblist.c:2545 ../gtk/gtkblist.c:2614
+#: ../gtk/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -1438,222 +1595,191 @@
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: ../gtk/gtkblist.c:2626
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Apodo de amigo:</b> %s"
-
-#: ../gtk/gtkblist.c:2638
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Apodo:</b> %s"
-
-#: ../gtk/gtkblist.c:2647
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Conectado:</b> %s"
-
-#: ../gtk/gtkblist.c:2658
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr "\n<b>Inactivo:</b> %s"
-
-#: ../gtk/gtkblist.c:2693
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Visto por última vez:</b> hace %s"
-
-#: ../gtk/gtkblist.c:2702
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-"\n"
-"<b>Estado:</b> Desconectado"
-
-#: ../gtk/gtkblist.c:2713
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-"\n"
-"<b>Descripción:</b> Terrorífica"
-
-#: ../gtk/gtkblist.c:2715
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
-msgstr ""
-"\n"
-"<b>Estado:</b> Genial"
-
-#: ../gtk/gtkblist.c:2717
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
-"\n"
-"<b>Estado:</b> Rock & roll"
-
-#: ../gtk/gtkblist.c:3184 ../gtk/gtkstatusbox.c:941
-#: ../gtk/plugins/docklet/docklet.c:447 ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1365
-#: ../libgaim/protocols/novell/novell.c:2865
-#: ../libgaim/protocols/oscar/oscar.c:769
-#: ../libgaim/protocols/oscar/oscar.c:5445
-#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+#: ../gtk/gtkblist.c:2722
+msgid "Buddy Alias"
+msgstr "Apodo de amigo"
+
+#: ../gtk/gtkblist.c:2743
+msgid "Logged In"
+msgstr "Conectado"
+
+#: ../gtk/gtkblist.c:2789
+msgid "Last Seen"
+msgstr "Visto por última vez"
+
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1401
+#: ../libgaim/protocols/novell/novell.c:2863
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
+#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
+#: ../libgaim/status.c:154
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../gtk/gtkblist.c:3200
+#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:289
+#: ../libgaim/protocols/jabber/buddy.c:937
+#: ../libgaim/protocols/jabber/chat.c:777
+msgid "Description"
+msgstr "Descripción"
+
+#: ../gtk/gtkblist.c:2809
+msgid "Spooky"
+msgstr "Asustadizo"
+
+#: ../gtk/gtkblist.c:2811
+msgid "Awesome"
+msgstr "Genial"
+
+#: ../gtk/gtkblist.c:2813
+msgid "Rockin'"
+msgstr "Rock'n'roleando"
+
+#: ../gtk/gtkblist.c:3302
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../gtk/gtkblist.c:3202
+#: ../gtk/gtkblist.c:3304
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#. Idle stuff
-#: ../gtk/gtkblist.c:3205 ../gtk/gtkprefs.c:1765
-#: ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:635
-#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2862
-#: ../libgaim/protocols/oscar/oscar.c:2824
-#: ../libgaim/protocols/yahoo/yahoo.c:2881
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-msgid "Idle"
-msgstr "Está inactivo"
-
-#: ../gtk/gtkblist.c:3333
+#: ../gtk/gtkblist.c:3435
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantáneo..."
 
-#: ../gtk/gtkblist.c:3334 ../gtk/gtkblist.c:3367
+#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../gtk/gtkblist.c:3335
+#: ../gtk/gtkblist.c:3437
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener información del usuario..."
 
-#: ../gtk/gtkblist.c:3336
+#: ../gtk/gtkblist.c:3438
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Añadir un amigo..."
 
-#: ../gtk/gtkblist.c:3337 ../gtk/gtkblist.c:3370
+#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Añadir un chat..."
 
-#: ../gtk/gtkblist.c:3338
+#: ../gtk/gtkblist.c:3440
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Añadir un grupo..."
 
-#: ../gtk/gtkblist.c:3373
+#: ../gtk/gtkblist.c:3475
 msgid "/Tools/Buddy Pounces"
 msgstr "/Herramientas/Aviso de amigo"
 
-#: ../gtk/gtkblist.c:3376
+#: ../gtk/gtkblist.c:3478
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../gtk/gtkblist.c:3379
+#: ../gtk/gtkblist.c:3481
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../gtk/gtkblist.c:3475 ../gtk/plugins/docklet/docklet.c:157
+#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaje sin leer de %s\n"
 msgstr[1] "%d mensajes sin leer de %s\n"
 
-#: ../gtk/gtkblist.c:3551
+#: ../gtk/gtkblist.c:3654
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../gtk/gtkblist.c:3553
+#: ../gtk/gtkblist.c:3656
 msgid "Alphabetically"
 msgstr "Alfabéticamente"
 
-#: ../gtk/gtkblist.c:3554
+#: ../gtk/gtkblist.c:3657
 msgid "By status"
 msgstr "Por estado"
 
-#: ../gtk/gtkblist.c:3555
+#: ../gtk/gtkblist.c:3658
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
-#: ../gtk/gtkblist.c:3763 ../gtk/gtkconn.c:186
+#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../gtk/gtkblist.c:3772 ../libgaim/protocols/sametime/sametime.c:3618
+#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../gtk/gtkblist.c:3772
+#: ../gtk/gtkblist.c:3869
 msgid "Re-enable Account"
 msgstr "Reactivar cuenta"
 
-#: ../gtk/gtkblist.c:3793
+#: ../gtk/gtkblist.c:3890
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
 
-#: ../gtk/gtkblist.c:3922
+#: ../gtk/gtkblist.c:4027
+msgid "<b>Username:</b>"
+msgstr "<b>Nombre de usuario:</b>"
+
+#: ../gtk/gtkblist.c:4034
+msgid "<b>Password:</b>"
+msgstr "<b>Contraseña:</b>"
+
+#: ../gtk/gtkblist.c:4045
+msgid "_Login"
+msgstr "_Entrada"
+
+#: ../gtk/gtkblist.c:4127
 msgid "/Accounts"
 msgstr "/Cuentas"
 
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../gtk/gtkblist.c:4141
+msgid ""
+"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span size='larger' weight='bold'>¡Bienvenido a Gaim!</span>\n"
+"\n"
+"No tiene ninguna cuenta activa. Puede activar sus cuentas de MI en la ventana de <b>Cuentas</b> en <b>Cuentas->Añadir/Editar</b>. Podrá conectarse, fijar su estado y hablar con sus amigos una vez active sus cuentas."
+
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../gtk/gtkblist.c:4071
+#: ../gtk/gtkblist.c:4368
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Mostrar amigos desconectados"
 
-#: ../gtk/gtkblist.c:4074
+#: ../gtk/gtkblist.c:4371
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Mostrar grupos vacíos"
 
-#: ../gtk/gtkblist.c:4080
+#: ../gtk/gtkblist.c:4377
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Mostrar detalles de amigo"
 
-#: ../gtk/gtkblist.c:4083
+#: ../gtk/gtkblist.c:4380
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Mostrar tiempos de inactividad"
 
-#: ../gtk/gtkblist.c:4739 ../gtk/plugins/gevolution/gevolution.c:96
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:516
-#: ../libgaim/blist.c:1281 ../libgaim/blist.c:1508
-#: ../libgaim/protocols/jabber/roster.c:67
+#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
+#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
+#: ../libgaim/protocols/jabber/roster.c:68
 msgid "Buddies"
 msgstr "Amigos"
 
-#: ../gtk/gtkblist.c:4873
+#: ../gtk/gtkblist.c:5207
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -1664,17 +1790,17 @@
 "sobrenombre se mostrará en lugar del nombre de usuario siempre que sea "
 "posible.\n"
 
-#: ../gtk/gtkblist.c:4933 ../gtk/gtkblist.c:5296
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:549
+#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
 #: ../gtk/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../gtk/gtkblist.c:5194
+#: ../gtk/gtkblist.c:5526
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."
 
-#: ../gtk/gtkblist.c:5210
+#: ../gtk/gtkblist.c:5542
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1682,7 +1808,7 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../gtk/gtkblist.c:5251
+#: ../gtk/gtkblist.c:5583
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -1690,60 +1816,70 @@
 "Introduzca el apodo, y la información que crea conveniente del chat que "
 "desearía añadir en la lista de amigos.\n"
 
-#: ../gtk/gtkblist.c:5334
+#: ../gtk/gtkblist.c:5666
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: ../gtk/gtkblist.c:5960
+#: ../gtk/gtkblist.c:6299
+msgid "<GaimMain>/Accounts/"
+msgstr "<GaimMain>/Cuentas/"
+
+#: ../gtk/gtkblist.c:6324
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../gtk/gtkblist.c:5993 ../gtk/gtkblist.c:5999 ../gtk/gtkconv.c:2775
+#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: ../gtk/gtkblist.c:6007
+#: ../gtk/gtkblist.c:6371
 msgid "_Disable"
 msgstr "Deshabilitar"
 
-#: ../gtk/gtkblist.c:6019
+#: ../gtk/gtkblist.c:6383
 msgid "Enable Account"
 msgstr "Habilitar cuenta"
 
-#: ../gtk/gtkblist.c:6072
+#: ../gtk/gtkblist.c:6389
+msgid "<GaimMain>/Accounts/Enable Account"
+msgstr "<GaimMain>/Cuentas/Activar cuenta"
+
+#: ../gtk/gtkblist.c:6438
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../gtk/gtkblist.c:6158
+#: ../gtk/gtkblist.c:6508
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
-#: ../gtk/gtkconn.c:187
-#, c-format
-msgid ""
-"%s was disconnected due to an error: %s\n"
+#: ../gtk/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-"Se desconectó %s debido a un error: %s \n"
+"%s\n"
+"\n"
 "Gaim no intentará reconectarse a esta cuenta hasta que corrija el error y reactive la cuenta."
 
-#: ../gtk/gtkconv.c:738 ../gtk/gtkconv.c:764
+#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
 
-#: ../gtk/gtkconv.c:758
+#: ../gtk/gtkconv.c:786
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "No está conectado con ninguna cuenta con la que pueda invitar a ese amigo."
 
-#: ../gtk/gtkconv.c:811
+#: ../gtk/gtkconv.c:839
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: ../gtk/gtkconv.c:841
+#: ../gtk/gtkconv.c:869
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -1751,354 +1887,367 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."
 
-#: ../gtk/gtkconv.c:862
+#: ../gtk/gtkconv.c:890
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../gtk/gtkconv.c:882 ../gtk/gtksavedstatuses.c:1111
-#: ../gtk/gtksavedstatuses.c:1447
+#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
+#: ../gtk/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../gtk/gtkconv.c:939 ../gtk/gtkconv.c:2392 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
 #: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
 
-#: ../gtk/gtkconv.c:945
+#: ../gtk/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../gtk/gtkconv.c:969
+#: ../gtk/gtkconv.c:997
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
-#: ../gtk/gtkconv.c:1116 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
+#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "Buscar"
 
-#: ../gtk/gtkconv.c:1142 ../gtk/gtkdebug.c:194
+#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "Término a _buscar:"
 
-#: ../gtk/gtkconv.c:1313
+#: ../gtk/gtkconv.c:1341
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Se inició el registro. A partir de ahora se registrarán todos los mensajes "
 "de esta conversación."
 
-#: ../gtk/gtkconv.c:1321
+#: ../gtk/gtkconv.c:1349
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Se ha parado el registro. No se registrarán mensajes de esta conversación de "
 "ahora en adelante."
 
-#: ../gtk/gtkconv.c:1589
+#: ../gtk/gtkconv.c:1617
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../gtk/gtkconv.c:1592
+#: ../gtk/gtkconv.c:1620
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../gtk/gtkconv.c:1612
+#: ../gtk/gtkconv.c:1640
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../gtk/gtkconv.c:1635
+#: ../gtk/gtkconv.c:1663
 msgid "Last said"
 msgstr "Dicho la última vez"
 
-#: ../gtk/gtkconv.c:2400
+#: ../gtk/gtkconv.c:2428
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../gtk/gtkconv.c:2424
+#: ../gtk/gtkconv.c:2498
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../gtk/gtkconv.c:2473
+#: ../gtk/gtkconv.c:2547
 msgid "Animate"
 msgstr "Animar"
 
-#: ../gtk/gtkconv.c:2478
+#: ../gtk/gtkconv.c:2552
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../gtk/gtkconv.c:2484
+#: ../gtk/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
+#: ../gtk/gtkconv.c:2559
+msgid "Set Custom Icon..."
+msgstr "Configurar icono personalizado..."
+
+#: ../gtk/gtkconv.c:2566
+msgid "Remove Custom Icon"
+msgstr "Eliminar icono personalizado"
+
 #. Conversation menu
-#: ../gtk/gtkconv.c:2624
+#: ../gtk/gtkconv.c:2707
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: ../gtk/gtkconv.c:2626
+#: ../gtk/gtkconv.c:2709
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#: ../gtk/gtkconv.c:2631
+#: ../gtk/gtkconv.c:2714
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: ../gtk/gtkconv.c:2633
+#: ../gtk/gtkconv.c:2716
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"
 
-#: ../gtk/gtkconv.c:2634
+#: ../gtk/gtkconv.c:2717
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."
 
-#: ../gtk/gtkconv.c:2636
+#: ../gtk/gtkconv.c:2719
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/Limpia_r deslizable"
 
-#: ../gtk/gtkconv.c:2640
+#: ../gtk/gtkconv.c:2723
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/_Enviar archivo..."
 
-#: ../gtk/gtkconv.c:2641
+#: ../gtk/gtkconv.c:2724
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
-#: ../gtk/gtkconv.c:2643
+#: ../gtk/gtkconv.c:2726
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
 
-#: ../gtk/gtkconv.c:2645
+#: ../gtk/gtkconv.c:2728
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: ../gtk/gtkconv.c:2647
+#: ../gtk/gtkconv.c:2730
 msgid "/Conversation/M_ore"
 msgstr "/Conversación/_Más"
 
-#: ../gtk/gtkconv.c:2651
+#: ../gtk/gtkconv.c:2734
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
 
-#: ../gtk/gtkconv.c:2653
+#: ../gtk/gtkconv.c:2736
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."
 
-#: ../gtk/gtkconv.c:2655
+#: ../gtk/gtkconv.c:2738
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."
 
-#: ../gtk/gtkconv.c:2657
+#: ../gtk/gtkconv.c:2740
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."
 
-#: ../gtk/gtkconv.c:2662
+#: ../gtk/gtkconv.c:2745
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Insertar en_lace..."
 
-#: ../gtk/gtkconv.c:2664
+#: ../gtk/gtkconv.c:2747
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Insertar imag_en..."
 
-#: ../gtk/gtkconv.c:2669
+#: ../gtk/gtkconv.c:2752
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"
 
 #. Options
-#: ../gtk/gtkconv.c:2673
+#: ../gtk/gtkconv.c:2756
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../gtk/gtkconv.c:2674
+#: ../gtk/gtkconv.c:2757
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../gtk/gtkconv.c:2675
+#: ../gtk/gtkconv.c:2758
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../gtk/gtkconv.c:2676
+#: ../gtk/gtkconv.c:2759
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opciones/Mostrar _iconos de los amigos"
 
-#: ../gtk/gtkconv.c:2678
+#: ../gtk/gtkconv.c:2761
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../gtk/gtkconv.c:2679
+#: ../gtk/gtkconv.c:2762
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../gtk/gtkconv.c:2754
+#: ../gtk/gtkconv.c:2837
 msgid "/Conversation/More"
 msgstr "/Conversación/Más"
 
-#: ../gtk/gtkconv.c:2792 ../gtk/gtkconv.c:2819
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
 msgid "/Conversation"
 msgstr "/Conversación"
 
-#: ../gtk/gtkconv.c:2829
+#: ../gtk/gtkconv.c:2922
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#: ../gtk/gtkconv.c:2835
+#: ../gtk/gtkconv.c:2928
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
-#: ../gtk/gtkconv.c:2839
+#: ../gtk/gtkconv.c:2932
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: ../gtk/gtkconv.c:2845
+#: ../gtk/gtkconv.c:2938
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"
 
-#: ../gtk/gtkconv.c:2849
+#: ../gtk/gtkconv.c:2942
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: ../gtk/gtkconv.c:2855
+#: ../gtk/gtkconv.c:2948
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."
 
-#: ../gtk/gtkconv.c:2859
+#: ../gtk/gtkconv.c:2952
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: ../gtk/gtkconv.c:2863
+#: ../gtk/gtkconv.c:2956
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: ../gtk/gtkconv.c:2867
+#: ../gtk/gtkconv.c:2960
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: ../gtk/gtkconv.c:2873
+#: ../gtk/gtkconv.c:2966
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: ../gtk/gtkconv.c:2877
+#: ../gtk/gtkconv.c:2970
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: ../gtk/gtkconv.c:2883
+#: ../gtk/gtkconv.c:2976
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../gtk/gtkconv.c:2886
+#: ../gtk/gtkconv.c:2979
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../gtk/gtkconv.c:2899
+#: ../gtk/gtkconv.c:2992
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../gtk/gtkconv.c:2902
+#: ../gtk/gtkconv.c:2995
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../gtk/gtkconv.c:2905
+#: ../gtk/gtkconv.c:2998
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opciones/Mostrar _iconos de los amigos"
 
-#: ../gtk/gtkconv.c:2981
+#: ../gtk/gtkconv.c:3074
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: ../gtk/gtkconv.c:2984
+#: ../gtk/gtkconv.c:3077
 msgid "User has typed something and stopped"
 msgstr "El usuario ha escrito algo y ha parado"
 
 #. Build the Send To menu
-#: ../gtk/gtkconv.c:3167
+#: ../gtk/gtkconv.c:3260
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../gtk/gtkconv.c:3869
+#: ../gtk/gtkconv.c:3967
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../gtk/gtkconv.c:3923 ../libgaim/protocols/sametime/sametime.c:3560
+#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:3975
+#: ../gtk/gtkconv.c:4115
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#: ../gtk/gtkconv.c:5022 ../gtk/gtkconv.c:5143
+#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-#: ../gtk/gtkconv.c:5696 ../gtk/gtkstatusbox.c:548
+#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
 msgid "Typing"
 msgstr "Tecleando"
 
-#: ../gtk/gtkconv.c:5702
+#: ../gtk/gtkconv.c:5861
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
-#: ../gtk/gtkconv.c:5707
+#: ../gtk/gtkconv.c:5866
 msgid "Nick Said"
 msgstr "Apodo dijo"
 
-#: ../gtk/gtkconv.c:5712 ../gtk/plugins/docklet/docklet.c:489
+#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: ../gtk/gtkconv.c:5717
+#: ../gtk/gtkconv.c:5876
 msgid "New Event"
 msgstr "Nuevo acontecimiento"
 
-#: ../gtk/gtkconv.c:6812
+#: ../gtk/gtkconv.c:6997
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../gtk/gtkconv.c:6844
+#: ../gtk/gtkconv.c:7029
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Tiene mensajes sin leer. ¿Está seguro que quiere cerrar la ventana?"
 
-#: ../gtk/gtkconv.c:7366
+#: ../gtk/gtkconv.c:7564
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"
 
-#: ../gtk/gtkconv.c:7372
+#: ../gtk/gtkconv.c:7570
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"
 
-#: ../gtk/gtkconv.c:7380
+#: ../gtk/gtkconv.c:7578
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"
 
-#: ../gtk/gtkconv.c:7386
+#: ../gtk/gtkconv.c:7584
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"
 
-#: ../gtk/gtkconv.c:7651
+#: ../gtk/gtkconv.c:7855
 msgid "Close conversation"
 msgstr "Cerrar conversación"
 
-#: ../gtk/gtkconv.c:8115
+#: ../gtk/gtkconv.c:8319
 msgid "Last created window"
 msgstr "Última ventana creada"
 
-#: ../gtk/gtkconv.c:8117
+#: ../gtk/gtkconv.c:8321
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../gtk/gtkconv.c:8119 ../gtk/gtkprefs.c:1263
+#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../gtk/gtkconv.c:8121
+#: ../gtk/gtkconv.c:8325
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../gtk/gtkconv.c:8123
+#: ../gtk/gtkconv.c:8327
 msgid "By account"
 msgstr "Por cuenta"
 
@@ -2126,18 +2275,6 @@
 msgid "_Both Icon & Text"
 msgstr "_Tanto iconos como texto"
 
-#: ../gtk/gtkdebug.c:767
-msgid "Clear"
-msgstr "Limpiar"
-
-#: ../gtk/gtkdebug.c:776
-msgid "Pause"
-msgstr "Pausar"
-
-#: ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Marcas de tiempo"
-
 #: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "Filtro"
@@ -2174,333 +2311,330 @@
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
 msgid "lead developer"
 msgstr "desarrollador principal"
 
 #: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:72 ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
 #: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:79 ../gtk/gtkdialogs.c:80
-#: ../gtk/gtkdialogs.c:81
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
+#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
 msgid "developer"
 msgstr "desarrollador"
 
-#: ../gtk/gtkdialogs.c:71
+#: ../gtk/gtkdialogs.c:72
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"
 
-#: ../gtk/gtkdialogs.c:78
+#: ../gtk/gtkdialogs.c:79
 msgid "support"
 msgstr "soporte"
 
-#: ../gtk/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:80
+msgid "support/QA"
+msgstr "soporte/QA"
+
+#: ../gtk/gtkdialogs.c:102
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../gtk/gtkdialogs.c:104
+#: ../gtk/gtkdialogs.c:105
 msgid "libfaim maintainer"
 msgstr "mantenedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:106
+#: ../gtk/gtkdialogs.c:107
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseñador de controladores [lazy bum]"
 
-#: ../gtk/gtkdialogs.c:107
+#: ../gtk/gtkdialogs.c:108
 msgid "Jabber developer"
 msgstr "desarrollador de Jabber"
 
-#: ../gtk/gtkdialogs.c:108
+#: ../gtk/gtkdialogs.c:109
 msgid "original author"
 msgstr "autor original"
 
 # Amhario
-#: ../gtk/gtkdialogs.c:115
+#: ../gtk/gtkdialogs.c:116
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:183
+#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../gtk/gtkdialogs.c:120
+#: ../gtk/gtkdialogs.c:121
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:184 ../gtk/gtkdialogs.c:185
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalán"
 
-#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:186
+#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
 msgid "Czech"
 msgstr "Checo"
 
-#: ../gtk/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:126
 msgid "Danish"
 msgstr "Danés"
 
-#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
 msgid "German"
 msgstr "Alemán"
 
-#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
+msgid "Dzongkha"
+msgstr "Butaní"
+
+#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
 msgid "Greek"
 msgstr "Griego"
 
-#: ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:134
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../gtk/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:135
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: ../gtk/gtkdialogs.c:132
+#: ../gtk/gtkdialogs.c:136
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../gtk/gtkdialogs.c:133 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
-#: ../gtk/gtkdialogs.c:190 ../gtk/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:137
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
 msgid "Spanish"
 msgstr "Español"
 
-#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:135
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
 msgid "Euskera(Basque)"
 msgstr "Eusquera(Vasco)"
 
-#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
 msgid "Persian"
 msgstr "Persa"
 
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
-#: ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
 msgid "French"
 msgstr "Francés"
 
-#: ../gtk/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:146
 msgid "Galician"
 msgstr "Gallego"
 
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../gtk/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:150
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:151
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
-#: ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:209
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
 msgid "Kurdish"
 msgstr "Kurdo"
 
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:205 ../gtk/gtkdialogs.c:206
+#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../gtk/gtkdialogs.c:154
+#: ../gtk/gtkdialogs.c:160
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:161
 msgid "Nepali"
 msgstr "Nepalés"
 
-#: ../gtk/gtkdialogs.c:156
-msgid "Dutch, Flemish"
-msgstr "Danés, Flamenco"
-
-#: ../gtk/gtkdialogs.c:157
-msgid "Norwegian"
-msgstr "Noruego"
-
-#: ../gtk/gtkdialogs.c:158 ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:207
-msgid "Polish"
-msgstr "Polaco"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Portuguese-Brazil"
-msgstr "Portugués brasileño"
-
 #: ../gtk/gtkdialogs.c:162
+msgid "Dutch, Flemish"
+msgstr "Danés, Flamenco"
+
+#: ../gtk/gtkdialogs.c:163
+msgid "Norwegian"
+msgstr "Noruego"
+
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
+msgid "Polish"
+msgstr "Polaco"
+
+#: ../gtk/gtkdialogs.c:166
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: ../gtk/gtkdialogs.c:167
+msgid "Portuguese-Brazil"
+msgstr "Portugués brasileño"
+
+#: ../gtk/gtkdialogs.c:168
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../gtk/gtkdialogs.c:163 ../gtk/gtkdialogs.c:208 ../gtk/gtkdialogs.c:209
+#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:210
+#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../gtk/gtkdialogs.c:167
+#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:211
+#: ../gtk/gtkdialogs.c:174
+msgid "Albanian"
+msgstr "Albanés"
+
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../gtk/gtkdialogs.c:169
+#: ../gtk/gtkdialogs.c:176
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../gtk/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:177
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../gtk/gtkdialogs.c:171
+#: ../gtk/gtkdialogs.c:178
 msgid "Thai"
 msgstr "Thai"
 
-#: ../gtk/gtkdialogs.c:172
+#: ../gtk/gtkdialogs.c:179
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../gtk/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:180
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../gtk/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:180
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../gtk/gtkdialogs.c:174 ../gtk/gtkdialogs.c:212
+#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:213
+#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../gtk/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:189
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../gtk/gtkdialogs.c:294
+#: ../gtk/gtkdialogs.c:301
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: ../gtk/gtkdialogs.c:328
+#: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
-"and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
-"Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr "Gaim es un cliente de mensajería modular capaz de utilizar AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu y QQ todos al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo los términos de la GPL (versión 2 o posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» que se distribuye con Gaim. Las personas que han contribuido a Gaim tienen los derechos de copia. Consulte el archivo «COPYRIGHT» si desea consultar la lista completa de personas que han contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:342
+"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
+"<BR><BR>You may modify and redistribute the program under the terms of the "
+"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
+"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
+"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr "Gaim es un cliente de mensajería modular capaz de utilizar AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu y QQ todos al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo los términos de la GPL (versión 2 o posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» que se distribuye con Gaim. Las personas que han contribuido a Gaim tienen los derechos de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista completa de personas que han contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:350
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> canal #wingaim en irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:345
+#: ../gtk/gtkdialogs.c:353
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #gaim en irc.freenode.net<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:351
+#: ../gtk/gtkdialogs.c:359
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../gtk/gtkdialogs.c:366
+#: ../gtk/gtkdialogs.c:374
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../gtk/gtkdialogs.c:381
+#: ../gtk/gtkdialogs.c:389
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../gtk/gtkdialogs.c:396
+#: ../gtk/gtkdialogs.c:404
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../gtk/gtkdialogs.c:416
+#: ../gtk/gtkdialogs.c:424
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../gtk/gtkdialogs.c:434
+#: ../gtk/gtkdialogs.c:442
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../gtk/gtkdialogs.c:648 ../gtk/gtkdialogs.c:785 ../gtk/gtkdialogs.c:865
-msgid "_Name"
-msgstr "_Nombre"
-
-#: ../gtk/gtkdialogs.c:653 ../gtk/gtkdialogs.c:790 ../gtk/gtkdialogs.c:870
-msgid "_Account"
-msgstr "_Cuenta"
-
-#: ../gtk/gtkdialogs.c:661
-msgid "New Instant Message"
-msgstr "Mensaje instantáneo nuevo"
-
-#: ../gtk/gtkdialogs.c:663
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Introduzca el nombre de usuario o apodo de la persona con la que quiere "
-"comunicarse."
-
-#: ../gtk/gtkdialogs.c:798
+#: ../gtk/gtkdialogs.c:816
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../gtk/gtkdialogs.c:800
+#: ../gtk/gtkdialogs.c:818
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -2508,11 +2642,11 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información."
 
-#: ../gtk/gtkdialogs.c:889
+#: ../gtk/gtkdialogs.c:907
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../gtk/gtkdialogs.c:891
+#: ../gtk/gtkdialogs.c:909
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -2520,32 +2654,32 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información de registro."
 
-#: ../gtk/gtkdialogs.c:910
+#: ../gtk/gtkdialogs.c:928
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../gtk/gtkdialogs.c:911
+#: ../gtk/gtkdialogs.c:929
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:949
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../gtk/gtkdialogs.c:933
+#: ../gtk/gtkdialogs.c:951
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../gtk/gtkdialogs.c:952
+#: ../gtk/gtkdialogs.c:970
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../gtk/gtkdialogs.c:953
+#: ../gtk/gtkdialogs.c:971
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../gtk/gtkdialogs.c:990
+#: ../gtk/gtkdialogs.c:1008
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -2560,30 +2694,32 @@
 "Está a punto de borrar los contactos que contiene a %s y a otros %d amigos "
 "de su lista de amigos. ¿Desea continuar?"
 
-#: ../gtk/gtkdialogs.c:998
+#: ../gtk/gtkdialogs.c:1016
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../gtk/gtkdialogs.c:999
+#: ../gtk/gtkdialogs.c:1017
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../gtk/gtkdialogs.c:1029
+#: ../gtk/gtkdialogs.c:1047
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "Está a punto de fusionar el grupo llamado %s con el grupo llamado %s. ¿Desea continuar?"
-
-#: ../gtk/gtkdialogs.c:1036
+msgstr ""
+"Está a punto de fusionar el grupo llamado %s con el grupo llamado %s. ¿Desea "
+"continuar?"
+
+#: ../gtk/gtkdialogs.c:1054
 msgid "Merge Groups"
 msgstr "Fusionar grupos"
 
-#: ../gtk/gtkdialogs.c:1037
+#: ../gtk/gtkdialogs.c:1055
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"
 
-#: ../gtk/gtkdialogs.c:1087
+#: ../gtk/gtkdialogs.c:1105
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -2592,29 +2728,29 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"
 
-#: ../gtk/gtkdialogs.c:1090
+#: ../gtk/gtkdialogs.c:1108
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../gtk/gtkdialogs.c:1091
+#: ../gtk/gtkdialogs.c:1109
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../gtk/gtkdialogs.c:1124
+#: ../gtk/gtkdialogs.c:1142
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../gtk/gtkdialogs.c:1127
+#: ../gtk/gtkdialogs.c:1145
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../gtk/gtkdialogs.c:1128
+#: ../gtk/gtkdialogs.c:1146
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../gtk/gtkdialogs.c:1149
+#: ../gtk/gtkdialogs.c:1167
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -2622,14 +2758,77 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../gtk/gtkdialogs.c:1152
+#: ../gtk/gtkdialogs.c:1170
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../gtk/gtkdialogs.c:1153
+#: ../gtk/gtkdialogs.c:1171
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
+#: ../gtk/gtkdocklet.c:149
+msgid "Right-click for more unread messages...\n"
+msgstr "Pulse el botón derecho para ver más mensajes sin leer...\n"
+
+#: ../gtk/gtkdocklet.c:456
+msgid "Change Status"
+msgstr "Cambiar estado:"
+
+#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2851
+#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
+msgid "Available"
+msgstr "Disponible"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
+#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
+#: ../libgaim/protocols/irc/msgs.c:226
+#: ../libgaim/protocols/jabber/buddy.c:1407
+#: ../libgaim/protocols/novell/novell.c:2854
+#: ../libgaim/protocols/oscar/oscar.c:712
+#: ../libgaim/protocols/oscar/oscar.c:4498
+#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3353
+#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
+msgid "Away"
+msgstr "Ausente"
+
+#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
+#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
+#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../gtk/gtkdocklet.c:508
+msgid "Show Buddy List"
+msgstr "Mostrar la lista de amigos"
+
+#: ../gtk/gtkdocklet.c:534
+msgid "New Message..."
+msgstr "Mensaje nuevo..."
+
+#: ../gtk/gtkdocklet.c:549
+msgid "Mute Sounds"
+msgstr "Sin sonido"
+
+#: ../gtk/gtkdocklet.c:556
+msgid "Blink on new message"
+msgstr "Parpadear con nuevo mensaje"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../gtk/gtkdocklet.c:567
+msgid "Quit"
+msgstr "Salir"
+
 #: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
@@ -2639,23 +2838,23 @@
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1661
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:1361
-#: ../libgaim/protocols/jabber/buddy.c:1378
-#: ../libgaim/protocols/novell/novell.c:2868
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:1397
+#: ../libgaim/protocols/jabber/buddy.c:1414
+#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1114
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1054
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:970
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
@@ -2762,47 +2961,47 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../gtk/gtkft.c:1056
+#: ../gtk/gtkft.c:1058
 msgid "Failed"
 msgstr "Falló"
 
-#: ../gtk/gtkimhtml.c:814
+#: ../gtk/gtkimhtml.c:793
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../gtk/gtkimhtml.c:826
+#: ../gtk/gtkimhtml.c:810
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"
 
-#: ../gtk/gtkimhtml.c:1318
+#: ../gtk/gtkimhtml.c:1295
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../gtk/gtkimhtml.c:1319
+#: ../gtk/gtkimhtml.c:1296
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../gtk/gtkimhtml.c:1322
+#: ../gtk/gtkimhtml.c:1299
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../gtk/gtkimhtml.c:1323
+#: ../gtk/gtkimhtml.c:1300
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratón esté encima."
 
-#: ../gtk/gtkimhtml.c:1544
+#: ../gtk/gtkimhtml.c:1516
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar dirección de correo electrónico"
 
-#: ../gtk/gtkimhtml.c:1556
+#: ../gtk/gtkimhtml.c:1528
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../gtk/gtkimhtml.c:1566
+#: ../gtk/gtkimhtml.c:1538
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../gtk/gtkimhtml.c:3291
+#: ../gtk/gtkimhtml.c:3271
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -2812,7 +3011,7 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: ../gtk/gtkimhtml.c:3294
+#: ../gtk/gtkimhtml.c:3274
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -2822,7 +3021,7 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: ../gtk/gtkimhtml.c:3307
+#: ../gtk/gtkimhtml.c:3287
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -2834,7 +3033,7 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3310
+#: ../gtk/gtkimhtml.c:3290
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -2845,11 +3044,11 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3390 ../gtk/gtkimhtml.c:3402
+#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../gtk/gtkimhtml.c:3430
+#: ../gtk/gtkimhtml.c:3410
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
@@ -2911,15 +3110,15 @@
 msgid "Smile!"
 msgstr "¡Sonría!"
 
-#: ../gtk/gtkimhtmltoolbar.c:922
+#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../gtk/gtkimhtmltoolbar.c:933
+#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../gtk/gtkimhtmltoolbar.c:944
+#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
 msgid "Underline"
 msgstr "Subrayado"
 
@@ -2960,21 +3159,21 @@
 msgid "Insert smiley"
 msgstr "Insertar emoticono"
 
-#: ../gtk/gtklog.c:238
+#: ../gtk/gtklog.c:234
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span weight='bold' size='larger'>Conversación en %s de %s</span>"
 
-#: ../gtk/gtklog.c:243
+#: ../gtk/gtklog.c:237
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight='bold' size='larger'>Conversación con %s de %s</span>"
 
-#: ../gtk/gtklog.c:292
+#: ../gtk/gtklog.c:284
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../gtk/gtklog.c:339
+#: ../gtk/gtklog.c:331
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -2982,7 +3181,7 @@
 "Sólo se registrarán los eventos del sistema cuando esté habilitada la opción "
 "«Registrar todos los cambios de estado en el registro del sistema»."
 
-#: ../gtk/gtklog.c:343
+#: ../gtk/gtklog.c:335
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -2990,41 +3189,46 @@
 "Sólo se registrarán los mensajes instantáneos si está habilitada la "
 "preferencia «Registrar todos los mensajes instantáneos»."
 
-#: ../gtk/gtklog.c:346
+#: ../gtk/gtklog.c:338
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Los chats sólo serán registrados si la opción \"Registrar todos los chats\" "
 "está habilitada en las preferencias."
 
-#: ../gtk/gtklog.c:350
+#: ../gtk/gtklog.c:342
 msgid "No logs were found"
 msgstr "No se encontraron registros"
 
-#: ../gtk/gtklog.c:429
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../gtk/gtklog.c:357
+msgid "_Browse logs folder"
+msgstr "_Acceder a la carpeta de registros"
+
+#: ../gtk/gtklog.c:425
 msgid "Total log size:"
 msgstr "Tamaño total del registro:"
 
-#: ../gtk/gtklog.c:495
+#: ../gtk/gtklog.c:494
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversaciones en %s"
 
-#: ../gtk/gtklog.c:503 ../gtk/gtklog.c:554
+#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaciones con %s"
 
-#: ../gtk/gtklog.c:579
+#: ../gtk/gtklog.c:578
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: ../gtk/gtkmain.c:342
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Intente `%s -h' para más información.\n"
 
-#: ../gtk/gtkmain.c:344
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3052,7 +3256,7 @@
 "                       indica la(s) cuenta(s) a usar, separadas por comas)\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#: ../gtk/gtkmain.c:526
+#: ../gtk/gtkmain.c:528
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -3091,71 +3295,71 @@
 "contactar con Sean o Luke a través de otros protocolos en\n"
 "%scontactinfo.php\n"
 
-#: ../gtk/gtknotify.c:348
+#: ../gtk/gtknotify.c:328
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
-#: ../gtk/gtknotify.c:432
+#: ../gtk/gtknotify.c:380
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
 
-#: ../gtk/gtknotify.c:498
+#: ../gtk/gtknotify.c:474
+msgid "Sender"
+msgstr "Remitente"
+
+#: ../gtk/gtknotify.c:500
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tiene %d mensaje nuevo."
 msgstr[1] "%s tiene %d nuevos mensajes."
 
-#: ../gtk/gtknotify.c:503
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5459
+#: ../gtk/gtknotify.c:511
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
-#: ../gtk/gtknotify.c:890
+#: ../gtk/gtknotify.c:899
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador «%s» no es válida."
 
-#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
-#: ../gtk/gtknotify.c:1045
+#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
+#: ../gtk/gtknotify.c:1054
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
+#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar «%s»: %s"
 
-#: ../gtk/gtknotify.c:1046
+#: ../gtk/gtknotify.c:1055
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Se ha definido un navegador «Manual», pero no se ha definido ningún comando "
 "para ejecutarlo."
 
-#: ../gtk/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
 
-#: ../gtk/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
 msgstr "Se desactivarán múltiples complementos."
 
-#: ../gtk/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:285
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../gtk/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:397
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -3166,7 +3370,7 @@
 "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"
 
-#: ../gtk/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s\n"
@@ -3177,11 +3381,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\\n\n"
 "Compruebe el sitio web del complemento para obtener una actualización.</span>"
 
-#: ../gtk/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:533
 msgid "Configure Pl_ugin"
 msgstr "Configurar complemento"
 
-#: ../gtk/gtkplugin.c:603
+#: ../gtk/gtkplugin.c:596
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"
 
@@ -3189,200 +3393,195 @@
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
-#: ../gtk/gtkpounce.c:252
+#: ../gtk/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#: ../gtk/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:505
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
-#: ../gtk/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:505
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:516
+#: ../gtk/gtkpounce.c:522
 msgid "Pounce on Whom"
 msgstr "A quién avisar"
 
-#: ../gtk/gtkpounce.c:543
+#: ../gtk/gtkpounce.c:549
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:569
+#: ../gtk/gtkpounce.c:575
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."
 
-#: ../gtk/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:583
 msgid "Si_gns on"
 msgstr "Se _conecta"
 
-#: ../gtk/gtkpounce.c:579
-msgid "Signs o_ff"
-msgstr "Se _desconecta"
-
-#: ../gtk/gtkpounce.c:581
-msgid "Goes a_way"
-msgstr "Se _ausenta"
-
-#: ../gtk/gtkpounce.c:583
-msgid "Ret_urns from away"
-msgstr "_Deja de estar ausente"
-
 #: ../gtk/gtkpounce.c:585
-msgid "Becomes _idle"
-msgstr "Está _inactivo"
+msgid "Signs o_ff"
+msgstr "Se _desconecta"
 
 #: ../gtk/gtkpounce.c:587
+msgid "Goes a_way"
+msgstr "Se _ausenta"
+
+#: ../gtk/gtkpounce.c:589
+msgid "Ret_urns from away"
+msgstr "_Deja de estar ausente"
+
+#: ../gtk/gtkpounce.c:591
+msgid "Becomes _idle"
+msgstr "Está _inactivo"
+
+#: ../gtk/gtkpounce.c:593
 msgid "Is no longer i_dle"
 msgstr "Ya no está i_nactivo."
 
-#: ../gtk/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:595
 msgid "Starts _typing"
 msgstr "Empieza a _escribir"
 
-#: ../gtk/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:597
 msgid "P_auses while typing"
 msgstr "Se _pausa mientras escribe"
 
-#: ../gtk/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:599
 msgid "Stops t_yping"
 msgstr "Deja de escribi_r"
 
-#: ../gtk/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:601
 msgid "Sends a _message"
 msgstr "Envía un _mensaje"
 
 #. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:630
+#: ../gtk/gtkpounce.c:636
 msgid "Action"
 msgstr "Acción"
 
-#: ../gtk/gtkpounce.c:638
+#: ../gtk/gtkpounce.c:644
 msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: ../gtk/gtkpounce.c:640
+#: ../gtk/gtkpounce.c:646
 msgid "_Pop up a notification"
 msgstr "_Notificación con una ventana emergente"
 
-#: ../gtk/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:648
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: ../gtk/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:650
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: ../gtk/gtkpounce.c:646
+#: ../gtk/gtkpounce.c:652
 msgid "P_lay a sound"
 msgstr "Re_producir un sonido"
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../gtk/gtkpounce.c:651
+#: ../gtk/gtkpounce.c:657
 msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../gtk/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:659
 msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: ../gtk/gtkpounce.c:654
+#: ../gtk/gtkpounce.c:660
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#. Create the "Options" frame.
-#: ../gtk/gtkpounce.c:766
-msgid "Options"
-msgstr "Opciones"
-
-#: ../gtk/gtkpounce.c:774
+#: ../gtk/gtkpounce.c:784
 msgid "P_ounce only when my status is not available"
 msgstr "Sólo _avisar cuando mi estado no está disponible"
 
-#: ../gtk/gtkpounce.c:779
+#: ../gtk/gtkpounce.c:789
 msgid "_Recurring"
 msgstr "_Recurrente"
 
-#: ../gtk/gtkpounce.c:1085
+#: ../gtk/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "¿Está seguro que desea borrar el aviso en %s para %s?"
 
-#: ../gtk/gtkpounce.c:1233
+#: ../gtk/gtkpounce.c:1243
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
-#: ../gtk/gtkpounce.c:1268
+#: ../gtk/gtkpounce.c:1278
 msgid "Recurring"
 msgstr "Recurrente"
 
-#: ../gtk/gtkpounce.c:1315
+#: ../gtk/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"
 
-#: ../gtk/gtkpounce.c:1442
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: ../gtk/gtkpounce.c:1444
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ha parado mientras le escribía algo (%s)"
 
-#: ../gtk/gtkpounce.c:1446
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: ../gtk/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvió de su inactividad (%s)"
 
-#: ../gtk/gtkpounce.c:1450
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: ../gtk/gtkpounce.c:1452
+#: ../gtk/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: ../gtk/gtkpounce.c:1454
+#: ../gtk/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: ../gtk/gtkpounce.c:1456
+#: ../gtk/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../gtk/gtkpounce.c:1458
+#: ../gtk/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: ../gtk/gtkpounce.c:1460
+#: ../gtk/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s le ha enviado un mensaje. (%s)"
 
-#: ../gtk/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
-#: ../gtk/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:509
 msgid "Smiley theme failed to unpack."
 msgstr "Falló el desempaque de tema de emoticonos"
 
-#: ../gtk/gtkprefs.c:641
+#: ../gtk/gtkprefs.c:638
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3390,66 +3589,124 @@
 "Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
 "instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."
 
-#: ../gtk/gtkprefs.c:676
+#: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "Icono"
 
-#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:923
-#: ../libgaim/protocols/jabber/chat.c:769
-msgid "Description"
-msgstr "Descripción"
-
-#: ../gtk/gtkprefs.c:824
-msgid "_Hide new IM conversations"
-msgstr "Ocultar nuevas conversaciones de mensajes instantáneos"
-
-#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1769 ../gtk/gtkprefs.c:1783
-#: ../gtk/plugins/docklet/docklet.c:684 ../gtk/plugins/docklet/docklet.c:692
-#: ../gtk/plugins/win32/winprefs/winprefs.c:458
-msgid "Never"
-msgstr "Nunca"
-
-#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1784
-msgid "When away"
-msgstr "Cuando está ausente"
-
-#: ../gtk/gtkprefs.c:828 ../gtk/plugins/docklet/docklet.c:686
-#: ../gtk/plugins/docklet/docklet.c:694 ../gtk/plugins/timestamp_format.c:39
-#: ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:459
+#: ../gtk/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Icono del área de notificación del sistema"
+
+#: ../gtk/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Mostrar icono del área de notificación del sistema:"
+
+#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
+#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
 msgid "Always"
 msgstr "Siempre"
 
-#: ../gtk/gtkprefs.c:831
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Enviar órdenes «_slash» desconocidas como mensajes"
-
-#: ../gtk/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
+#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../libgaim/plugins/autoreply.c:360
+msgid "Never"
+msgstr "Nunca"
+
+#: ../gtk/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "Si hay mensajes sin leer"
+
+#: ../gtk/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Ocultar ventana de conversación"
+
+#: ../gtk/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Ocultar nuevas conversaciones MI:"
+
+#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
+msgid "When away"
+msgstr "Cuando estoy fuera"
+
+#. All the tab options!
+#: ../gtk/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Solapas"
+
+#: ../gtk/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Mostrar MIs y chats en ventanas con solapas."
+
+#: ../gtk/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Mostrar botones de _cierre en las solapas"
+
+#: ../gtk/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Colocación:"
+
+#: ../gtk/gtkprefs.c:859
+msgid "Top"
+msgstr "Arriba"
+
+#: ../gtk/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Abajo"
+
+#: ../gtk/gtkprefs.c:861
+msgid "Left"
+msgstr "Izquierda"
+
+#: ../gtk/gtkprefs.c:862
+msgid "Right"
+msgstr "Derecha"
+
+#: ../gtk/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Vertical a la izquierda"
+
+#: ../gtk/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Vertical a la derecha"
+
+#: ../gtk/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "_Nuevas conversaciones:"
+
+#: ../gtk/gtkprefs.c:900
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
-#: ../gtk/gtkprefs.c:836
+#: ../gtk/gtkprefs.c:903
 msgid "Show buddy _icons"
 msgstr "Mostrar _iconos de los amigos"
 
-#: ../gtk/gtkprefs.c:838
+#: ../gtk/gtkprefs.c:905
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: ../gtk/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:912
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les esté escribiendo"
 
-#: ../gtk/gtkprefs.c:848
+#: ../gtk/gtkprefs.c:915
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografía"
 
-#: ../gtk/gtkprefs.c:852
+#: ../gtk/gtkprefs.c:919
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"
 
-#: ../gtk/gtkprefs.c:868
+#: ../gtk/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "_Destello de ventana cuando se reciben MIs"
+
+#: ../gtk/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Formato por omisión"
+
+#: ../gtk/gtkprefs.c:941
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3457,169 +3714,125 @@
 "Así se verá el texto de sus mensajes salientes cuando utilice protocolos que "
 "soportan formatos. :)"
 
-#. All the tab options!
-#: ../gtk/gtkprefs.c:890
-msgid "Tab Options"
-msgstr "Opciones de las solapas"
-
-#: ../gtk/gtkprefs.c:892
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Mostrar MIs y chats en ventanas con solapas."
-
-#: ../gtk/gtkprefs.c:906
-msgid "Show close b_utton on tabs"
-msgstr "Mostrar botones de _cierre en las solapas"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Placement:"
-msgstr "_Colocación:"
-
-#: ../gtk/gtkprefs.c:914
-msgid "Top"
-msgstr "Arriba"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Bottom"
-msgstr "Abajo"
-
-#: ../gtk/gtkprefs.c:916
-msgid "Left"
-msgstr "Izquierda"
-
-#: ../gtk/gtkprefs.c:917
-msgid "Right"
-msgstr "Derecha"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Left Vertical"
-msgstr "Vertical a la izquierda"
-
-#: ../gtk/gtkprefs.c:920
-msgid "Right Vertical"
-msgstr "Vertical a la derecha"
-
-#: ../gtk/gtkprefs.c:925
-msgid "N_ew conversations:"
-msgstr "_Nuevas conversaciones:"
-
-#: ../gtk/gtkprefs.c:976 ../libgaim/protocols/oscar/oscar.c:779
-#: ../libgaim/protocols/oscar/oscar.c:3627
+#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: ../gtk/gtkprefs.c:978
+#: ../gtk/gtkprefs.c:1017
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../gtk/gtkprefs.c:990
+#: ../gtk/gtkprefs.c:1029
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#: ../gtk/gtkprefs.c:994
+#: ../gtk/gtkprefs.c:1033
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la dirección IP"
 
-#: ../gtk/gtkprefs.c:1003
+#: ../gtk/gtkprefs.c:1042
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../gtk/gtkprefs.c:1032
+#: ../gtk/gtkprefs.c:1071
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../gtk/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1074
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
 
-#: ../gtk/gtkprefs.c:1038
+#: ../gtk/gtkprefs.c:1077
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: ../gtk/gtkprefs.c:1045
+#: ../gtk/gtkprefs.c:1084
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../gtk/gtkprefs.c:1053
+#: ../gtk/gtkprefs.c:1092
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../gtk/gtkprefs.c:1057
+#: ../gtk/gtkprefs.c:1096
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../gtk/gtkprefs.c:1113
+#: ../gtk/gtkprefs.c:1152
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../gtk/gtkprefs.c:1176
+#: ../gtk/gtkprefs.c:1216
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../gtk/gtkprefs.c:1177
+#: ../gtk/gtkprefs.c:1217
 msgid "Opera"
 msgstr "Opera"
 
-#: ../gtk/gtkprefs.c:1178
+#: ../gtk/gtkprefs.c:1218
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../gtk/gtkprefs.c:1179
+#: ../gtk/gtkprefs.c:1219
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../gtk/gtkprefs.c:1180
+#: ../gtk/gtkprefs.c:1220
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../gtk/gtkprefs.c:1181
+#: ../gtk/gtkprefs.c:1221
 msgid "GNOME Default"
 msgstr "Valores por omisión de Gnome"
 
-#: ../gtk/gtkprefs.c:1182
+#: ../gtk/gtkprefs.c:1222
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../gtk/gtkprefs.c:1183
+#: ../gtk/gtkprefs.c:1223
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../gtk/gtkprefs.c:1184
+#: ../gtk/gtkprefs.c:1224
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../gtk/gtkprefs.c:1185
+#: ../gtk/gtkprefs.c:1225
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../gtk/gtkprefs.c:1194
+#: ../gtk/gtkprefs.c:1234
 msgid "Manual"
 msgstr "Manual"
 
-#: ../gtk/gtkprefs.c:1247
+#: ../gtk/gtkprefs.c:1287
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../gtk/gtkprefs.c:1251
+#: ../gtk/gtkprefs.c:1291
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../gtk/gtkprefs.c:1259
+#: ../gtk/gtkprefs.c:1299
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../gtk/gtkprefs.c:1261
+#: ../gtk/gtkprefs.c:1301
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: ../gtk/gtkprefs.c:1262
+#: ../gtk/gtkprefs.c:1302
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../gtk/gtkprefs.c:1264
+#: ../gtk/gtkprefs.c:1304
 msgid "New tab"
 msgstr "Nueva solapa"
 
-#: ../gtk/gtkprefs.c:1278
+#: ../gtk/gtkprefs.c:1318
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3628,79 +3841,79 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../gtk/gtkprefs.c:1317
+#: ../gtk/gtkprefs.c:1358
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../gtk/gtkprefs.c:1322
+#: ../gtk/gtkprefs.c:1363
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantáneos"
 
-#: ../gtk/gtkprefs.c:1324
+#: ../gtk/gtkprefs.c:1365
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../gtk/gtkprefs.c:1326
+#: ../gtk/gtkprefs.c:1367
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../gtk/gtkprefs.c:1474
+#: ../gtk/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
-#: ../gtk/gtkprefs.c:1482
+#: ../gtk/gtkprefs.c:1521
 msgid "Quietest"
 msgstr "El más silencioso"
 
-#: ../gtk/gtkprefs.c:1484
+#: ../gtk/gtkprefs.c:1523
 msgid "Quieter"
 msgstr "Más silencioso"
 
-#: ../gtk/gtkprefs.c:1486
+#: ../gtk/gtkprefs.c:1525
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../gtk/gtkprefs.c:1488 ../libgaim/protocols/silc/silc.c:670
+#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "Normal"
 
-#: ../gtk/gtkprefs.c:1490
+#: ../gtk/gtkprefs.c:1529
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../gtk/gtkprefs.c:1492
+#: ../gtk/gtkprefs.c:1531
 msgid "Louder"
 msgstr "Más ruidoso"
 
-#: ../gtk/gtkprefs.c:1494
+#: ../gtk/gtkprefs.c:1533
 msgid "Loudest"
 msgstr "El más ruidoso"
 
-#: ../gtk/gtkprefs.c:1557
+#: ../gtk/gtkprefs.c:1596
 msgid "Sound Method"
 msgstr "Método para reproducir sonidos"
 
-#: ../gtk/gtkprefs.c:1558
+#: ../gtk/gtkprefs.c:1597
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../gtk/gtkprefs.c:1560
+#: ../gtk/gtkprefs.c:1599
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../gtk/gtkprefs.c:1562
+#: ../gtk/gtkprefs.c:1601
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../gtk/gtkprefs.c:1567
+#: ../gtk/gtkprefs.c:1604
 msgid "Command"
 msgstr "Comando"
 
-#: ../gtk/gtkprefs.c:1568
+#: ../gtk/gtkprefs.c:1605
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../gtk/gtkprefs.c:1576
+#: ../gtk/gtkprefs.c:1613
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3709,132 +3922,127 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../gtk/gtkprefs.c:1602
+#: ../gtk/gtkprefs.c:1639
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: ../gtk/gtkprefs.c:1603
-msgid "Sounds when conversation has _focus"
-msgstr "Suena cuando la conversación obtiene el _foco"
-
-#: ../gtk/gtkprefs.c:1605
-msgid "_Sounds while away"
-msgstr "_Sonidos mientras vd. está ausente"
-
-#: ../gtk/gtkprefs.c:1612
-msgid "Volume:"
-msgstr "Volumen:"
-
 #: ../gtk/gtkprefs.c:1640
+msgid "Sounds when conversation has _focus"
+msgstr "Suena cuando la conversación obtiene el _foco"
+
+#: ../gtk/gtkprefs.c:1642
+msgid "Enable sounds:"
+msgstr "Habilitar sonidos:"
+
+#: ../gtk/gtkprefs.c:1644
+msgid "Only when available"
+msgstr "Sólo cuando estoy disponible"
+
+#: ../gtk/gtkprefs.c:1645
+msgid "Only when not available"
+msgstr "Sólo cuando no estoy disponible"
+
+#: ../gtk/gtkprefs.c:1653
+msgid "Volume:"
+msgstr "Volumen:"
+
+#: ../gtk/gtkprefs.c:1681
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: ../gtk/gtkprefs.c:1691
+#: ../gtk/gtkprefs.c:1732
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../gtk/gtkprefs.c:1698
+#: ../gtk/gtkprefs.c:1739
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: ../gtk/gtkprefs.c:1717
+#: ../gtk/gtkprefs.c:1758
 msgid "Test"
 msgstr "Probar"
 
-#: ../gtk/gtkprefs.c:1721
+#: ../gtk/gtkprefs.c:1762
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../gtk/gtkprefs.c:1725
+#: ../gtk/gtkprefs.c:1766
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: ../gtk/gtkprefs.c:1767
+#: ../gtk/gtkprefs.c:1809
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../gtk/gtkprefs.c:1770
+#: ../gtk/gtkprefs.c:1812
 msgid "From last sent message"
 msgstr "Del último mensaje enviado"
 
-#: ../gtk/gtkprefs.c:1772
+#: ../gtk/gtkprefs.c:1814
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratón"
 
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkprefs.c:1779 ../gtk/gtkstatusbox.c:939
-#: ../gtk/plugins/docklet/docklet.c:439 ../libgaim/protocols/gg/gg.c:999
-#: ../libgaim/protocols/irc/irc.c:530 ../libgaim/protocols/irc/msgs.c:223
-#: ../libgaim/protocols/jabber/buddy.c:1371
-#: ../libgaim/protocols/novell/novell.c:2856
-#: ../libgaim/protocols/oscar/oscar.c:694
-#: ../libgaim/protocols/oscar/oscar.c:4406
-#: ../libgaim/protocols/oscar/oscar.c:5473
-#: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3359
-#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
-msgid "Away"
-msgstr "Ausente"
-
-#: ../gtk/gtkprefs.c:1781
+#: ../gtk/gtkprefs.c:1823
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
 
-#: ../gtk/gtkprefs.c:1785
+#: ../gtk/gtkprefs.c:1827
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
 #. Auto-away stuff
-#: ../gtk/gtkprefs.c:1791
+#: ../gtk/gtkprefs.c:1833
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../gtk/gtkprefs.c:1793
+#: ../gtk/gtkprefs.c:1835
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando esté _inactivo"
 
-#: ../gtk/gtkprefs.c:1797
+#: ../gtk/gtkprefs.c:1839
 msgid "_Minutes before changing status:"
 msgstr "_Minutos antes de cambiar el estado:"
 
-#: ../gtk/gtkprefs.c:1805
+#: ../gtk/gtkprefs.c:1847
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../gtk/gtkprefs.c:1826
+#: ../gtk/gtkprefs.c:1868
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../gtk/gtkprefs.c:1828
+#: ../gtk/gtkprefs.c:1870
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi última _salida al empezar"
 
-#: ../gtk/gtkprefs.c:1834
+#: ../gtk/gtkprefs.c:1876
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../gtk/gtkprefs.c:1885
+#: ../gtk/gtkprefs.c:1914
+msgid "Interface"
+msgstr "Interfaz"
+
+#: ../gtk/gtkprefs.c:1916
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../gtk/gtkprefs.c:1886
+#: ../gtk/gtkprefs.c:1917
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../gtk/gtkprefs.c:1887 ../libgaim/protocols/silc/silc.c:1851
+#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "Red"
 
-#: ../gtk/gtkprefs.c:1892
+#: ../gtk/gtkprefs.c:1923
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../gtk/gtkprefs.c:1896
-msgid "Away / Idle"
-msgstr "Ausencia / Inactividad"
+#: ../gtk/gtkprefs.c:1927
+msgid "Status / Idle"
+msgstr "Estado / Inactivo"
 
 #: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
@@ -3909,10 +4117,6 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."
 
-#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Bloquear"
-
 #: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
@@ -3923,22 +4127,21 @@
 msgid "Are you sure you want to block %s?"
 msgstr "¿Está seguro de que quiere bloquear a %s?"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
-#.
-#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1920
+#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
+#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1918
 #: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Sí"
 
-#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1921
+#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
+#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1919
 #: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/wb.c:304
 msgid "No"
 msgstr "No"
 
@@ -3946,84 +4149,88 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../gtk/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1469
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: ../gtk/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1470
 msgid "Would you like to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"
 
-#: ../gtk/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1471
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../gtk/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1472
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"
 
-#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."
 
-#: ../gtk/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../gtk/gtkroomlist.c:355
+#: ../gtk/gtkroomlist.c:376
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../gtk/gtkroomlist.c:425
+#: ../gtk/gtkroomlist.c:446
 msgid "_Get List"
 msgstr "Obtener la lista"
 
 #. add button
-#: ../gtk/gtkroomlist.c:433
+#: ../gtk/gtkroomlist.c:454
 msgid "_Add Chat"
 msgstr "_Añadir chat"
 
+#: ../gtk/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "¿Está seguro que desea borrar los estados guardados y seleccionados?"
+
 #. Use button
-#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
+#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../gtk/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:725
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ya se está utilizando ese título. Debe elegir un título único."
 
-#: ../gtk/gtksavedstatuses.c:883
+#: ../gtk/gtksavedstatuses.c:913
 msgid "Different"
 msgstr "Diferente"
 
-#: ../gtk/gtksavedstatuses.c:1076
+#: ../gtk/gtksavedstatuses.c:1106
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
+#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1127
+#: ../gtk/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"
 
 #. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1191
+#: ../gtk/gtksavedstatuses.c:1221
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: ../gtk/gtksavedstatuses.c:1397
+#: ../gtk/gtksavedstatuses.c:1427
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"
@@ -4077,39 +4284,28 @@
 msgstr "No se pudo inicializar gstreamer."
 
 #. connect to the server
-#: ../gtk/gtkstatusbox.c:550 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1021
 #: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2185
-#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
-#: ../libgaim/protocols/sametime/sametime.c:3681
-#: ../libgaim/protocols/simple/simple.c:1673
-#: ../libgaim/protocols/yahoo/yahoo.c:2715
-#: ../libgaim/protocols/zephyr/zephyr.c:1617
+#: ../libgaim/protocols/novell/novell.c:2183
+#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
+#: ../libgaim/protocols/sametime/sametime.c:3742
+#: ../libgaim/protocols/simple/simple.c:1669
+#: ../libgaim/protocols/yahoo/yahoo.c:2710
+#: ../libgaim/protocols/zephyr/zephyr.c:1621
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../gtk/gtkstatusbox.c:938 ../gtk/plugins/docklet/docklet.c:435
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2853
-#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
-msgid "Available"
-msgstr "Disponible"
-
-#: ../gtk/gtkstatusbox.c:940 ../gtk/plugins/docklet/docklet.c:443
-#: ../libgaim/protocols/oscar/oscar.c:698
-#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../gtk/gtkutils.c:1308 ../gtk/gtkutils.c:1333
+#: ../gtk/gtkstatusbox.c:571
+msgid "Waiting for network connection"
+msgstr "Esperando la conexión a la red"
+
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Se ha producido el siguiente error al cargar %s: %s"
 
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
+#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
@@ -4187,7 +4383,7 @@
 "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
 "a lo que apunta el lanzador más que el lanzador en sí."
 
-#: ../gtk/gtkutils.c:2340
+#: ../gtk/gtkutils.c:2343
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4199,22 +4395,37 @@
 "<b>Tamaño de imagen:</b> %dx%d"
 
 #. Label
-#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
 #: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:600
+#: ../libgaim/protocols/oscar/oscar.c:618
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
-#: ../gtk/gtkutils.c:2726
+#: ../gtk/gtkutils.c:2653
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "El fichero «%s» es demasiado grande para %s. Intente utilizar una imagen más pequeña.\n"
+
+#: ../gtk/gtkutils.c:2655
+msgid "Icon Error"
+msgstr "Error en icono"
+
+#: ../gtk/gtkutils.c:2656
+msgid "Could not set icon"
+msgstr "No se pudo fijar el icono"
+
+#: ../gtk/gtkutils.c:2757
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo «%s»: %s"
 
-#: ../gtk/gtkutils.c:2775
+#: ../gtk/gtkutils.c:2806
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Se produjo un fallo al cargar la imagen «%s»: razón desconocida, posiblemente se trata de un archivo de imagen dañado"
+msgstr ""
+"Se produjo un fallo al cargar la imagen «%s»: razón desconocida, "
+"posiblemente se trata de un archivo de imagen dañado"
 
 #: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
@@ -4224,35 +4435,35 @@
 msgid "Select color"
 msgstr "Seleccionar el color"
 
-#: ../gtk/plugins/cap/cap.c:428
+#: ../gtk/plugins/cap/cap.c:446
 msgid "Display Statistics"
 msgstr "Mostrar estadísticas"
 
-#: ../gtk/plugins/cap/cap.c:440 ../gtk/plugins/cap/cap.c:443
+#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
 msgid "Response Probability:"
 msgstr "Probabilidad de respuesta"
 
-#: ../gtk/plugins/cap/cap.c:789
+#: ../gtk/plugins/cap/cap.c:807
 msgid "Statistics Configuration"
 msgstr "Configuración de estadísticas"
 
 #. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:792
+#: ../gtk/plugins/cap/cap.c:810
 msgid "Maximum response timeout:"
 msgstr "Tiempo de espera máximo para respuestas:"
 
-#: ../gtk/plugins/cap/cap.c:795 ../gtk/plugins/cap/cap.c:802
-#: ../gtk/plugins/cap/cap.c:809
+#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:799
+#: ../gtk/plugins/cap/cap.c:817
 msgid "Maximum last-seen difference:"
 msgstr "Diferencia máxima de «visto por última vez»:"
 
 #. threshold spinner
-#: ../gtk/plugins/cap/cap.c:806
+#: ../gtk/plugins/cap/cap.c:824
 msgid "Threshold:"
 msgstr "Umbral:"
 
@@ -4262,18 +4473,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: ../gtk/plugins/cap/cap.c:931
+msgid "Contact Availability Prediction"
+msgstr "Predicción de disponibilidad de contactos"
+
 #. *< name
 #. *< version
-#: ../gtk/plugins/cap/cap.c:915
+#: ../gtk/plugins/cap/cap.c:933
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predicción de disponibilidad de contactos."
 
 #. *  summary
-#: ../gtk/plugins/cap/cap.c:916
+#: ../gtk/plugins/cap/cap.c:934
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
-msgstr "El complemento de disponibilidad de contactos («cap») se utiliza para mostrar información estadística sobre los amigos en la lista de contactos de un usuario."
+msgstr ""
+"El complemento de disponibilidad de contactos («cap») se utiliza para "
+"mostrar información estadística sobre los amigos en la lista de contactos de "
+"un usuario."
 
 #: ../gtk/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -4345,140 +4563,55 @@
 "Permite cambiar los puntos asignados a los estados inactivo/ausente/no "
 "disponible para los amigos en cálculos de prioridades de contacto."
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Crazychat"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr "Complemento para establecer una sesión de «Crazychat»"
-
-#. *  description
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr ""
-"Usar Gaim para obtener direcciones IP de los amigos para conectar a una "
-"sesión de «Crazychat»"
-
-#. make the network configuration frame
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Configuración de red"
-
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "Puerto TCP"
-
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "Puerto UDP"
-
-#. make the feature configuration frame
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Ajuste de la función"
-
-#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Deshabilitado"
-
-#: ../gtk/plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Pulse el botón derecho para ver más mensajes sin leer...\n"
-
-#: ../gtk/plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Cambiar estado:"
-
-#: ../gtk/plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Mostrar la lista de amigos"
-
-#: ../gtk/plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "Mensaje nuevo..."
-
-#: ../gtk/plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Sin sonido"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../gtk/plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "Salir"
-
-#: ../gtk/plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr ""
-"Hacer parpadear el icono en el área de notificación del sistema para los "
-"mensajes sin leer..."
-
-#: ../gtk/plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "Mensajes instantáneos:"
-
-#: ../gtk/plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "En conversaciones ocultas"
-
-#: ../gtk/plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "Mensajes del c_hat"
-
-#: ../gtk/plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "Cuando mi apodo es mencionado"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "Icono del área de notificación del sistema"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Muestra un icono para Gaim en el área de notificación del sistema."
-
-#. *  description
-#: ../gtk/plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr ""
-"Muestra un icono en el área de notificación del sistema (por ejemplo en "
-"Gnome, KDE o Windows) para mostrar el estado actual de Gaim. Permite un "
-"acceso rápido a las funciones más comunes, e indicar si se debe mostrar la "
-"lista de de amigos. También ofrece opciones para hacer parpadear los "
-"mensajes sin leer."
-
-#: ../gtk/plugins/docklet/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Orientación"
-
-#: ../gtk/plugins/docklet/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "La orientación en el área de notificación."
+#: ../gtk/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Colores de conversación"
+
+#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Personaliza los colores de la ventana de conversación"
+
+#: ../gtk/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Mensajes de error"
+
+#: ../gtk/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Mensajes resaltados"
+
+#: ../gtk/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Mensaje del sistema"
+
+#: ../gtk/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Mensajes enviados"
+
+#: ../gtk/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Mensajes recibidos"
+
+#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Seleccionar el color para %s"
+
+#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
+#: ../libgaim/protocols/msn/msn.c:1532
+msgid "General"
+msgstr "General"
+
+#: ../gtk/plugins/convcolors.c:301
+msgid "Ignore incoming format"
+msgstr "Ignorar formato entrante"
+
+#: ../gtk/plugins/convcolors.c:302
+msgid "Apply in Chats"
+msgstr "Aplicar en los chats"
+
+#: ../gtk/plugins/convcolors.c:303
+msgid "Apply in IMs"
+msgstr "Aplicar en los MIs"
 
 #: ../gtk/plugins/extplacement.c:80
 msgid "By conversation count"
@@ -4597,11 +4730,6 @@
 msgid "GtkTreeView Indent Expanders"
 msgstr "Sangrado de los expansores GtkTreeView"
 
-#: ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "Seleccionar el color para %s"
-
 #: ../gtk/plugins/gaimrc.c:322
 msgid "Select Color"
 msgstr "Seleccionar el color"
@@ -4615,10 +4743,6 @@
 msgid "Select Interface Font"
 msgstr "Seleccionar tipografía de la interfaz"
 
-#: ../gtk/plugins/gaimrc.c:448
-msgid "General"
-msgstr "General"
-
 #: ../gtk/plugins/gaimrc.c:453
 msgid "GTK+ Interface Font"
 msgstr "Tipografía de la interfaz GTK+"
@@ -4715,43 +4839,42 @@
 "Arriba y después a la izquierda para cambiar a la conversación anterior.\n"
 "Arriba y después a la derecha para cambiar a la siguiente conversación."
 
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:142
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Mensajería Instantáneos"
 
 #. Add the label.
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:455
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccione una persona de su agenda mostrada abajo, o añada una nueva "
 "persona."
 
 #. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:468
-#: ../gtk/plugins/gevolution/assoc-buddy.c:353
-#: ../libgaim/protocols/jabber/buddy.c:1724
-#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
-#: ../libgaim/protocols/qq/group_im.c:137
-#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
-#: ../libgaim/protocols/qq/sys_msg.c:248
-#: ../libgaim/protocols/sametime/sametime.c:5532
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
+#: ../gtk/plugins/gevolution/assoc-buddy.c:358
+#: ../libgaim/protocols/jabber/buddy.c:1760
+#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
+#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
+#: ../libgaim/protocols/qq/sys_msg.c:250
+#: ../libgaim/protocols/sametime/sametime.c:5621
 msgid "Search"
 msgstr "Buscar"
 
 #. "New Person" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:575
-#: ../gtk/plugins/gevolution/assoc-buddy.c:464
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
+#: ../gtk/plugins/gevolution/assoc-buddy.c:469
 #: ../gtk/plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "Nueva persona"
 
 #. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:592
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"
 
 #. Add the label.
-#: ../gtk/plugins/gevolution/assoc-buddy.c:340
+#: ../gtk/plugins/gevolution/assoc-buddy.c:345
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -4760,50 +4883,49 @@
 "nueva persona."
 
 #. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:428
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
 msgid "User _details"
 msgstr "_Detalles del usuario"
 
 #. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:481
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
 msgid "_Associate Buddy"
 msgstr "_Asociar amigo"
 
 #: ../gtk/plugins/gevolution/eds-utils.c:73
 #: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1154
+#: ../libgaim/protocols/jabber/jabber.c:1162
 msgid "None"
 msgstr "Ninguno"
 
-#: ../gtk/plugins/gevolution/gevolution.c:262
-#: ../gtk/plugins/gevolution/gevolution.c:268
+#: ../gtk/plugins/gevolution/gevolution.c:239
+#: ../gtk/plugins/gevolution/gevolution.c:245
 msgid "Unable to send e-mail"
 msgstr "No se pudo enviar el correo electrónico"
 
-#: ../gtk/plugins/gevolution/gevolution.c:263
+#: ../gtk/plugins/gevolution/gevolution.c:240
 msgid "The evolution executable was not found in the PATH."
 msgstr "No se encontró el ejecutable de Evolution en la ruta."
 
-#: ../gtk/plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-"No se encontró al amigo especificado dentro en los contactos de Evolution."
-
-#: ../gtk/plugins/gevolution/gevolution.c:286
+#: ../gtk/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "No se ha encontrado una dirección de correo para este amigo."
+
+#: ../gtk/plugins/gevolution/gevolution.c:272
 msgid "Add to Address Book"
 msgstr "Añadir a la agenda"
 
-#: ../gtk/plugins/gevolution/gevolution.c:290
+#: ../gtk/plugins/gevolution/gevolution.c:284
 msgid "Send E-Mail"
 msgstr "Enviar correo electrónico"
 
 #. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:417
+#: ../gtk/plugins/gevolution/gevolution.c:411
 msgid "Evolution Integration Configuration"
 msgstr "Configuración de la integración con Evolution"
 
 #. Label
-#: ../gtk/plugins/gevolution/gevolution.c:420
+#: ../gtk/plugins/gevolution/gevolution.c:414
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccione todas las cuentas a los que los amigos se añadirán de forma "
@@ -4815,7 +4937,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:527
+#: ../gtk/plugins/gevolution/gevolution.c:521
 msgid "Evolution Integration"
 msgstr "Integración con Evolution"
 
@@ -4823,8 +4945,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:530
-#: ../gtk/plugins/gevolution/gevolution.c:532
+#: ../gtk/plugins/gevolution/gevolution.c:524
+#: ../gtk/plugins/gevolution/gevolution.c:526
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."
 
@@ -4916,6 +5038,26 @@
 "Añade una pequeña caja a la lista de amigos que muestra si tiene nuevo "
 "correo."
 
+#: ../gtk/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Subrayado"
+
+#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Dibuja una línea para indicar que hay nuevos mensajes en una conversación."
+
+#: ../gtk/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "Dibujar línea de marcador en "
+
+#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
+msgid "_IM windows"
+msgstr "Ventanas de M_I"
+
+#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
+msgid "C_hat windows"
+msgstr "Ventanas de _chat"
+
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -4941,7 +5083,7 @@
 msgstr "Error al ejecutar el editor"
 
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occured:"
+msgid "The following error has occurred:"
 msgstr "Ha ocurrido el siguiente error:"
 
 #. Configuration frame
@@ -4980,82 +5122,74 @@
 "tiempo real."
 
 #. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:687
+#: ../gtk/plugins/notify.c:670
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: ../gtk/plugins/notify.c:691
-msgid "_IM windows"
-msgstr "Ventanas de M_I"
-
-#: ../gtk/plugins/notify.c:698
-msgid "C_hat windows"
-msgstr "Ventanas de _chat"
-
-#: ../gtk/plugins/notify.c:706
+#: ../gtk/plugins/notify.c:689
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Sólo si alguien menciona su nombre de usuario"
 
-#: ../gtk/plugins/notify.c:716
+#: ../gtk/plugins/notify.c:699
 msgid "_Focused windows"
 msgstr "Ventanas _enfocadas"
 
 #. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:724
+#: ../gtk/plugins/notify.c:707
 msgid "Notification Methods"
 msgstr "Métodos de notificación"
 
-#: ../gtk/plugins/notify.c:731
+#: ../gtk/plugins/notify.c:714
 msgid "Prepend _string into window title:"
 msgstr "Prefijar la _cadena en el título de la ventana:"
 
 #. Count method button
-#: ../gtk/plugins/notify.c:750
+#: ../gtk/plugins/notify.c:733
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar el _número de mensajes nuevos en el título de la ventana"
 
 #. Count xprop method button
-#: ../gtk/plugins/notify.c:759
+#: ../gtk/plugins/notify.c:742
 msgid "Insert count of new message into _X property"
 msgstr "Insertar el número de mensajes nuevos en la propiedad _X"
 
 #. Urgent method button
-#: ../gtk/plugins/notify.c:767
+#: ../gtk/plugins/notify.c:750
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista «_URGENTE» del gestor de ventanas"
 
 #. Raise window method button
-#: ../gtk/plugins/notify.c:776
+#: ../gtk/plugins/notify.c:759
 msgid "R_aise conversation window"
 msgstr "_Subir la ventana de conversación"
 
 #. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:784
+#: ../gtk/plugins/notify.c:767
 msgid "Notification Removal"
 msgstr "Eliminación de la notificación"
 
 #. Remove on focus button
-#: ../gtk/plugins/notify.c:789
+#: ../gtk/plugins/notify.c:772
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cuando la ventana de la conversación obtiene el _foco"
 
 #. Remove on click button
-#: ../gtk/plugins/notify.c:796
+#: ../gtk/plugins/notify.c:779
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversación _recibe una pulsación"
 
 #. Remove on type button
-#: ../gtk/plugins/notify.c:804
+#: ../gtk/plugins/notify.c:787
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _escriba en la ventana de la conversación"
 
 #. Remove on message send button
-#: ../gtk/plugins/notify.c:812
+#: ../gtk/plugins/notify.c:795
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cuando se envíe un _mensaje"
 
 #. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:821
+#: ../gtk/plugins/notify.c:804
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar al cambiar de _solapa de conversación"
 
@@ -5065,7 +5199,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/notify.c:910
+#: ../gtk/plugins/notify.c:893
 msgid "Message Notification"
 msgstr "Notificación de mensajes"
 
@@ -5073,7 +5207,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -5149,70 +5283,70 @@
 "Comprueba periódicamente si hay nuevas versiones disponibles y notifica al "
 "usuario mostrándole el registro de cambios."
 
-#: ../gtk/plugins/spellchk.c:1947
+#: ../gtk/plugins/spellchk.c:1965
 msgid "Duplicate Correction"
 msgstr "Corrección duplicada"
 
-#: ../gtk/plugins/spellchk.c:1948
+#: ../gtk/plugins/spellchk.c:1966
 msgid "The specified word already exists in the correction list."
 msgstr "La palabra específica ya existe en la lista de corrección."
 
-#: ../gtk/plugins/spellchk.c:2156
+#: ../gtk/plugins/spellchk.c:2180
 msgid "Text Replacements"
 msgstr "Reemplazos de texto"
 
-#: ../gtk/plugins/spellchk.c:2179
+#: ../gtk/plugins/spellchk.c:2203
 msgid "You type"
 msgstr "Usted escribe"
 
-#: ../gtk/plugins/spellchk.c:2193
+#: ../gtk/plugins/spellchk.c:2217
 msgid "You send"
 msgstr "Usted envía"
 
-#: ../gtk/plugins/spellchk.c:2207
+#: ../gtk/plugins/spellchk.c:2231
 msgid "Whole words only"
 msgstr "Solamente palabras enteras"
 
-#: ../gtk/plugins/spellchk.c:2219
+#: ../gtk/plugins/spellchk.c:2243
 msgid "Case sensitive"
 msgstr "Distingue mayúsculas de minúsculas"
 
-#: ../gtk/plugins/spellchk.c:2245
+#: ../gtk/plugins/spellchk.c:2269
 msgid "Add a new text replacement"
 msgstr "Añadir una regla nueva de reemplazo de texto"
 
-#: ../gtk/plugins/spellchk.c:2261
+#: ../gtk/plugins/spellchk.c:2285
 msgid "You _type:"
 msgstr "Usted _escribe:"
 
-#: ../gtk/plugins/spellchk.c:2278
+#: ../gtk/plugins/spellchk.c:2302
 msgid "You _send:"
 msgstr "Usted _envía:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2290
+#: ../gtk/plugins/spellchk.c:2314
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Ajustar al formato _exacto (desmarcar para gestionar mayúsculas y minúsculas "
 "automáticamente)"
 
-#: ../gtk/plugins/spellchk.c:2292
+#: ../gtk/plugins/spellchk.c:2316
 msgid "Only replace _whole words"
 msgstr "Reemplazar solamente palabras _enteras"
 
-#: ../gtk/plugins/spellchk.c:2317
+#: ../gtk/plugins/spellchk.c:2341
 msgid "General Text Replacement Options"
 msgstr "Opciones de reemplazos de texto general"
 
-#: ../gtk/plugins/spellchk.c:2318
+#: ../gtk/plugins/spellchk.c:2342
 msgid "Enable replacement of last word on send"
 msgstr "Habilitar la sustitución de la última palabra al enviar"
 
-#: ../gtk/plugins/spellchk.c:2343
+#: ../gtk/plugins/spellchk.c:2367
 msgid "Text replacement"
 msgstr "Reemplazo de texto"
 
-#: ../gtk/plugins/spellchk.c:2345 ../gtk/plugins/spellchk.c:2346
+#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Reemplaza el texto de los mensajes salientes según las reglas definidas por "
@@ -5236,17 +5370,9 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versión horizontal deslizante de la lista de amigos."
 
-#: ../gtk/plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "Sello temporal al estilo iChat"
-
-#: ../gtk/plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Retardo"
-
-#: ../gtk/plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minutos."
+#: ../gtk/plugins/timestamp.c:136
+msgid "Display Timestamps Every"
+msgstr "Mostrar marcas de tiempo cada"
 
 #. *< type
 #. *< ui_requirement
@@ -5254,19 +5380,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/timestamp.c:256
+#: ../gtk/plugins/timestamp.c:195
 msgid "Timestamp"
 msgstr "Marca temporal"
 
 #. *< name
 #. *< version
 #. *  summary
+#: ../gtk/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "Mostrar marcas de tiempo al estilo iChat"
+
 #. *  description
-#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr ""
-"Añade una marca de tiempo al estilo iChat en las conversaciones cada N "
-"minutos."
+#: ../gtk/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Mostrar una marca de tiempo al estilo iChat cada N minutos."
 
 #: ../gtk/plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
@@ -5394,128 +5522,122 @@
 "\n"
 "* Nota: Este complemento requiere Win2000 o superior."
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:430
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
 msgid "GTK+ Runtime Version"
 msgstr "Versión en ejecución de GTK+"
 
 #. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:438
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:439
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
 msgid "_Start Gaim on Windows startup"
 msgstr "_Iniciar Gaim al iniciar Windows"
 
 # Usar empotrable? (jfs)
-#: ../gtk/plugins/win32/winprefs/winprefs.c:452
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable "
 
 #. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:456
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
 msgid "_Keep Buddy List window on top:"
 msgstr "_Mantener la ventana de lista de amigos por encima del resto"
 
 #. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:461
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
 msgid "Only when docked"
 msgstr "Solamente cuando se apile"
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:466
-msgid "_Flash window when IMs are received"
-msgstr "_Destello de ventana cuando se reciben MIs"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:468
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
 msgid "_Flash window when chat messages are received"
 msgstr "_Destello de ventana cuando se reciben mensajes de chat"
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:492
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
 msgid "WinGaim Options"
 msgstr "Opciones de WinGaim"
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:494
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
 msgid "Options specific to Windows Gaim."
 msgstr "Opciones específicas de Gaim para Windows."
 
-#: ../gtk/plugins/win32/winprefs/winprefs.c:495
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
 msgstr ""
 "Contiene las opciones específicas al Gaim de Windows como el apilado de la "
-"lista de amigos o el parpadeo de conversaciones."
-
-#: ../libgaim/account.c:773
+"lista de amigos."
+
+#: ../libgaim/account.c:769
 msgid "accounts"
 msgstr "cuentas"
 
-#: ../libgaim/account.c:917
+#: ../libgaim/account.c:915
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contraseña."
 
-#: ../libgaim/account.c:942
+#: ../libgaim/account.c:940
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduzca la contraseña para %s (%s)"
 
-#: ../libgaim/account.c:949
+#: ../libgaim/account.c:947
 msgid "Enter Password"
 msgstr "Introduzca la contraseña"
 
-#: ../libgaim/account.c:954
+#: ../libgaim/account.c:952
 msgid "Save password"
 msgstr "Guardar la contraseña"
 
-#: ../libgaim/account.c:988 ../libgaim/connection.c:103
+#: ../libgaim/account.c:986 ../libgaim/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"
 
-#: ../libgaim/account.c:1070 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1304
+#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1317
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseñas no coinciden."
 
-#: ../libgaim/account.c:1079
+#: ../libgaim/account.c:1094
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: ../libgaim/account.c:1102
+#: ../libgaim/account.c:1117
 msgid "Original password"
 msgstr "Contraseña original"
 
-#: ../libgaim/account.c:1109
+#: ../libgaim/account.c:1124
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: ../libgaim/account.c:1116
+#: ../libgaim/account.c:1131
 msgid "New password (again)"
 msgstr "Nueva contraseña (otra vez)"
 
-#: ../libgaim/account.c:1122
+#: ../libgaim/account.c:1137
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseña de %s"
 
-#: ../libgaim/account.c:1130
+#: ../libgaim/account.c:1145
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseña actual y la contraseña nueva."
 
-#: ../libgaim/account.c:1160
+#: ../libgaim/account.c:1175
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la información del usuario %s"
 
-#: ../libgaim/account.c:1163 ../libgaim/protocols/toc/toc.c:1690
+#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
 msgid "Set User Info"
 msgstr "Establecer su información de usuario"
 
-#: ../libgaim/blist.c:543
+#: ../libgaim/blist.c:548
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../libgaim/blist.c:1904
+#: ../libgaim/blist.c:1919
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
@@ -5533,20 +5655,20 @@
 "está desconectada o deshabilitada. No se han eliminado los amigos ni el "
 "grupo.\n"
 
-#: ../libgaim/blist.c:1914
+#: ../libgaim/blist.c:1929
 msgid "Group not removed"
 msgstr "Grupo no eliminado"
 
-#: ../libgaim/connection.c:105
+#: ../libgaim/connection.c:106
 msgid "Registration Error"
 msgstr "Error de registro"
 
-#: ../libgaim/connection.c:284
+#: ../libgaim/connection.c:292
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se ha conectado"
 
-#: ../libgaim/connection.c:317
+#: ../libgaim/connection.c:322
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"
@@ -5610,30 +5732,30 @@
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../libgaim/dbus-server.c:577
+#: ../libgaim/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No se pudo obtener la conexión: %s"
 
-#: ../libgaim/dbus-server.c:585
+#: ../libgaim/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "No se pudo obtener un nombre: %s"
 
-#: ../libgaim/dbus-server.c:598
+#: ../libgaim/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "No se pudo obtener el nombre del servidor: %s"
 
-#: ../libgaim/dnsquery.c:489
+#: ../libgaim/dnsquery.c:491
 msgid "Unable to create new resolver process\n"
 msgstr "No se pudo crear un proceso nuevo de resolución\n"
 
-#: ../libgaim/dnsquery.c:494
+#: ../libgaim/dnsquery.c:496
 msgid "Unable to send request to resolver process\n"
 msgstr "No se pudo enviar una solicitud al proceso de resolución\n"
 
-#: ../libgaim/dnsquery.c:527 ../libgaim/dnsquery.c:677
+#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -5642,13 +5764,13 @@
 "Error al resolver %s: \n"
 "%s"
 
-#: ../libgaim/dnsquery.c:530 ../libgaim/dnsquery.c:691
+#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
 #: ../libgaim/dnsquery.c:799
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Error al resolver %s: %d"
 
-#: ../libgaim/dnsquery.c:552
+#: ../libgaim/dnsquery.c:554
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -5657,7 +5779,7 @@
 "Error al leer del proceso de resolución:\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:556
+#: ../libgaim/dnsquery.c:558
 msgid "EOF while reading from resolver process"
 msgstr "Fin de fichero mientras se leía del proceso de resolución"
 
@@ -5670,7 +5792,7 @@
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5679,7 +5801,7 @@
 "Error al leer %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:193
+#: ../libgaim/ft.c:199
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5688,7 +5810,7 @@
 "Error al escribir %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:197
+#: ../libgaim/ft.c:203
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5697,35 +5819,39 @@
 "Error al acceder a %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:230
+#: ../libgaim/ft.c:239
+msgid "Directory is not writable."
+msgstr "No se puede escribir en el directorio."
+
+#: ../libgaim/ft.c:254
 msgid "Cannot send a file of 0 bytes."
 msgstr "No se puede enviar un archivo de 0 bytes."
 
-#: ../libgaim/ft.c:240
+#: ../libgaim/ft.c:264
 msgid "Cannot send a directory."
 msgstr "No se puede enviar un directorio."
 
-#: ../libgaim/ft.c:249
+#: ../libgaim/ft.c:273
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un archivo normal. No se sobreescribirá.\n"
 
-#: ../libgaim/ft.c:307
+#: ../libgaim/ft.c:331
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"
 
-#: ../libgaim/ft.c:314
+#: ../libgaim/ft.c:338
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quiere enviarle un fichero"
 
-#: ../libgaim/ft.c:355
+#: ../libgaim/ft.c:379
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "¿Aceptar solicitud de transferencia de archivo de %s?"
 
-#: ../libgaim/ft.c:359
+#: ../libgaim/ft.c:383
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5736,64 +5862,218 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../libgaim/ft.c:392
+#: ../libgaim/ft.c:416
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s se ofrece a enviarle el archivo %s"
 
-#: ../libgaim/ft.c:444
+#: ../libgaim/ft.c:468
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no es un nombre de archivo válido.\n"
 
-#: ../libgaim/ft.c:465
+#: ../libgaim/ft.c:489
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se ofrece enviar %s a %s"
 
-#: ../libgaim/ft.c:477
+#: ../libgaim/ft.c:501
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Comienza la transferencia de %s de %s"
 
-#: ../libgaim/ft.c:631
+#: ../libgaim/ft.c:655
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"
 
-#: ../libgaim/ft.c:634
+#: ../libgaim/ft.c:658
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"
 
-#: ../libgaim/ft.c:1023
+#: ../libgaim/ft.c:1075
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vd. canceló la transferencia de %s"
 
-#: ../libgaim/ft.c:1028
+#: ../libgaim/ft.c:1080
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"
 
-#: ../libgaim/ft.c:1086
+#: ../libgaim/ft.c:1138
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"
 
-#: ../libgaim/ft.c:1091
+#: ../libgaim/ft.c:1143
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s canceló la transferencia de archivos"
 
-#: ../libgaim/ft.c:1148
+#: ../libgaim/ft.c:1200
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Falló la transferencia del archivo a %s."
 
-#: ../libgaim/ft.c:1150
+#: ../libgaim/ft.c:1202
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Falló la transferencia del archivo de %s."
 
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "Ejecutar la orden en un terminal"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «aim», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «gg», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «icq», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «irc», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «msnim», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «sip», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «xmpp», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "La orden para gestionar URLs «ymsgr», si se activan."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr "El manejador para URLs «aim»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr "El manejador para URLs «gg»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr "El manejador para URLs «icq»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr "El manejador para URLs «irc»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr "El manejador para URLs «msnim»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr "El manejador para URLs «sip»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr "El manejador para URLs «xmpp»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "El manejador para URLs «ymsgr»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «aim»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «gg»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «icq»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «irc»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «msnim»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «sip»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «xmpp»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr "Cierto si la orden especificada en la tecla «command» debería gestionar URLs «ymsgr»."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:26
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr "Cierto si la orden especifica para gestionar este tipo de URLs debería ejecutarse en un terminal."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "Si la orden debería gestionar URLs «aim»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "Si la orden debería gestionar URLs «gg»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "Si la orden debería gestionar URLs «icq»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "Si la orden debería gestionar URLs «irc»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "Si la orden debería gestionar URLs «msnim»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "Si la orden debería gestionar URLs «sip»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "Si la orden debería gestionar URLs «xmpp»"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "Si la orden debería gestionar URLs «ymsgr»"
+
 #: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
@@ -5852,30 +6132,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
 
-#: ../libgaim/plugin.c:281 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
 #: ../libgaim/protocols/msn/servconn.c:139
 #: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2677
+#: ../libgaim/protocols/oscar/oscar.c:2719
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../libgaim/plugin.c:424
+#: ../libgaim/plugin.c:365
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "Está utilizando %s, pero este complemento requiere %s."
+
+#: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 "No hubo coincidencia en el número mágico del complemento %d (necesitaba %d)"
 
-#: ../libgaim/plugin.c:441
+#: ../libgaim/plugin.c:451
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 "No hubo coincidencia en el número de versión ABI %d.%d.x (necesitaba %d.%d.x)"
 
-#: ../libgaim/plugin.c:458
+#: ../libgaim/plugin.c:468
 msgid "Plugin does not implement all required functions"
 msgstr "El complemento no implementa todas las funciones necesarias"
 
-#: ../libgaim/plugin.c:523
+#: ../libgaim/plugin.c:533
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5884,28 +6169,238 @@
 "No se encontró el complemento necesario %s. Por favor, instale este "
 "complemento e inténtelo de nuevo."
 
-#: ../libgaim/plugin.c:528
+#: ../libgaim/plugin.c:538
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Gaim encontró un error mientras cargaba este complemento."
 
-#: ../libgaim/plugin.c:550
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No se pudo cargar el complemento necesario %s."
 
-#: ../libgaim/plugin.c:554
+#: ../libgaim/plugin.c:564
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim no pudo cargar su complemento."
 
-#: ../libgaim/plugin.c:654
+#: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "No se pudo cargar el complemento dependiente %s."
 
-#: ../libgaim/plugin.c:659
+#: ../libgaim/plugin.c:669
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Gaim encontró errores mientras descargaba el complemento."
 
+#: ../libgaim/plugins/autoaccept.c:23
+msgid "Autoaccept"
+msgstr "Autoaceptar"
+
+#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "Autoaceptar las solicitud de transferencia de archivo de los usuarios seleccionados."
+
+#: ../libgaim/plugins/autoaccept.c:80
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "Se completó la solicitud autoaceptada de transferencia de archivo de «%s» enviado por «%s»."
+
+#: ../libgaim/plugins/autoaccept.c:82
+msgid "Autoaccept complete"
+msgstr "Completada autoaceptada"
+
+#: ../libgaim/plugins/autoaccept.c:160
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "Cuando llega una solicitud de transferencia de %s?"
+
+#: ../libgaim/plugins/autoaccept.c:162
+msgid "Set Autoaccept Setting"
+msgstr "Configurar la autoaceptación"
+
+#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
+#: ../libgaim/protocols/oscar/oscar.c:2234
+#: ../libgaim/protocols/oscar/oscar.c:2280
+#: ../libgaim/protocols/oscar/oscar.c:5838
+#: ../libgaim/protocols/oscar/oscar.c:5890
+#: ../libgaim/protocols/oscar/oscar.c:6068
+#: ../libgaim/protocols/oscar/oscar.c:6124
+#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
+#: ../libgaim/request.h:1360
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../libgaim/plugins/autoaccept.c:166
+msgid "Ask"
+msgstr "Preguntar"
+
+#: ../libgaim/plugins/autoaccept.c:167
+msgid "Auto Accept"
+msgstr "Autoaceptar"
+
+#: ../libgaim/plugins/autoaccept.c:168
+msgid "Auto Reject"
+msgstr "Rechazo automática"
+
+#: ../libgaim/plugins/autoaccept.c:181
+msgid "Autoaccept File Transfers..."
+msgstr "Autoaceptar transferencia de archivos..."
+
+#. XXX: Is there a better way than this? There really should be.
+#: ../libgaim/plugins/autoaccept.c:211
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+"Ruta donde se guardarán los ficheros\n"
+"(Debe dar la ruta completa)"
+
+#: ../libgaim/plugins/autoaccept.c:216
+msgid "Automatically reject from users not in buddy list"
+msgstr "Rechazar automáticamente las transferencias de usuarios que no están en mi lista de amigos"
+
+#: ../libgaim/plugins/autoaccept.c:220
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+"Notificar con una ventana cuando se haya completado una transferencia de ficheros autoaceptada\n"
+"(sólo cuando no hay ya una conversación con el que la envía)"
+
+#: ../libgaim/plugins/autoreply.c:23
+msgid "Autoreply"
+msgstr "Respuesta automática"
+
+#: ../libgaim/plugins/autoreply.c:25
+msgid "Autoreply for all the protocols"
+msgstr "Respuesta automática para todos los protocolos"
+
+#: ../libgaim/plugins/autoreply.c:26
+msgid ""
+"This plugin lets you set autoreply message for any protocol. You can set the "
+"global autoreply message from the Plugin-options dialog. To set some "
+"specific autoreply message for a particular buddy, right click on the buddy "
+"in the buddy-list window. To set autoreply messages for some account, go to "
+"the `Advanced' tab of the Account-edit dialog."
+msgstr "Este complemento permite configurar un mensaje de respuesta automática para cualquier protocolo. Puede configurar el mensaje de respuesta automática global en el diálogo de las opciones del complemento. Si quiere establecer mensajes de respuesta particulares para un amigo sólo tiene que pulsar con el botón derecho sobre el amigo en la ventana con la lista de amigos. Vaya a la pestaña «Avanzadas» en el diálogo de edición de cuentas si quiere configurar un mensaje de respuesta automática para sólo alguna de sus cuentas."
+
+#. XXX: There should be a way to reset to the default/account-default autoreply
+#: ../libgaim/plugins/autoreply.c:218
+#, c-format
+msgid "Set autoreply message for %s"
+msgstr "Fijar el mensaje de respuesta automática para %s"
+
+#: ../libgaim/plugins/autoreply.c:220
+msgid "Set Autoreply Message"
+msgstr "Fijar el mensaje de respuesta automática"
+
+#: ../libgaim/plugins/autoreply.c:221
+msgid ""
+"The following message will be sent to the buddy when the buddy sends you a "
+"message and autoreply is enabled."
+msgstr "Se mostrara el mensaje indicado a continuación a un amigo cuando el amigo le envíe un mensaje y esté activada la respuesta automática."
+
+#: ../libgaim/plugins/autoreply.c:238
+msgid "Set _Autoreply Message"
+msgstr "Configurar mensaje de respuesta _automática"
+
+#: ../libgaim/plugins/autoreply.c:249
+msgid "Autoreply message"
+msgstr "Mensaje de respuesta automática"
+
+#: ../libgaim/plugins/autoreply.c:336
+msgid "Send autoreply messages when"
+msgstr "Enviar el mensaje de respuesta automática cuando"
+
+#: ../libgaim/plugins/autoreply.c:340
+msgid "When my account is _away"
+msgstr "Cuando mi cuenta no está _disponible"
+
+#: ../libgaim/plugins/autoreply.c:344
+msgid "When my account is _idle"
+msgstr "Cuando mi cuenta está _inactiva"
+
+#: ../libgaim/plugins/autoreply.c:348
+msgid "_Default reply"
+msgstr "Respuesta por _omisión"
+
+#: ../libgaim/plugins/autoreply.c:354
+msgid "Status message"
+msgstr "Mensaje de estado"
+
+#: ../libgaim/plugins/autoreply.c:358
+msgid "Autoreply with status message"
+msgstr "Respuesta automática con mensaje de estado"
+
+#: ../libgaim/plugins/autoreply.c:362
+msgid "Always when there is a status message"
+msgstr "Siempre cuando haya un mensaje de estado"
+
+#: ../libgaim/plugins/autoreply.c:364
+msgid "Only when there's no autoreply message"
+msgstr "Sólo si no hay un mensaje de respuesta automática"
+
+#: ../libgaim/plugins/autoreply.c:369
+msgid "Delay between autoreplies"
+msgstr "Demora entre respuestas automáticas"
+
+#: ../libgaim/plugins/autoreply.c:373
+msgid "_Minimum delay (mins)"
+msgstr "Demora _mínima (minutos)"
+
+#: ../libgaim/plugins/autoreply.c:377
+msgid "Times to send autoreplies"
+msgstr "Horas en las que enviar las respuestas automáticas"
+
+#: ../libgaim/plugins/autoreply.c:381
+msgid "Ma_ximum count"
+msgstr "Cuenta má_xima"
+
+#: ../libgaim/plugins/autoreply.c:428
+msgid ""
+"I am currently not available. Please leave your message, and I will get back "
+"to you as soon as possible."
+msgstr "Ahora mismo no estoy disponible. Por favor, deja un mensaje y me pondré en contacto contigo lo antes posible."
+
+#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1641
+msgid "Notes"
+msgstr "Notas"
+
+#: ../libgaim/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr "Introduzca sus notas a continuación..."
+
+#: ../libgaim/plugins/buddynote.c:61
+msgid "Edit Notes..."
+msgstr "Editar las notas..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/buddynote.c:87
+msgid "Buddy Notes"
+msgstr "Notas de amigos"
+
+#. *< name
+#. *< version
+#: ../libgaim/plugins/buddynote.c:89
+msgid "Store notes on particular buddies."
+msgstr "Guardar las notas de amigos concretos."
+
+#. *  summary
+#: ../libgaim/plugins/buddynote.c:90
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr "Añade la opción de guardar notas sobre los amigos en su lista de amigos."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5979,11 +6474,6 @@
 msgid "_Set"
 msgstr "_Guardar"
 
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228
-msgid "_Cancel"
-msgstr "_Cancelar"
-
 #: ../libgaim/plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Ninguna de sus cuentas está inactiva."
@@ -6058,29 +6548,37 @@
 "Complemento de soporte IPC de prueba, como servidor. Éste registra las "
 "órdenes IPC."
 
-#: ../libgaim/plugins/log_reader.c:1412
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+#: ../libgaim/plugins/log_reader.c:497
+msgid "(UTC)"
+msgstr "(TCU)"
+
+#: ../libgaim/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "El usuario no está conectado."
 
-#: ../libgaim/plugins/log_reader.c:1418
+#: ../libgaim/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "_Enviar respuesta automática:"
 
-#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
 #: ../libgaim/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se ha desconectado."
 
-#: ../libgaim/plugins/log_reader.c:1445
+#: ../libgaim/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "Uno o más mensajes puede no haber llegado a destino."
 
-#: ../libgaim/plugins/log_reader.c:1455
+#: ../libgaim/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Ha sido desconectado del servidor."
 
-#: ../libgaim/plugins/log_reader.c:1463
+#: ../libgaim/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -6088,65 +6586,65 @@
 "Actualmente está desconectado. No podrá recibir mensajes a menos que se "
 "conecte."
 
-#: ../libgaim/plugins/log_reader.c:1478
+#: ../libgaim/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "No se pudo enviar el mensaje porque excede la longitud máxima permitida."
 
-#: ../libgaim/plugins/log_reader.c:1483
+#: ../libgaim/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "No se envió su mensaje."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:1922
+#: ../libgaim/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "Configuración general de lectura del registro"
 
-#: ../libgaim/plugins/log_reader.c:1926
+#: ../libgaim/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../libgaim/plugins/log_reader.c:1930
+#: ../libgaim/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr "Utilizar heurísticos de nombres"
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:1936
+#: ../libgaim/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "Directorio de registro"
 
@@ -6156,19 +6654,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:1981
+#: ../libgaim/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "Lector de registro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:1985
+#: ../libgaim/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:1989
+#: ../libgaim/plugins/log_reader.c:2134
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6176,9 +6674,12 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Cuando consulte los registros este complemento incluirá registros de otros clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger y Trillian.\n"
-"\n"
-"AVISO: Este complemento aún es código en «alpha» y puede bloquearse con frecuencia. ¡Uselo bajo su propia responsabilidad!"
+"Cuando consulte los registros este complemento incluirá registros de otros "
+"clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger y "
+"Trillian.\n"
+"\n"
+"AVISO: Este complemento aún es código en «alpha» y puede bloquearse con "
+"frecuencia. ¡Uselo bajo su propia responsabilidad!"
 
 #: ../libgaim/plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
@@ -6189,20 +6690,84 @@
 msgid "Loads .NET plugins with Mono."
 msgstr "Cargar complementos .NET con Mono."
 
+#. *< magic
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:591
+#: ../libgaim/plugins/newline.c:68
+msgid "New Line"
+msgstr "Nueva línea"
+
+# Antecede una línea al mensaje mostrado.
+#. *< name
+#. *< version
+#: ../libgaim/plugins/newline.c:70
+msgid "Prepends a newline to displayed message."
+msgstr "No se pudo enviar el mensaje."
+
+#. *  summary
+#: ../libgaim/plugins/newline.c:71
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
+msgstr "Añade una línea en blanco a los mensajes para que el resto del mensaje se muestre por debajo del nombre de usuario en la ventana de conversación."
+
+#: ../libgaim/plugins/offlinemsg.c:23
+msgid "Offline Message Emulation"
+msgstr "Emulación de mensaje de desconectado"
+
+#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+msgid "Save messages sent to an offline user as pounce."
+msgstr "Guardar los mensajes enviados como un aviso."
+
+#: ../libgaim/plugins/offlinemsg.c:95
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr "El resto de los mensajes se guardarán como un aviso. Puede editar y eliminar los avisos en el diálogo «Aviso de amigo»."
+
+#: ../libgaim/plugins/offlinemsg.c:152
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "«%s» está actualmente desconectado. ¿Desea guardar el resto del mensaje como un aviso y enviarlo de forma automática cuando «%s» se vuelva a conectar?"
+
+#: ../libgaim/plugins/offlinemsg.c:156
+msgid "Offline Message"
+msgstr "Mensaje desconectado"
+
+#: ../libgaim/plugins/offlinemsg.c:157
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr "Puede editar y borrar los avisos del diálogo «Avisos de amigo»"
+
+#: ../libgaim/plugins/offlinemsg.c:187
+msgid "Save offline messages in pounce"
+msgstr "Guardar los mensajes de desconexión como un aviso"
+
+#: ../libgaim/plugins/offlinemsg.c:191
+msgid "Do not ask. Always save in pounce."
+msgstr "No preguntar. Siempre guardar como un aviso."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
 msgid "Perl Plugin Loader"
 msgstr "Cargador de complementos Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:593 ../libgaim/plugins/perl/perl.c:594
+#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
 msgstr "Provee soporte para cargar complementos en perl."
 
@@ -6222,28 +6787,26 @@
 "Hace que aparezcan las ventanas de conversación cuando un usuario empieza a "
 "enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, Sametime y Yahoo!"
 
-#. This is a quote from Star Wars.  You should
-#. probably not translate it literally.  If
-#. you can't find a fitting cultural reference
-#. in your language, consider translating
-#. something like this instead:
-#. "You feel a new message coming."
-#: ../libgaim/plugins/psychic.c:63
+#: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
 msgstr "Sientes una perturbación en la fuerza..."
 
-#: ../libgaim/plugins/psychic.c:82
+#: ../libgaim/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
 msgstr "Permitir sólo a los usuarios en mi lista de amigos"
 
-#: ../libgaim/plugins/psychic.c:87
+#: ../libgaim/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "Deshabilitar cuando ausente"
 
-#: ../libgaim/plugins/psychic.c:91
+#: ../libgaim/plugins/psychic.c:94
 msgid "Display notification message in conversations"
 msgstr "Muestra el mensaje de notificación en las conversaciones"
 
+#: ../libgaim/plugins/psychic.c:99
+msgid "Raise psychic conversations"
+msgstr "Activar conversaciones psíquicas"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6407,6 +6970,12 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provee soporte para cargar complementos Tcl"
 
+#: ../libgaim/plugins/tcl/tcl.c:481
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr "No se pudo detectar la instalación de ActiveTCL. Debe instalar ActiveTCL de http://www.activestate.com si desea utilizar los complementos TCL\n"
+
 #. Send a message about the connection error
 #: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
@@ -6419,25 +6988,6 @@
 "No se pudo establecer una conexión con el servidor mDNS local. ¿Está "
 "arrancado?"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/sametime/sametime.c:3239
-#, c-format
-msgid ""
-"\n"
-"<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>Estado:</b> %s"
-
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#, c-format
-msgid ""
-"\n"
-"<b>Message:</b> %s"
-msgstr ""
-"\n"
-"<b>Mensaje:</b> %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6448,46 +6998,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:435
-#: ../libgaim/protocols/bonjour/bonjour.c:437
+#: ../libgaim/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:438
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:473
-#: ../libgaim/protocols/bonjour/bonjour.c:481
-#: ../libgaim/protocols/bonjour/bonjour.c:539
-#: ../libgaim/protocols/silc/silc.c:301
+#: ../libgaim/protocols/bonjour/bonjour.c:474
+#: ../libgaim/protocols/bonjour/bonjour.c:482
+#: ../libgaim/protocols/bonjour/bonjour.c:540
+#: ../libgaim/protocols/silc/silc.c:300
 msgid "Gaim User"
 msgstr "Usuario de Gaim"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:577
-#: ../libgaim/protocols/silc/silc.c:935
+#: ../libgaim/protocols/bonjour/bonjour.c:578
+#: ../libgaim/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "Servidor"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:800
+#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:807
 msgid "First name"
 msgstr "Nombre:"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:805
+#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:812
 msgid "Last name"
 msgstr "Apellidos:"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:790
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/silc.c:939
+#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:797
+#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:590
+#: ../libgaim/protocols/bonjour/bonjour.c:591
 msgid "AIM Account"
 msgstr "Cuenta AIM"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:593
+#: ../libgaim/protocols/bonjour/bonjour.c:594
 msgid "Jabber Account"
 msgstr "Cuenta Jabber"
 
@@ -6520,11 +7070,11 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1776
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1776
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -6596,8 +7146,8 @@
 msgstr "¡Se completó el registro con éxito!"
 
 #: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:779
-#: ../libgaim/protocols/jabber/jabber.c:1339
+#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/jabber/jabber.c:1352
 msgid "Password"
 msgstr "Contraseña"
 
@@ -6621,27 +7171,11 @@
 msgid "Please, fill in the following fields"
 msgstr "Por favor, rellene los siguientes campos"
 
-#. General
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
-#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:800
-#: ../libgaim/protocols/jabber/buddy.c:1526
-#: ../libgaim/protocols/jabber/buddy.c:1708
-#: ../libgaim/protocols/jabber/jabber.c:795
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
-#: ../libgaim/protocols/qq/buddy_info.c:41
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1035
-#: ../libgaim/protocols/silc/ops.c:1178 ../libgaim/protocols/silc/ops.c:1327
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
-msgid "Nickname"
-msgstr "Apodo"
-
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
-#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:815
-#: ../libgaim/protocols/oscar/oscar.c:3683
-#: ../libgaim/protocols/oscar/oscar.c:3691
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
+#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/oscar/oscar.c:3777
+#: ../libgaim/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
 
@@ -6649,10 +7183,12 @@
 msgid "Year of birth"
 msgstr "Año de nacimiento"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/oscar/oscar.c:3647
-#: ../libgaim/protocols/qq/buddy_info.c:44
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
+#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
+#: ../libgaim/protocols/qq/qq.c:234
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Sexo"
 
@@ -6660,13 +7196,13 @@
 msgid "Male or female"
 msgstr "Hombre o mujer"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
-#: ../libgaim/protocols/qq/buddy_info.c:81
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Hombre"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
-#: ../libgaim/protocols/qq/buddy_info.c:82
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Mujer"
 
@@ -6691,7 +7227,7 @@
 msgstr "Su contraseña actual es diferente de la que ha especificado."
 
 #: ../libgaim/protocols/gg/gg.c:716
-msgid "Unable to change password. Error occured.\n"
+msgid "Unable to change password. Error occurred.\n"
 msgstr "No se pudo cambiar la contraseña. Se produjo un error.\n"
 
 #: ../libgaim/protocols/gg/gg.c:725
@@ -6723,125 +7259,126 @@
 msgid "Add to chat..."
 msgstr "Añadir al chat"
 
-#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
-#: ../libgaim/protocols/oscar/oscar.c:3619
+#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
+#: ../libgaim/protocols/oscar/oscar.c:2654
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
-#: ../libgaim/protocols/jabber/buddy.c:1522
-#: ../libgaim/protocols/jabber/buddy.c:1698
-#: ../libgaim/protocols/oscar/oscar.c:3630
-#: ../libgaim/protocols/silc/ops.c:1023
+#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
+#: ../libgaim/protocols/jabber/buddy.c:1558
+#: ../libgaim/protocols/jabber/buddy.c:1734
+#: ../libgaim/protocols/oscar/oscar.c:3704
+#: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
 
-#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
 msgid "Birth Year"
 msgstr "Año de nacimiento"
 
-#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
-#: ../libgaim/protocols/oscar/oscar.c:3794
+#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
+#: ../libgaim/protocols/oscar/oscar.c:3886
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la búsqueda."
 
-#: ../libgaim/protocols/gg/gg.c:1152
+#: ../libgaim/protocols/gg/gg.c:1158
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "Resultados de la búsqueda"
 
-#: ../libgaim/protocols/gg/gg.c:1196
+#: ../libgaim/protocols/gg/gg.c:1202
 msgid "No matching users found"
 msgstr "No se encontraron usuarios que coincidan"
 
-#: ../libgaim/protocols/gg/gg.c:1197
+#: ../libgaim/protocols/gg/gg.c:1203
 msgid "There are no users matching your search criteria."
 msgstr "No hay usuarios que coincidan con sus criterios de búsqueda."
 
-#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
+#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
-#: ../libgaim/protocols/gg/gg.c:1376
+#: ../libgaim/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../libgaim/protocols/gg/gg.c:1377
+#: ../libgaim/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
 msgstr "Su lista de amigos fue descargada del servidor."
 
-#: ../libgaim/protocols/gg/gg.c:1384
+#: ../libgaim/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos exportada"
 
-#: ../libgaim/protocols/gg/gg.c:1385
+#: ../libgaim/protocols/gg/gg.c:1391
 msgid "Your buddy list was stored on the server."
 msgstr "Su lista de amigos fue almacenada en el servidor."
 
-#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
+#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
 msgid "Connection failed."
 msgstr "Falló la conexión."
 
-#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libgaim/protocols/gg/gg.c:1639
+#: ../libgaim/protocols/gg/gg.c:1656
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: ../libgaim/protocols/gg/gg.c:1648
+#: ../libgaim/protocols/gg/gg.c:1665
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libgaim/protocols/gg/gg.c:1652
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libgaim/protocols/gg/gg.c:1686
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#: ../libgaim/protocols/gg/gg.c:1902
+#: ../libgaim/protocols/gg/gg.c:1926
 msgid "Chat error"
 msgstr "Error de chat"
 
-#: ../libgaim/protocols/gg/gg.c:1903
+#: ../libgaim/protocols/gg/gg.c:1927
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-#: ../libgaim/protocols/gg/gg.c:1986
+#: ../libgaim/protocols/gg/gg.c:2010
 msgid "Not connected to the server."
 msgstr "No está conectado al servidor."
 
-#: ../libgaim/protocols/gg/gg.c:2009
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
 
-#: ../libgaim/protocols/gg/gg.c:2015
+#: ../libgaim/protocols/gg/gg.c:2039
 msgid "Change password..."
 msgstr "Cambiar su contraseña..."
 
-#: ../libgaim/protocols/gg/gg.c:2021
+#: ../libgaim/protocols/gg/gg.c:2045
 msgid "Upload buddylist to Server"
 msgstr "Subir la lista de amigos al servidor"
 
-#: ../libgaim/protocols/gg/gg.c:2025
+#: ../libgaim/protocols/gg/gg.c:2049
 msgid "Download buddylist from Server"
 msgstr "Descargar la lista de amigos del servidor"
 
-#: ../libgaim/protocols/gg/gg.c:2029
+#: ../libgaim/protocols/gg/gg.c:2053
 msgid "Delete buddylist from Server"
 msgstr "Borrar la lista de amigos del servidor"
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libgaim/protocols/gg/gg.c:2057
 msgid "Save buddylist to file..."
 msgstr "Guardar lista de amigos a archivo..."
 
-#: ../libgaim/protocols/gg/gg.c:2037
+#: ../libgaim/protocols/gg/gg.c:2061
 msgid "Load buddylist from file..."
 msgstr "Cargar la lista de amigos desde archivo..."
 
@@ -6856,45 +7393,45 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2134
+#: ../libgaim/protocols/gg/gg.c:2159
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2135
+#: ../libgaim/protocols/gg/gg.c:2160
 msgid "Polish popular IM"
 msgstr "Mensajería instantánea polaca muy popular"
 
-#: ../libgaim/protocols/gg/gg.c:2183
+#: ../libgaim/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1585
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
+#: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
-#: ../libgaim/protocols/silc/silc.c:1297
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
+#: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
-#: ../libgaim/protocols/irc/dcc_send.c:293
-#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/irc/dcc_send.c:296
+#: ../libgaim/protocols/irc/dcc_send.c:337
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
 #: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Falló la transferencia de archivos"
 
-#: ../libgaim/protocols/irc/dcc_send.c:294
-#: ../libgaim/protocols/irc/dcc_send.c:335
+#: ../libgaim/protocols/irc/dcc_send.c:297
+#: ../libgaim/protocols/irc/dcc_send.c:338
 msgid "Gaim could not open a listening port."
 msgstr "Gaim no pudo abrir un puerto de escucha."
 
@@ -6916,7 +7453,7 @@
 msgstr "MOTD para %s"
 
 #: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:614 ../libgaim/protocols/irc/irc.c:639
+#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
@@ -6936,41 +7473,41 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:575
-#: ../libgaim/protocols/jabber/jabber.c:920
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:582
+#: ../libgaim/protocols/jabber/jabber.c:927
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-#: ../libgaim/protocols/irc/irc.c:349 ../libgaim/protocols/simple/simple.c:466
-#: ../libgaim/protocols/simple/simple.c:1588
+#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libgaim/protocols/irc/irc.c:415 ../libgaim/protocols/jabber/jabber.c:451
-#: ../libgaim/protocols/oscar/oscar.c:1220
+#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
+#: ../libgaim/protocols/oscar/oscar.c:1263
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:475
+#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: ../libgaim/protocols/irc/irc.c:440 ../libgaim/protocols/jabber/jabber.c:478
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
 msgid "SSL Handshake Failed"
 msgstr "Se produjo un fallo en la negociación SSL"
 
-#: ../libgaim/protocols/irc/irc.c:611 ../libgaim/protocols/irc/irc.c:636
+#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../libgaim/protocols/irc/irc.c:775 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
 #: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../libgaim/protocols/irc/irc.c:778
-#: ../libgaim/protocols/sametime/sametime.c:3350
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1379
+#: ../libgaim/protocols/irc/irc.c:772
+#: ../libgaim/protocols/sametime/sametime.c:3396
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
 #: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Tema"
@@ -6983,48 +7520,50 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:908
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:909
+#: ../libgaim/protocols/irc/irc.c:904
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:928 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/jabber/jabber.c:1970
-#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
-#: ../libgaim/protocols/sametime/sametime.c:5638
-#: ../libgaim/protocols/silc/ops.c:1241 ../libgaim/protocols/silc/ops.c:1343
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
+#: ../libgaim/protocols/jabber/jabber.c:1984
+#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
+#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
+#: ../libgaim/protocols/sametime/sametime.c:5727
+#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
+#: ../libgaim/protocols/simple/simple.c:1836
 #: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/msn/msn.c:2059
-#: ../libgaim/protocols/oscar/oscar.c:6534
-#: ../libgaim/protocols/sametime/sametime.c:5643
-#: ../libgaim/protocols/silc/silc.c:1859 ../libgaim/protocols/toc/toc.c:2351
+#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
+#: ../libgaim/protocols/oscar/libaim.c:136
+#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
+#: ../libgaim/protocols/sametime/sametime.c:5732
+#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libgaim/protocols/irc/irc.c:934
+#: ../libgaim/protocols/irc/irc.c:929
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../libgaim/protocols/irc/irc.c:937 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/jabber/jabber.c:775
-#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1188
-#: ../libgaim/protocols/silc/ops.c:1190 ../libgaim/protocols/silc/ops.c:1337
-#: ../libgaim/protocols/silc/ops.c:1339 ../libgaim/protocols/silc/silc.c:933
+#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
+#: ../libgaim/protocols/jabber/jabber.c:782
+#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
+#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
+#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../libgaim/protocols/irc/irc.c:940 ../libgaim/protocols/irc/msgs.c:230
-#: ../libgaim/protocols/silc/silc.c:937
+#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
+#: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "Nombre real"
 
@@ -7032,7 +7571,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:948
+#: ../libgaim/protocols/irc/irc.c:943
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -7055,141 +7594,131 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "No se puede expulsar a %s: la lista de expulsados está llena"
 
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/irc/msgs.c:248
-#, c-format
-msgid "<b>%s:</b> %s"
-msgstr "<b>%s:</b> %s"
-
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
-#: ../libgaim/protocols/silc/ops.c:1411
-msgid "Nick"
-msgstr "Apodo"
+#: ../libgaim/protocols/irc/msgs.c:217
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
 
 #: ../libgaim/protocols/irc/msgs.c:218
-msgid " <i>(ircop)</i>"
-msgstr " <i>(ircop)</i>"
-
-#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1254
+#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/silc/ops.c:1414
+msgid "Nick"
+msgstr "Apodo"
+
+#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../libgaim/protocols/irc/msgs.c:246
-#, c-format
-msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>Inactivo desde:</b> %s<br>"
-
-#: ../libgaim/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:250
+msgid "Idle for"
+msgstr "Inactivo durante"
+
+#: ../libgaim/protocols/irc/msgs.c:253
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libgaim/protocols/irc/msgs.c:252
-msgid "<br><b>Defining adjective:</b> Glorious<br>"
-msgstr "<br><b>Adjetivo que lo define:</b> Glorioso</b>"
-
-#: ../libgaim/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:257
+msgid "<b>Defining adjective:</b>"
+msgstr "<br><b>Adjetivo que lo define:</b>"
+
+#: ../libgaim/protocols/irc/msgs.c:257
+msgid "Glorious"
+msgstr "Glorioso"
+
+#: ../libgaim/protocols/irc/msgs.c:333
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:331
+#: ../libgaim/protocols/irc/msgs.c:335
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ha borrado el tema."
 
-#: ../libgaim/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:343
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:357
+#: ../libgaim/protocols/irc/msgs.c:361
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: ../libgaim/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ha enviado un mensaje que el servidor IRC no pudo entender."
 
-#: ../libgaim/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:385
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:515
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: ../libgaim/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:516
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: ../libgaim/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:527
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:538
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: ../libgaim/protocols/irc/msgs.c:535
+#: ../libgaim/protocols/irc/msgs.c:541
 msgid "User is not logged in"
 msgstr "El usuario no está conectado"
 
-#: ../libgaim/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:546
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: ../libgaim/protocols/irc/msgs.c:560
+#: ../libgaim/protocols/irc/msgs.c:566
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: ../libgaim/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:622
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitación."
 
-#: ../libgaim/protocols/irc/msgs.c:617
+#: ../libgaim/protocols/irc/msgs.c:623
 msgid "Invitation only"
 msgstr "Sólo con invitación"
 
-#: ../libgaim/protocols/irc/msgs.c:726
+#: ../libgaim/protocols/irc/msgs.c:732
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
+#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:754
+#: ../libgaim/protocols/irc/msgs.c:760
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
+#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
 msgid "Invalid nickname"
 msgstr "Apodo inválido"
 
-#: ../libgaim/protocols/irc/msgs.c:841
+#: ../libgaim/protocols/irc/msgs.c:847
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7197,7 +7726,7 @@
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."
 
-#: ../libgaim/protocols/irc/msgs.c:845
+#: ../libgaim/protocols/irc/msgs.c:852
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7205,42 +7734,42 @@
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."
 
-#: ../libgaim/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: ../libgaim/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libgaim/protocols/irc/msgs.c:905
+#: ../libgaim/protocols/irc/msgs.c:912
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: ../libgaim/protocols/irc/msgs.c:947
+#: ../libgaim/protocols/irc/msgs.c:954
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inválido del servidor"
 
-#: ../libgaim/protocols/irc/msgs.c:949
+#: ../libgaim/protocols/irc/msgs.c:956
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: ../libgaim/protocols/irc/msgs.c:1030
+#: ../libgaim/protocols/irc/msgs.c:1037
 #, c-format
 msgid "Cannot join %s:"
 msgstr "No se puede unir a %s:"
 
-#: ../libgaim/protocols/irc/msgs.c:1031 ../libgaim/protocols/silc/ops.c:1127
+#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: ../libgaim/protocols/irc/msgs.c:1065
+#: ../libgaim/protocols/irc/msgs.c:1072
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal están temporalmente no disponibles."
 
-#: ../libgaim/protocols/irc/msgs.c:1077
+#: ../libgaim/protocols/irc/msgs.c:1084
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
@@ -7349,7 +7878,7 @@
 "names [canal]:  Obtener la lista de los usuarios que están en el canal."
 
 #: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1775
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
@@ -7468,7 +7997,7 @@
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
 #: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
 #: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -7479,26 +8008,26 @@
 msgstr ""
 "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
 
-#: ../libgaim/protocols/jabber/auth.c:109
+#: ../libgaim/protocols/jabber/auth.c:112
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"
 
-#: ../libgaim/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "El servidor no pudo autenticarle sin una contraseña"
-
 #: ../libgaim/protocols/jabber/auth.c:232
-#: ../libgaim/protocols/jabber/auth.c:233
-#: ../libgaim/protocols/jabber/auth.c:401
-#: ../libgaim/protocols/jabber/auth.c:402
-#: ../libgaim/protocols/jabber/auth.c:483
-#: ../libgaim/protocols/jabber/auth.c:484
+msgid "Server couldn't authenticate you without a password"
+msgstr "El servidor no pudo autenticarle sin una contraseña"
+
+#: ../libgaim/protocols/jabber/auth.c:235
+#: ../libgaim/protocols/jabber/auth.c:236
+#: ../libgaim/protocols/jabber/auth.c:404
+#: ../libgaim/protocols/jabber/auth.c:405
+#: ../libgaim/protocols/jabber/auth.c:486
+#: ../libgaim/protocols/jabber/auth.c:487
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-#: ../libgaim/protocols/jabber/auth.c:234
-#: ../libgaim/protocols/jabber/auth.c:403
-#: ../libgaim/protocols/jabber/auth.c:485
+#: ../libgaim/protocols/jabber/auth.c:237
+#: ../libgaim/protocols/jabber/auth.c:406
+#: ../libgaim/protocols/jabber/auth.c:488
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -7506,117 +8035,118 @@
 "El servidor solicita autenticación en claro sobre un canal no cifrado. "
 "¿Permitir ésto y continuar con el proceso de autenticación?"
 
-#: ../libgaim/protocols/jabber/auth.c:240
-#: ../libgaim/protocols/jabber/auth.c:411
-#: ../libgaim/protocols/jabber/auth.c:493
+#: ../libgaim/protocols/jabber/auth.c:243
+#: ../libgaim/protocols/jabber/auth.c:414
+#: ../libgaim/protocols/jabber/auth.c:496
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido"
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:324
-#: ../libgaim/protocols/jabber/auth.c:446
-#: ../libgaim/protocols/jabber/auth.c:614
-#: ../libgaim/protocols/jabber/auth.c:747
-#: ../libgaim/protocols/jabber/auth.c:759
-#: ../libgaim/protocols/jabber/auth.c:778
-#: ../libgaim/protocols/jabber/jabber.c:112
+#: ../libgaim/protocols/jabber/auth.c:327
+#: ../libgaim/protocols/jabber/auth.c:449
+#: ../libgaim/protocols/jabber/auth.c:617
+#: ../libgaim/protocols/jabber/auth.c:751
+#: ../libgaim/protocols/jabber/auth.c:776
+#: ../libgaim/protocols/jabber/auth.c:795
+#: ../libgaim/protocols/jabber/jabber.c:113
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."
 
-#: ../libgaim/protocols/jabber/auth.c:635
+#: ../libgaim/protocols/jabber/auth.c:638
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: ../libgaim/protocols/jabber/auth.c:722
+#: ../libgaim/protocols/jabber/auth.c:726
 msgid "SASL error"
 msgstr "Error de SASL"
 
-#: ../libgaim/protocols/jabber/buddy.c:268
-#: ../libgaim/protocols/jabber/buddy.c:769
-#: ../libgaim/protocols/silc/ops.c:1019
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:783
+#: ../libgaim/protocols/sametime/sametime.c:4148
+#: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../libgaim/protocols/jabber/buddy.c:269
-#: ../libgaim/protocols/jabber/buddy.c:782
-#: ../libgaim/protocols/silc/ops.c:1031
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/buddy.c:796
+#: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: ../libgaim/protocols/jabber/buddy.c:270
-#: ../libgaim/protocols/jabber/buddy.c:786
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:800
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/jabber.c:835
-msgid "URL"
-msgstr "URL"
-
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:838
-msgid "Street Address"
-msgstr "Calle"
-
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:834
-msgid "Extended Address"
-msgstr "Dirección extendida"
-
 #: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/buddy.c:842
-msgid "Locality"
-msgstr "Localidad"
+#: ../libgaim/protocols/jabber/jabber.c:842
+msgid "URL"
+msgstr "URL"
 
 #: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:846
-msgid "Region"
-msgstr "Región"
+#: ../libgaim/protocols/jabber/buddy.c:852
+msgid "Street Address"
+msgstr "Calle"
 
 #: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:850
-msgid "Postal Code"
-msgstr "Código postal"
+#: ../libgaim/protocols/jabber/buddy.c:848
+msgid "Extended Address"
+msgstr "Dirección extendida"
 
 #: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:855
-#: ../libgaim/protocols/silc/silc.c:943
-msgid "Country"
-msgstr "País"
+#: ../libgaim/protocols/jabber/buddy.c:856
+msgid "Locality"
+msgstr "Localidad"
 
 #: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:866
-#: ../libgaim/protocols/jabber/buddy.c:873
-msgid "Telephone"
-msgstr "Teléfono"
+#: ../libgaim/protocols/jabber/buddy.c:860
+msgid "Region"
+msgstr "Región"
 
 #: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:884
-#: ../libgaim/protocols/jabber/buddy.c:892
-#: ../libgaim/protocols/jabber/buddy.c:1528
-#: ../libgaim/protocols/silc/ops.c:1074 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
+#: ../libgaim/protocols/jabber/buddy.c:864
+msgid "Postal Code"
+msgstr "Código postal"
+
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:869
+#: ../libgaim/protocols/silc/silc.c:939
+msgid "Country"
+msgstr "País"
+
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:880
+#: ../libgaim/protocols/jabber/buddy.c:887
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:898
+#: ../libgaim/protocols/jabber/buddy.c:906
+#: ../libgaim/protocols/jabber/buddy.c:1564
+#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Correo electrónico"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:907
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:921
 msgid "Organization Name"
 msgstr "Nombre de la organización"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:911
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:925
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:920
+#: ../libgaim/protocols/jabber/buddy.c:287
+#: ../libgaim/protocols/jabber/buddy.c:934
 msgid "Role"
 msgstr "Rol"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
-#: ../libgaim/protocols/oscar/oscar.c:3663
+#: ../libgaim/protocols/jabber/buddy.c:288
+#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/oscar/oscar.c:3743
 msgid "Birthday"
 msgstr "Cumpleaños"
 
@@ -7633,172 +8163,171 @@
 "Todos los campos siguientes son opcionales. Introduzca sólo la información "
 "con la que se sienta cómodo."
 
-#: ../libgaim/protocols/jabber/buddy.c:640
-msgid "Client:"
-msgstr "Cliente:"
-
-#: ../libgaim/protocols/jabber/buddy.c:644
-#: ../libgaim/protocols/jabber/buddy.c:677
-msgid "Operating System"
-msgstr "Sistema operativo"
-
-#: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/jabber.c:1973
-msgid "Resource"
-msgstr "Recurso"
-
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/jabber.c:1213
-#: ../libgaim/protocols/jabber/jabber.c:1223
-#: ../libgaim/protocols/jabber/jabber.c:1233
-#: ../libgaim/protocols/jabber/jabber.c:1243
-#: ../libgaim/protocols/jabber/jabber.c:1253
-msgid "Priority"
-msgstr "Prioridad"
-
-#: ../libgaim/protocols/jabber/buddy.c:673
+#: ../libgaim/protocols/jabber/buddy.c:652
+#: ../libgaim/protocols/jabber/buddy.c:691
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libgaim/protocols/jabber/buddy.c:790
-#: ../libgaim/protocols/silc/ops.c:1027
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/buddy.c:695
+msgid "Operating System"
+msgstr "Sistema operativo"
+
+#: ../libgaim/protocols/jabber/buddy.c:666
+#: ../libgaim/protocols/jabber/jabber.c:1987
+msgid "Resource"
+msgstr "Recurso"
+
+#: ../libgaim/protocols/jabber/buddy.c:668
+#: ../libgaim/protocols/jabber/jabber.c:1226
+#: ../libgaim/protocols/jabber/jabber.c:1236
+#: ../libgaim/protocols/jabber/jabber.c:1246
+#: ../libgaim/protocols/jabber/jabber.c:1256
+#: ../libgaim/protocols/jabber/jabber.c:1266
+msgid "Priority"
+msgstr "Prioridad"
+
+#: ../libgaim/protocols/jabber/buddy.c:804
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: ../libgaim/protocols/jabber/buddy.c:823
-#: ../libgaim/protocols/jabber/jabber.c:810
-#: ../libgaim/protocols/oscar/oscar.c:3682
-#: ../libgaim/protocols/oscar/oscar.c:3690
-#: ../libgaim/protocols/qq/buddy_info.c:54
-#: ../libgaim/protocols/silc/ops.c:1063
+#: ../libgaim/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/jabber.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3763
+#: ../libgaim/protocols/oscar/oscar.c:3776
+#: ../libgaim/protocols/qq/buddy_info.c:56
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Dirección"
 
-#: ../libgaim/protocols/jabber/buddy.c:830
+#: ../libgaim/protocols/jabber/buddy.c:844
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libgaim/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1344
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../libgaim/protocols/jabber/buddy.c:1312
+#: ../libgaim/protocols/jabber/buddy.c:1348
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1320
+#: ../libgaim/protocols/jabber/buddy.c:1356
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: ../libgaim/protocols/jabber/buddy.c:1327
+#: ../libgaim/protocols/jabber/buddy.c:1363
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1336
+#: ../libgaim/protocols/jabber/buddy.c:1372
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../libgaim/protocols/jabber/buddy.c:1369
-#: ../libgaim/protocols/jabber/jabber.c:1222
+#: ../libgaim/protocols/jabber/buddy.c:1405
+#: ../libgaim/protocols/jabber/jabber.c:1235
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libgaim/protocols/jabber/buddy.c:1375
-#: ../libgaim/protocols/jabber/jabber.c:1252
-#: ../libgaim/protocols/oscar/oscar.c:688
-#: ../libgaim/protocols/oscar/oscar.c:5654
-#: ../libgaim/protocols/sametime/sametime.c:3273
+#: ../libgaim/protocols/jabber/buddy.c:1411
+#: ../libgaim/protocols/jabber/jabber.c:1265
+#: ../libgaim/protocols/oscar/oscar.c:706
+#: ../libgaim/protocols/oscar/oscar.c:5760
+#: ../libgaim/protocols/sametime/sametime.c:3319
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../libgaim/protocols/jabber/buddy.c:1520
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1524
-#: ../libgaim/protocols/jabber/buddy.c:1703
-#: ../libgaim/protocols/oscar/oscar.c:3631
+#: ../libgaim/protocols/jabber/buddy.c:1560
+#: ../libgaim/protocols/jabber/buddy.c:1739
+#: ../libgaim/protocols/oscar/oscar.c:3705
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libgaim/protocols/jabber/buddy.c:1592
 msgid "The following are the results of your search"
 msgstr "Éstos son los resultados de su búsqueda"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1631
+#: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
-msgstr "Encuentra un contacto al introducir los criterios de búsqueda en los campos proporcionados. Nota: puede hacer búsquedas con comodines (%) en cada campo."
-
-#: ../libgaim/protocols/jabber/buddy.c:1651
+msgstr ""
+"Encuentra un contacto al introducir los criterios de búsqueda en los campos "
+"proporcionados. Nota: puede hacer búsquedas con comodines (%) en cada campo."
+
+#: ../libgaim/protocols/jabber/buddy.c:1687
 msgid "Directory Query Failed"
 msgstr "Falló la consulta al directorio"
 
-#: ../libgaim/protocols/jabber/buddy.c:1652
+#: ../libgaim/protocols/jabber/buddy.c:1688
 msgid "Could not query the directory server."
 msgstr "No se pudo consultar con el servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1686
+#: ../libgaim/protocols/jabber/buddy.c:1722
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1693
+#: ../libgaim/protocols/jabber/buddy.c:1729
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Rellene uno o más de los campos mostrados a continuación para buscar a un "
 "usuario Jabber que los tengan."
 
-#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3633
-#: ../libgaim/protocols/oscar/oscar.c:3640
+#: ../libgaim/protocols/oscar/oscar.c:3708
+#: ../libgaim/protocols/oscar/oscar.c:3717
 msgid "E-Mail Address"
 msgstr "Dirección de correo electrónico"
 
-#: ../libgaim/protocols/jabber/buddy.c:1722
-#: ../libgaim/protocols/jabber/buddy.c:1723
+#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1759
 msgid "Search for Jabber users"
 msgstr "Buscar usuarios Jabber"
 
-#: ../libgaim/protocols/jabber/buddy.c:1737
+#: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../libgaim/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1790
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../libgaim/protocols/jabber/buddy.c:1755
+#: ../libgaim/protocols/jabber/buddy.c:1791
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1794
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
 #: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5137
+#: ../libgaim/protocols/oscar/oscar.c:5228
 #: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Sala:"
@@ -7811,502 +8340,501 @@
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: ../libgaim/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no es un nombre de sala válido"
 
-#: ../libgaim/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Nombre de sala inválido"
 
-#: ../libgaim/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no es un nombre de servidor válido"
 
-#: ../libgaim/protocols/jabber/chat.c:230
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:232
+#: ../libgaim/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: ../libgaim/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no es un indicador de sala válido"
 
-#: ../libgaim/protocols/jabber/chat.c:236
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:238
+#: ../libgaim/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "Indicador de sala inválido"
 
-#: ../libgaim/protocols/jabber/chat.c:396
+#: ../libgaim/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Error de configuración"
 
-#: ../libgaim/protocols/jabber/chat.c:405
-#: ../libgaim/protocols/jabber/chat.c:548
+#: ../libgaim/protocols/jabber/chat.c:407
+#: ../libgaim/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "No se pudo configurar"
 
-#: ../libgaim/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "Error de configuración de sala"
 
-#: ../libgaim/protocols/jabber/chat.c:421
+#: ../libgaim/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr "Esta sala no es capaz de ser configurada"
 
-#: ../libgaim/protocols/jabber/chat.c:470
-#: ../libgaim/protocols/jabber/chat.c:539
+#: ../libgaim/protocols/jabber/chat.c:472
+#: ../libgaim/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "Error de registro"
 
-#: ../libgaim/protocols/jabber/chat.c:627
+#: ../libgaim/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "El cambio de apodo no está soportado en salas de chat no-MUC"
 
-#: ../libgaim/protocols/jabber/chat.c:678
-#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1448
+#: ../libgaim/protocols/jabber/chat.c:680
+#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
 
-#: ../libgaim/protocols/jabber/chat.c:737
+#: ../libgaim/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Nombre de servidor no válido"
 
-#: ../libgaim/protocols/jabber/chat.c:775
+#: ../libgaim/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Introducir un servidor de conferencias"
 
-#: ../libgaim/protocols/jabber/chat.c:776
+#: ../libgaim/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Selecciona un servidor de conferencias al que consultar"
 
-#: ../libgaim/protocols/jabber/chat.c:779
+#: ../libgaim/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libgaim/protocols/jabber/jabber.c:81
+#: ../libgaim/protocols/jabber/jabber.c:82
 msgid "Error initializing session"
 msgstr "Error al inicializar la sesión"
 
-#: ../libgaim/protocols/jabber/jabber.c:240
-#: ../libgaim/protocols/jabber/jabber.c:291
-#: ../libgaim/protocols/jabber/jabber.c:319
+#: ../libgaim/protocols/jabber/jabber.c:241
+#: ../libgaim/protocols/jabber/jabber.c:294
+#: ../libgaim/protocols/jabber/jabber.c:322
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: ../libgaim/protocols/jabber/jabber.c:387
-#: ../libgaim/protocols/jabber/jabber.c:424
+#: ../libgaim/protocols/jabber/jabber.c:390
+#: ../libgaim/protocols/jabber/jabber.c:427
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libgaim/protocols/jabber/jabber.c:497
-#: ../libgaim/protocols/jabber/jabber.c:930
+#: ../libgaim/protocols/jabber/jabber.c:504
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libgaim/protocols/jabber/jabber.c:545
-#: ../libgaim/protocols/jabber/jabber.c:888
+#: ../libgaim/protocols/jabber/jabber.c:552
+#: ../libgaim/protocols/jabber/jabber.c:895
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: ../libgaim/protocols/jabber/jabber.c:616
+#: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
 
-#: ../libgaim/protocols/jabber/jabber.c:618
-#: ../libgaim/protocols/jabber/jabber.c:619
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:626
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: ../libgaim/protocols/jabber/jabber.c:625
-#: ../libgaim/protocols/jabber/jabber.c:1488
+#: ../libgaim/protocols/jabber/jabber.c:632
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: ../libgaim/protocols/jabber/jabber.c:627
-#: ../libgaim/protocols/jabber/jabber.c:628
+#: ../libgaim/protocols/jabber/jabber.c:634
+#: ../libgaim/protocols/jabber/jabber.c:635
 msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: ../libgaim/protocols/jabber/jabber.c:743
-#: ../libgaim/protocols/jabber/jabber.c:744
+#: ../libgaim/protocols/jabber/jabber.c:750
+#: ../libgaim/protocols/jabber/jabber.c:751
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: ../libgaim/protocols/jabber/jabber.c:820
-#: ../libgaim/protocols/oscar/oscar.c:3684
-#: ../libgaim/protocols/oscar/oscar.c:3692
+#: ../libgaim/protocols/jabber/jabber.c:827
+#: ../libgaim/protocols/oscar/oscar.c:3765
+#: ../libgaim/protocols/oscar/oscar.c:3778
 msgid "State"
 msgstr "Estado"
 
-#: ../libgaim/protocols/jabber/jabber.c:825
+#: ../libgaim/protocols/jabber/jabber.c:832
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../libgaim/protocols/jabber/jabber.c:830
-#: ../libgaim/protocols/silc/ops.c:1068 ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/jabber/jabber.c:837
+#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
 #: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../libgaim/protocols/jabber/jabber.c:840
+#: ../libgaim/protocols/jabber/jabber.c:847
 msgid "Date"
 msgstr "Fecha"
 
-#: ../libgaim/protocols/jabber/jabber.c:848
+#: ../libgaim/protocols/jabber/jabber.c:855
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."
 
-#: ../libgaim/protocols/jabber/jabber.c:851
-#: ../libgaim/protocols/jabber/jabber.c:852
+#: ../libgaim/protocols/jabber/jabber.c:858
+#: ../libgaim/protocols/jabber/jabber.c:859
 msgid "Register New Jabber Account"
 msgstr "Registrando cuenta nueva de Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1013
+#: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/jabber/jabber.c:1030
 #: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libgaim/protocols/jabber/jabber.c:1027
+#: ../libgaim/protocols/jabber/jabber.c:1039
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1101
-#: ../libgaim/protocols/jabber/jabber.c:1466
-#: ../libgaim/protocols/jabber/jabber.c:1507
-#: ../libgaim/protocols/jabber/jabber.c:1541
-#: ../libgaim/protocols/oscar/oscar.c:766
-#: ../libgaim/protocols/oscar/oscar.c:5443
+#: ../libgaim/protocols/jabber/jabber.c:1109
+#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1554
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:5549
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1143
+#: ../libgaim/protocols/jabber/jabber.c:1151
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libgaim/protocols/jabber/jabber.c:1145
+#: ../libgaim/protocols/jabber/jabber.c:1153
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1150
+#: ../libgaim/protocols/jabber/jabber.c:1158
 msgid "To"
 msgstr "A"
 
-#: ../libgaim/protocols/jabber/jabber.c:1152
+#: ../libgaim/protocols/jabber/jabber.c:1160
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1156
+#: ../libgaim/protocols/jabber/jabber.c:1165
 msgid "Subscription"
 msgstr "Subscripción"
 
-#: ../libgaim/protocols/jabber/jabber.c:1282
+#: ../libgaim/protocols/jabber/jabber.c:1295
 msgid "Password Changed"
 msgstr "Contraseña modificada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1283
+#: ../libgaim/protocols/jabber/jabber.c:1296
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: ../libgaim/protocols/jabber/jabber.c:1287
-#: ../libgaim/protocols/jabber/jabber.c:1288
+#: ../libgaim/protocols/jabber/jabber.c:1300
+#: ../libgaim/protocols/jabber/jabber.c:1301
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: ../libgaim/protocols/jabber/jabber.c:1344
+#: ../libgaim/protocols/jabber/jabber.c:1357
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1349
-#: ../libgaim/protocols/jabber/jabber.c:1350
+#: ../libgaim/protocols/jabber/jabber.c:1362
+#: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Change Jabber Password"
 msgstr "Cambiar contraseña de Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1350
+#: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: ../libgaim/protocols/jabber/jabber.c:1360
-#: ../libgaim/protocols/oscar/oscar.c:6245
-#: ../libgaim/protocols/silc/silc.c:1023
+#: ../libgaim/protocols/jabber/jabber.c:1373
+#: ../libgaim/protocols/oscar/oscar.c:6355
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "Establecer su información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1365
-#: ../libgaim/protocols/oscar/oscar.c:6256
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libgaim/protocols/jabber/jabber.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:6366
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "Cambiar su contraseña..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1370
+#: ../libgaim/protocols/jabber/jabber.c:1383
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1446
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: ../libgaim/protocols/jabber/jabber.c:1448
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1450
+#: ../libgaim/protocols/jabber/jabber.c:1463
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1452
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1454
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Gone"
 msgstr "Se fue"
 
-#: ../libgaim/protocols/jabber/jabber.c:1456
-#: ../libgaim/protocols/jabber/jabber.c:1531
+#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../libgaim/protocols/jabber/jabber.c:1458
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1460
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber no válido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1462
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: ../libgaim/protocols/jabber/jabber.c:1464
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1468
+#: ../libgaim/protocols/jabber/jabber.c:1481
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../libgaim/protocols/jabber/jabber.c:1470
+#: ../libgaim/protocols/jabber/jabber.c:1483
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: ../libgaim/protocols/jabber/jabber.c:1474
+#: ../libgaim/protocols/jabber/jabber.c:1487
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: ../libgaim/protocols/jabber/jabber.c:1476
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1478
+#: ../libgaim/protocols/jabber/jabber.c:1491
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1480
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1482
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libgaim/protocols/jabber/jabber.c:1484
+#: ../libgaim/protocols/jabber/jabber.c:1497
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"
 
-#: ../libgaim/protocols/jabber/jabber.c:1486
+#: ../libgaim/protocols/jabber/jabber.c:1499
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1493
+#: ../libgaim/protocols/jabber/jabber.c:1506
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libgaim/protocols/jabber/jabber.c:1508
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"
 
-#: ../libgaim/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1511
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1501
+#: ../libgaim/protocols/jabber/jabber.c:1514
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1504
+#: ../libgaim/protocols/jabber/jabber.c:1517
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../libgaim/protocols/jabber/jabber.c:1509
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"
 
-#: ../libgaim/protocols/jabber/jabber.c:1512
+#: ../libgaim/protocols/jabber/jabber.c:1525
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"
 
-#: ../libgaim/protocols/jabber/jabber.c:1516
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1518
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1521
+#: ../libgaim/protocols/jabber/jabber.c:1534
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../libgaim/protocols/jabber/jabber.c:1523
-#: ../libgaim/protocols/silc/ops.c:1726
+#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libgaim/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"
 
-#: ../libgaim/protocols/jabber/jabber.c:1525
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1527
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1529
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1533
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1535
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1537
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1539
+#: ../libgaim/protocols/jabber/jabber.c:1552
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: ../libgaim/protocols/jabber/jabber.c:1543
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Policy Violation"
 msgstr "Violación de la política"
 
-#: ../libgaim/protocols/jabber/jabber.c:1545
+#: ../libgaim/protocols/jabber/jabber.c:1558
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"
 
-#: ../libgaim/protocols/jabber/jabber.c:1547
+#: ../libgaim/protocols/jabber/jabber.c:1560
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: ../libgaim/protocols/jabber/jabber.c:1549
+#: ../libgaim/protocols/jabber/jabber.c:1562
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: ../libgaim/protocols/jabber/jabber.c:1551
+#: ../libgaim/protocols/jabber/jabber.c:1564
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: ../libgaim/protocols/jabber/jabber.c:1553
+#: ../libgaim/protocols/jabber/jabber.c:1566
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: ../libgaim/protocols/jabber/jabber.c:1555
+#: ../libgaim/protocols/jabber/jabber.c:1568
 msgid "Undefined Condition"
 msgstr "Condición no definida"
 
-#: ../libgaim/protocols/jabber/jabber.c:1557
+#: ../libgaim/protocols/jabber/jabber.c:1570
 msgid "Unsupported Encoding"
 msgstr "Codificación no soportada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1559
+#: ../libgaim/protocols/jabber/jabber.c:1572
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1561
+#: ../libgaim/protocols/jabber/jabber.c:1574
 msgid "Unsupported Version"
 msgstr "Versión no soportada"
 
-#: ../libgaim/protocols/jabber/jabber.c:1563
+#: ../libgaim/protocols/jabber/jabber.c:1576
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: ../libgaim/protocols/jabber/jabber.c:1565
+#: ../libgaim/protocols/jabber/jabber.c:1578
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1632
+#: ../libgaim/protocols/jabber/jabber.c:1645
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1652
+#: ../libgaim/protocols/jabber/jabber.c:1665
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación desconocida: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1657
+#: ../libgaim/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No se pudo afiliar al usuario %s como \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1676
+#: ../libgaim/protocols/jabber/jabber.c:1689
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1683
+#: ../libgaim/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "No se pudo establecer el rol \"%s\" para el usuario: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1736
+#: ../libgaim/protocols/jabber/jabber.c:1749
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1767
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: ../libgaim/protocols/jabber/jabber.c:1771
+#: ../libgaim/protocols/jabber/jabber.c:1784
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: ../libgaim/protocols/jabber/jabber.c:1780
+#: ../libgaim/protocols/jabber/jabber.c:1793
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."
 
-#: ../libgaim/protocols/jabber/jabber.c:1785
+#: ../libgaim/protocols/jabber/jabber.c:1798
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: ../libgaim/protocols/jabber/jabber.c:1791
+#: ../libgaim/protocols/jabber/jabber.c:1804
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: ../libgaim/protocols/jabber/jabber.c:1797
+#: ../libgaim/protocols/jabber/jabber.c:1810
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1803
+#: ../libgaim/protocols/jabber/jabber.c:1816
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -8314,7 +8842,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
 "la afiliación de un usuario a la sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1809
+#: ../libgaim/protocols/jabber/jabber.c:1822
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -8322,20 +8850,20 @@
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1815
+#: ../libgaim/protocols/jabber/jabber.c:1828
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1821
+#: ../libgaim/protocols/jabber/jabber.c:1834
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
 
-#: ../libgaim/protocols/jabber/jabber.c:1827
+#: ../libgaim/protocols/jabber/jabber.c:1840
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: ../libgaim/protocols/jabber/jabber.c:1832
+#: ../libgaim/protocols/jabber/jabber.c:1845
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -8351,27 +8879,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1948
-#: ../libgaim/protocols/jabber/jabber.c:1950
+#: ../libgaim/protocols/jabber/jabber.c:1962
+#: ../libgaim/protocols/jabber/jabber.c:1964
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1976
+#: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo (puerto 5323)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1981
+#: ../libgaim/protocols/jabber/jabber.c:1995
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
 
-#: ../libgaim/protocols/jabber/jabber.c:1986
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libgaim/protocols/jabber/jabber.c:2000
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Connect port"
 msgstr "Puerto de conexión"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:1990
-#: ../libgaim/protocols/silc/silc.c:1855
+#: ../libgaim/protocols/jabber/jabber.c:2004
+#: ../libgaim/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
@@ -8404,38 +8932,20 @@
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:179
+#: ../libgaim/protocols/jabber/parser.c:192
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../libgaim/protocols/jabber/presence.c:304
+#: ../libgaim/protocols/jabber/presence.c:280
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../libgaim/protocols/jabber/presence.c:309
-#: ../libgaim/protocols/msn/userlist.c:98
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
-
-#: ../libgaim/protocols/jabber/presence.c:318
-#: ../libgaim/protocols/oscar/oscar.c:2357
-#: ../libgaim/protocols/oscar/oscar.c:5068
-msgid "_Authorize"
-msgstr "_Autorizar"
-
-#: ../libgaim/protocols/jabber/presence.c:319
-#: ../libgaim/protocols/oscar/oscar.c:2359
-#: ../libgaim/protocols/oscar/oscar.c:5069
-msgid "_Deny"
-msgstr "_Denegar"
-
-#: ../libgaim/protocols/jabber/presence.c:376
-#: ../libgaim/protocols/jabber/presence.c:377
+#: ../libgaim/protocols/jabber/presence.c:354
+#: ../libgaim/protocols/jabber/presence.c:355
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../libgaim/protocols/jabber/presence.c:378
+#: ../libgaim/protocols/jabber/presence.c:356
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8443,20 +8953,20 @@
 "Va a crear una sala nueva. ¿Desea configurarla o aceptar los valores por "
 "omisión?"
 
-#: ../libgaim/protocols/jabber/presence.c:381
+#: ../libgaim/protocols/jabber/presence.c:359
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libgaim/protocols/jabber/presence.c:383
+#: ../libgaim/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#: ../libgaim/protocols/jabber/presence.c:421
+#: ../libgaim/protocols/jabber/presence.c:399
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: ../libgaim/protocols/jabber/presence.c:424
+#: ../libgaim/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
@@ -8512,23 +9022,23 @@
 msgstr "El usuario no existe"
 
 #: ../libgaim/protocols/msn/error.c:49
-msgid "Fully Qualified Domain Name missing"
+msgid "Fully qualified domain name missing"
 msgstr "Falta un nombre de dominio totalmente cualificado"
 
 #: ../libgaim/protocols/msn/error.c:52
-msgid "Already Logged In"
+msgid "Already logged in"
 msgstr "Ya está conectado"
 
 #: ../libgaim/protocols/msn/error.c:55
-msgid "Invalid Username"
+msgid "Invalid screen name"
 msgstr "Nombre de usuario no válido"
 
 #: ../libgaim/protocols/msn/error.c:58
-msgid "Invalid Friendly Name"
+msgid "Invalid friendly name"
 msgstr "Nombre de amigo no válido"
 
 #: ../libgaim/protocols/msn/error.c:61
-msgid "List Full"
+msgid "List full"
 msgstr "Lista llena"
 
 #: ../libgaim/protocols/msn/error.c:64
@@ -8581,7 +9091,7 @@
 msgstr "Falló el servidor Switchboard"
 
 #: ../libgaim/protocols/msn/error.c:102
-msgid "Notify Transfer failed"
+msgid "Notify transfer failed"
 msgstr "Falló la notificación de la transferencia"
 
 #: ../libgaim/protocols/msn/error.c:106
@@ -8592,12 +9102,12 @@
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados de un FND"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
 #: ../libgaim/protocols/msn/error.c:116
-msgid "Service Temporarily Unavailable"
+msgid "Service temporarily unavailable"
 msgstr "Servicio no disponible temporalmente"
 
 #: ../libgaim/protocols/msn/error.c:119
@@ -8632,7 +9142,7 @@
 # «Peer» no tiene una traducción fácil, he elegido 'pares' (de par, o igual)
 # Acepto otras alternativas (pero no dejarlo igual) jfs.
 #: ../libgaim/protocols/msn/error.c:141
-msgid "Peer Notification server down"
+msgid "Peer notification server down"
 msgstr "Servidor de notificación de pares caído"
 
 #: ../libgaim/protocols/msn/error.c:144
@@ -8690,9 +9200,9 @@
 msgstr "Servidor muy ocupado"
 
 #: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1310
-#: ../libgaim/protocols/silc/ops.c:1715 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1344
+#: ../libgaim/protocols/oscar/oscar.c:1355
+#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
@@ -8726,39 +9236,39 @@
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:111
 msgid "You have just sent a Nudge!"
 msgstr "¡Le acaban de enviar un codazo!"
 
-#: ../libgaim/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:136
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#: ../libgaim/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:244
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
 
-#: ../libgaim/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:245
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Éste es el nombre bajo el que otros amigos MSN le verán."
 
-#: ../libgaim/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:261
 msgid "Set your home phone number."
 msgstr "Establezca el número de teléfono de su domicilio."
 
-#: ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:276
 msgid "Set your work phone number."
 msgstr "Establezca el número de teléfono de su trabajo."
 
-#: ../libgaim/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:291
 msgid "Set your mobile phone number."
 msgstr "Establezca su número de teléfono móvil."
 
-#: ../libgaim/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:304
 msgid "Allow MSN Mobile pages?"
 msgstr "¿Permitir los envíos de MSN Mobile?"
 
-#: ../libgaim/protocols/msn/msn.c:307
+#: ../libgaim/protocols/msn/msn.c:305
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -8766,65 +9276,52 @@
 "¿Quiere permitir o rechazar el envío de mensajes a través de MSN Mobile a su "
 "teléfono móvil (u otro dispositivo móvil) de la gente en su lista de amigos?"
 
-#: ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:309
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libgaim/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:310
 msgid "Disallow"
 msgstr "Rechazar"
 
-#: ../libgaim/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:326
 msgid "This Hotmail account may not be active."
 msgstr "Puede que esta cuenta de Hotmail no esté activa."
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:352
 msgid "Send a mobile message."
 msgstr "Enviar un mensaje a un móvil."
 
-#: ../libgaim/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
-#: ../libgaim/protocols/msn/msn.c:562
-#: ../libgaim/protocols/sametime/sametime.c:3235
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
-#: ../libgaim/protocols/yahoo/yahoo.c:3038
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
 #: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Le tiene"
 
 #: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2861
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libgaim/protocols/yahoo/yahoo.c:2856
+#: ../libgaim/protocols/yahoo/yahoo.c:3460
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
 #: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2859
-#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/novell/novell.c:2857
+#: ../libgaim/protocols/novell/novell.c:2987
 #: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2863
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libgaim/protocols/yahoo/yahoo.c:2858
+#: ../libgaim/protocols/yahoo/yahoo.c:3463
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
-#: ../libgaim/protocols/yahoo/yahoo.c:3487
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "Out to Lunch"
 msgstr "Salí a comer"
 
@@ -8861,7 +9358,7 @@
 msgstr "Enviar a un móvil"
 
 #: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3449
+#: ../libgaim/protocols/novell/novell.c:3443
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
 
@@ -8877,237 +9374,207 @@
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libgaim/protocols/msn/msn.c:1363
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
-#: ../libgaim/protocols/zephyr/zephyr.c:788
-#: ../libgaim/protocols/zephyr/zephyr.c:1205
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<B>Apodo:</b> %s<br>"
-
-#. put a link to the actual profile URL
-#: ../libgaim/protocols/msn/msn.c:1370
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1221 ../libgaim/util.c:1109
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b>"
-
-#: ../libgaim/protocols/msn/msn.c:1462
-msgid "MSN Profile"
-msgstr "Perfil MSN"
-
-#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
+#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
+#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Edad"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/msn/msn.c:1542
 #: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
+#: ../libgaim/protocols/zephyr/zephyr.c:799
+#: ../libgaim/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
-#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
+#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
+#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
-#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
-#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
+#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
+#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
+#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"
 
-#: ../libgaim/protocols/msn/msn.c:1557
-#, c-format
-msgid "%s<b>General</b><br>%s"
-msgstr "%s<b>General</b><br>%s"
-
-#. Social
-#: ../libgaim/protocols/msn/msn.c:1566
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
+#: ../libgaim/protocols/msn/msn.c:1570
+msgid "Social"
+msgstr "Social"
+
+#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libgaim/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Interests"
 msgstr "Aficiones"
 
-#: ../libgaim/protocols/msn/msn.c:1568
+#: ../libgaim/protocols/msn/msn.c:1574
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libgaim/protocols/msn/msn.c:1569
+#: ../libgaim/protocols/msn/msn.c:1575
 msgid "Hometown"
 msgstr "Ciudad donde vive"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libgaim/protocols/msn/msn.c:1576
 msgid "Places Lived"
 msgstr "Lugares donde he vivido"
 
-#: ../libgaim/protocols/msn/msn.c:1571
+#: ../libgaim/protocols/msn/msn.c:1577
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/msn/msn.c:1578
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libgaim/protocols/msn/msn.c:1579
 msgid "Music"
 msgstr "Música"
 
-#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
-#: ../libgaim/protocols/msn/msn.c:1753
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
+#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1767
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libgaim/protocols/msn/msn.c:1578
-#, c-format
-msgid "%s<b>Social</b><br>%s"
-msgstr "%s<b>Social</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1597
+msgid "Contact Info"
+msgstr "Información del contacto"
+
+#: ../libgaim/protocols/msn/msn.c:1598
+msgid "Personal"
+msgstr "Personal"
+
+#: ../libgaim/protocols/msn/msn.c:1601
 msgid "Significant Other"
 msgstr "Otra persona importante"
 
-#: ../libgaim/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1602
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: ../libgaim/protocols/msn/msn.c:1589
+#: ../libgaim/protocols/msn/msn.c:1603
 msgid "Home Phone 2"
 msgstr "Teléfono de casa (2)"
 
-#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
+#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libgaim/protocols/msn/msn.c:1591
+#: ../libgaim/protocols/msn/msn.c:1605
 msgid "Personal Mobile"
 msgstr "Móvil personal"
 
-#: ../libgaim/protocols/msn/msn.c:1592
+#: ../libgaim/protocols/msn/msn.c:1606
 msgid "Home Fax"
 msgstr "Fax personal"
 
-#: ../libgaim/protocols/msn/msn.c:1593
+#: ../libgaim/protocols/msn/msn.c:1607
 msgid "Personal E-Mail"
 msgstr "Correo-e personal"
 
-#: ../libgaim/protocols/msn/msn.c:1594
+#: ../libgaim/protocols/msn/msn.c:1608
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libgaim/protocols/msn/msn.c:1596
+#: ../libgaim/protocols/msn/msn.c:1610
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
-msgid "Notes"
-msgstr "Notas"
-
-#: ../libgaim/protocols/msn/msn.c:1601
-#, c-format
-msgid "<br><b>Personal</b><br>%s"
-msgstr "<br><b>Personal</b><br>%s"
+#. Business
+#: ../libgaim/protocols/msn/msn.c:1626
+msgid "Work"
+msgstr "Trabajo"
 
 # Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
-#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1043
+#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
-#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
+#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
 msgid "Company"
 msgstr "Compañía"
 
-#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1630
 #: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libgaim/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1631
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../libgaim/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1632
 msgid "Work Phone"
 msgstr "Teléfono del trabajo"
 
-#: ../libgaim/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1633
 msgid "Work Phone 2"
 msgstr "Teléfono del trabajo (2)"
 
-#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
+#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
 msgid "Work Address"
 msgstr "Dirección del trabajo"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../libgaim/protocols/msn/msn.c:1616
+#: ../libgaim/protocols/msn/msn.c:1635
 msgid "Work Mobile"
 msgstr "Móvil del trabajo"
 
-#: ../libgaim/protocols/msn/msn.c:1617
+#: ../libgaim/protocols/msn/msn.c:1636
 msgid "Work Pager"
 msgstr "Buscapersonas del trabajo"
 
-#: ../libgaim/protocols/msn/msn.c:1618
+#: ../libgaim/protocols/msn/msn.c:1637
 msgid "Work Fax"
 msgstr "Fax del trabajo"
 
-#: ../libgaim/protocols/msn/msn.c:1619
+#: ../libgaim/protocols/msn/msn.c:1638
 msgid "Work E-Mail"
 msgstr "Correo-e del trabajo"
 
-#: ../libgaim/protocols/msn/msn.c:1620
+#: ../libgaim/protocols/msn/msn.c:1639
 msgid "Work IM"
 msgstr "MI del trabajo"
 
-#: ../libgaim/protocols/msn/msn.c:1621
+#: ../libgaim/protocols/msn/msn.c:1640
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#: ../libgaim/protocols/msn/msn.c:1626
-#, c-format
-msgid "<br><b>Business</b><br>%s"
-msgstr "<br><b>Negocio</b><br>%s"
-
-#: ../libgaim/protocols/msn/msn.c:1637
-#, c-format
-msgid "<hr><b>Contact Info</b>%s%s"
-msgstr "<hr><b>Información de contacto</b>%s%s"
-
-#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
-#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1775
 msgid "Last Updated"
 msgstr "Actualizado por última vez"
 
-#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
-#: ../libgaim/protocols/silc/ops.c:1059
+#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
+#: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../libgaim/protocols/msn/msn.c:1798
+#: ../libgaim/protocols/msn/msn.c:1807
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil público."
 
-#: ../libgaim/protocols/msn/msn.c:1799
+#: ../libgaim/protocols/msn/msn.c:1808
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -9117,7 +9584,7 @@
 "que o bien el usuario no existe o que el usuario existe pero no ha creado un "
 "perfil público."
 
-#: ../libgaim/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1812
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -9125,14 +9592,8 @@
 "Gaim no pudo encontrar información en el perfil de usuario. Es probable que "
 "el usuario no exista."
 
-#. put a link to the actual profile URL
-#: ../libgaim/protocols/msn/msn.c:1808
-#, c-format
-msgid "<hr><b>%s:</b> "
-msgstr "<hr><b>%s:</b> "
-
-#: ../libgaim/protocols/msn/msn.c:1808
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1221
+#: ../libgaim/protocols/msn/msn.c:1820
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL del perfil"
 
@@ -9146,19 +9607,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
+#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../libgaim/protocols/msn/msn.c:2063
+#: ../libgaim/protocols/msn/msn.c:2065
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libgaim/protocols/msn/msn.c:2068
+#: ../libgaim/protocols/msn/msn.c:2070
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#: ../libgaim/protocols/msn/msn.c:2076
+#: ../libgaim/protocols/msn/msn.c:2078
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atención"
 
@@ -9168,15 +9629,15 @@
 #: ../libgaim/protocols/qq/qq_proxy.c:321
 #: ../libgaim/protocols/qq/qq_proxy.c:366
 #: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
 #: ../libgaim/protocols/yahoo/yahoochat.c:1357
 #: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
@@ -9221,7 +9682,7 @@
 #: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s no es un nombre de cuenta «passport» váida."
+msgstr "%s no es un nombre de cuenta «passport» válida."
 
 #: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
@@ -9292,7 +9753,7 @@
 msgstr "Error en el análisis HTTP."
 
 #: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/oscar/oscar.c:3467
 #: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicación."
@@ -9388,158 +9849,141 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#: ../libgaim/protocols/msn/switchboard.c:952
+#: ../libgaim/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "¡%s le acaba de dar un codazo!"
 
-#: ../libgaim/protocols/msn/userlist.c:90
-#, 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."
-
-#: ../libgaim/protocols/msn/userlist.c:105
-#: ../libgaim/protocols/yahoo/yahoo.c:1002
-msgid "Authorize"
-msgstr "Autorizar"
-
-#: ../libgaim/protocols/msn/userlist.c:106
-#: ../libgaim/protocols/yahoo/yahoo.c:1004
-msgid "Deny"
-msgstr "Denegar"
-
-#: ../libgaim/protocols/msn/userlist.c:280
+#: ../libgaim/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "El usuario %s lo ha añadido a su lista de amigos."
 
-#: ../libgaim/protocols/msn/userlist.c:349
+#: ../libgaim/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "El usuario %s lo ha quitado de su lista de amigos."
 
-#: ../libgaim/protocols/msn/userlist.c:671
+#: ../libgaim/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo añadir a \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:673
+#: ../libgaim/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "El nombre de usuario especificado no es válido."
 
-#: ../libgaim/protocols/novell/nmuser.c:1869
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr "No se han recibido los parámetros requeridos"
 
-#: ../libgaim/protocols/novell/nmuser.c:1872
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
 msgstr "No se pudo escribir en la red"
 
-#: ../libgaim/protocols/novell/nmuser.c:1875
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
 msgstr "No se pudo leer de la red"
 
-#: ../libgaim/protocols/novell/nmuser.c:1878
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
 msgstr "Error comunicándose con el servidor"
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
 msgstr "Conferencia no encontrada"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
 msgstr "La conferencia no existe"
 
-#: ../libgaim/protocols/novell/nmuser.c:1889
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
 msgstr "No soportado"
 
-#: ../libgaim/protocols/novell/nmuser.c:1896
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "La contraseña ha expirado"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
-msgid "Invalid password"
-msgstr "Contraseña inválida"
-
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libgaim/protocols/novell/nmuser.c:1909
+msgid "Incorrect password"
+msgstr "Contraseña incorrecta"
+
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: ../libgaim/protocols/novell/nmuser.c:1905
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
 msgstr "La cuenta ha sido deshabilitada"
 
-#: ../libgaim/protocols/novell/nmuser.c:1908
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr "El servidor no pudo acceder al directorio"
 
-#: ../libgaim/protocols/novell/nmuser.c:1911
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
 msgstr "Esta opción ha sido deshabilitada por su administrado"
 
-#: ../libgaim/protocols/novell/nmuser.c:1914
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
 msgstr "El servidor no está disponible, inténtelo de nuevo más tarde"
 
-#: ../libgaim/protocols/novell/nmuser.c:1917
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr "No se puede añadir un contacto a la misma carpeta dos veces"
 
-#: ../libgaim/protocols/novell/nmuser.c:1920
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
 msgstr "No se puede añadir uno mismo"
 
-#: ../libgaim/protocols/novell/nmuser.c:1923
-msgid "Master archive is misconfigured"
-msgstr "El archivo maestro no está bien configurado"
-
-#: ../libgaim/protocols/novell/nmuser.c:1927
-msgid "Invalid username or password"
-msgstr "Nombre o contraseña de usuario no válido"
-
-#: ../libgaim/protocols/novell/nmuser.c:1930
-msgid "Could not recognize the host of the username you entered"
-msgstr "No se reconoció el servidor del usuario que introdujo"
-
 #: ../libgaim/protocols/novell/nmuser.c:1933
-msgid ""
-"Your account has been disabled because too many invalid passwords were "
-"entered"
-msgstr ""
-"Su cuenta ha sido deshabilitada porque se introdujo demasiadas veces una "
-"contraseña inválida"
-
-#: ../libgaim/protocols/novell/nmuser.c:1936
-msgid "You cannot add the same person twice to a conversation"
-msgstr "No puede añadir la misma persona dos veces a una conversación"
+msgid "Master archive is misconfigured"
+msgstr "El archivo maestro no está bien configurado"
+
+#: ../libgaim/protocols/novell/nmuser.c:1937
+msgid "Incorrect screen name or password"
+msgstr "Nombre de cuenta o contraseña incorrecta"
 
 #: ../libgaim/protocols/novell/nmuser.c:1940
-msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Alcanzó el límite del número de contactos permitidos"
+msgid "Could not recognize the host of the screen name you entered"
+msgstr "No se reconoció el servidor del usuario que introdujo"
 
 #: ../libgaim/protocols/novell/nmuser.c:1943
-msgid "You have entered an invalid username"
-msgstr "El nombre de usuario que ha introducido no es válido"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr "Su cuenta ha sido deshabilitada porque se han introducido demasiadas contraseña inválidas"
 
 #: ../libgaim/protocols/novell/nmuser.c:1946
+msgid "You cannot add the same person twice to a conversation"
+msgstr "No puede añadir la misma persona dos veces a una conversación"
+
+#: ../libgaim/protocols/novell/nmuser.c:1950
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "Alcanzó el límite del número de contactos permitidos"
+
+#: ../libgaim/protocols/novell/nmuser.c:1953
+msgid "You have entered an incorrect screen name"
+msgstr "El nombre de usuario que ha introducido no es válido"
+
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr "Se produjo un error al actualizar el directorio"
 
-#: ../libgaim/protocols/novell/nmuser.c:1949
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr "Versión de protocolo incompatible"
 
-#: ../libgaim/protocols/novell/nmuser.c:1952
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "El usuario le ha bloqueado"
 
-#: ../libgaim/protocols/novell/nmuser.c:1955
+#: ../libgaim/protocols/novell/nmuser.c:1965
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -9547,11 +9991,11 @@
 "Esta versión de evaluación no permite la conexión simultánea de más de diez "
 "usuarios"
 
-#: ../libgaim/protocols/novell/nmuser.c:1958
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "El usuario no está conectado o vd. está siendo bloqueado"
 
-#: ../libgaim/protocols/novell/nmuser.c:1961
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
@@ -9641,7 +10085,7 @@
 msgstr "No se pudo eliminar «%s» de su lista de privacidad (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:1650
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "No se pudieron cambiar las opciones de privacidad del servidor (%s)."
@@ -9652,7 +10096,7 @@
 msgstr "No se pudo crear la conferencia (%s)."
 
 #: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1697
+#: ../libgaim/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr "Error comunicándose con el servidor. Se cerrará la conexión."
 
@@ -9668,52 +10112,52 @@
 msgid "Mailstop"
 msgstr "Buzón de correo"
 
-#: ../libgaim/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/novell/novell.c:1505
+#: ../libgaim/protocols/sametime/sametime.c:4142
 msgid "User ID"
 msgstr "ID de usuario"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
-#. tag, value);
+#. gaim_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
 #: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../libgaim/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../libgaim/protocols/novell/novell.c:1673
+#: ../libgaim/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr "No se pudo establecer una conexión SSL con el servidor."
 
-#: ../libgaim/protocols/novell/novell.c:1725
+#: ../libgaim/protocols/novell/novell.c:1723
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libgaim/protocols/novell/novell.c:1737
+#: ../libgaim/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libgaim/protocols/novell/novell.c:1740
+#: ../libgaim/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
-#: ../libgaim/protocols/novell/novell.c:1875
+#: ../libgaim/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Se ha invitado a %s a esta conversación."
 
-#: ../libgaim/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1901
 msgid "Invitation to Conversation"
 msgstr "Invitación a una conversación"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libgaim/protocols/novell/novell.c:1902
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9724,17 +10168,17 @@
 "\n"
 "Enviada: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1906
+#: ../libgaim/protocols/novell/novell.c:1904
 msgid "Would you like to join the conversation?"
 msgstr "¿Desea unirse a la conversación?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2015
+#: ../libgaim/protocols/novell/novell.c:2013
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
 
-#: ../libgaim/protocols/novell/novell.c:2072
+#: ../libgaim/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -9746,7 +10190,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2170
+#: ../libgaim/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -9754,11 +10198,11 @@
 "No se pudo contactar con el servidor. Por favor, indique la dirección del "
 "servidor con el que desea conectarse."
 
-#: ../libgaim/protocols/novell/novell.c:2198
+#: ../libgaim/protocols/novell/novell.c:2196
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no está instalado."
 
-#: ../libgaim/protocols/novell/novell.c:2507
+#: ../libgaim/protocols/novell/novell.c:2505
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 
@@ -9772,33 +10216,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3552
-#: ../libgaim/protocols/novell/novell.c:3554
+#: ../libgaim/protocols/novell/novell.c:3548
+#: ../libgaim/protocols/novell/novell.c:3550
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensajería de Grupos de Novell"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libgaim/protocols/novell/novell.c:3569
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: ../libgaim/protocols/novell/novell.c:3577
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:237
-#: ../libgaim/protocols/yahoo/yahoo.c:2268
-#: ../libgaim/protocols/yahoo/yahoo.c:2426
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:570
-#: ../libgaim/proxy.c:1078 ../libgaim/proxy.c:1189 ../libgaim/proxy.c:1289
-#: ../libgaim/proxy.c:1417
+#: ../libgaim/protocols/oscar/flap_connection.c:379
+#: ../libgaim/protocols/yahoo/yahoo.c:2263
+#: ../libgaim/protocols/yahoo/yahoo.c:2421
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
+#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
+#: ../libgaim/proxy.c:1413
 msgid "Server closed the connection."
 msgstr "El servidor ha cerrado la conexión."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:239
-#: ../libgaim/protocols/yahoo/yahoo.c:2262
-#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:582
-#: ../libgaim/proxy.c:1090 ../libgaim/proxy.c:1201 ../libgaim/proxy.c:1301
-#: ../libgaim/proxy.c:1429
+#: ../libgaim/protocols/oscar/flap_connection.c:381
+#: ../libgaim/protocols/yahoo/yahoo.c:2257
+#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
+#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
+#: ../libgaim/proxy.c:1425
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -9807,13 +10251,13 @@
 "Se perdió la conexión con el servidor:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1107
-#: ../libgaim/proxy.c:1214 ../libgaim/proxy.c:1313 ../libgaim/proxy.c:1385
-#: ../libgaim/proxy.c:1442
+#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
+#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
+#: ../libgaim/proxy.c:1438
 msgid "Received invalid data on connection with server."
 msgstr "Se recibieron datos inválidos al conectarse al servidor."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:244
+#: ../libgaim/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -9822,6 +10266,58 @@
 "No se pudo establecer una conexión con el servidor:\n"
 "%s"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/libaim.c:112
+#: ../libgaim/protocols/oscar/libaim.c:114
+msgid "AIM Protocol Plugin"
+msgstr "Complemento de protocolo AIM"
+
+#: ../libgaim/protocols/oscar/libaim.c:140
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Utilizar un servidor proxy de AIM/ICQ para transferencias de ficheros "
+"(lento, pero no descubre su dirección IP)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/libicq.c:112
+#: ../libgaim/protocols/oscar/libicq.c:114
+msgid "ICQ Protocol Plugin"
+msgstr "Complemento de protocolo ICQ"
+
+#: ../libgaim/protocols/oscar/libicq.c:139
+#: ../libgaim/protocols/yahoo/yahoo.c:3945
+#: ../libgaim/protocols/zephyr/zephyr.c:2985
+msgid "Encoding"
+msgstr "Codificación"
+
+#: ../libgaim/protocols/oscar/libicq.c:143
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Utilizar un servidor proxy de ICQ para transferencias de ficheros\n"
+"(lento, pero no descubre su dirección IP)"
+
 #: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "El usuario remoto ha cerrado la conexión."
@@ -9843,246 +10339,245 @@
 msgid "Could not establish a connection with the remote user."
 msgstr "No se pudo establecer una conexión con el usuario remoto."
 
-#: ../libgaim/protocols/oscar/odc.c:561
+#: ../libgaim/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "MI directo establecido"
 
-#: ../libgaim/protocols/oscar/oft.c:457
+#: ../libgaim/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fichero %s es %s, que es más grande que el tamaño máximo de %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libgaim/protocols/oscar/oscar.c:114
 msgid "Invalid error"
 msgstr "Error inválido"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libgaim/protocols/oscar/oscar.c:115
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libgaim/protocols/oscar/oscar.c:116
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libgaim/protocols/oscar/oscar.c:117
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
+#: ../libgaim/protocols/oscar/oscar.c:125
+msgid "Reply too big"
+msgstr "Respuesta demasiado grande"
+
+#: ../libgaim/protocols/oscar/oscar.c:126
+msgid "Responses lost"
+msgstr "Respuestas perdidas"
+
+#: ../libgaim/protocols/oscar/oscar.c:127
+msgid "Request denied"
+msgstr "Solicitud denegada"
+
+#: ../libgaim/protocols/oscar/oscar.c:128
+msgid "Busted SNAC payload"
+msgstr "Carga de SNAC destrozada"
+
+#: ../libgaim/protocols/oscar/oscar.c:129
+msgid "Insufficient rights"
+msgstr "Derechos insuficientes"
+
 #: ../libgaim/protocols/oscar/oscar.c:130
-msgid "Reply too big"
-msgstr "Respuesta demasiado grande"
+msgid "In local permit/deny"
+msgstr "En la lista local de autorizar/negar"
 
 #: ../libgaim/protocols/oscar/oscar.c:131
-msgid "Responses lost"
-msgstr "Respuestas perdidas"
+msgid "Too evil (sender)"
+msgstr "Demasiado malvado (remitente)"
 
 #: ../libgaim/protocols/oscar/oscar.c:132
-msgid "Request denied"
-msgstr "Solicitud denegada"
+msgid "Too evil (receiver)"
+msgstr "Demasiado malvado (destinatario)"
 
 #: ../libgaim/protocols/oscar/oscar.c:133
-msgid "Busted SNAC payload"
-msgstr "Carga de SNAC destrozada"
+msgid "User temporarily unavailable"
+msgstr "Usuario temporalmente no disponible"
 
 #: ../libgaim/protocols/oscar/oscar.c:134
-msgid "Insufficient rights"
-msgstr "Derechos insuficientes"
+msgid "No match"
+msgstr "No hubo coincidencia"
 
 #: ../libgaim/protocols/oscar/oscar.c:135
-msgid "In local permit/deny"
-msgstr "En la lista local de autorizar/negar"
+msgid "List overflow"
+msgstr "Desbordamiento de la lista"
 
 #: ../libgaim/protocols/oscar/oscar.c:136
-msgid "Too evil (sender)"
-msgstr "Demasiado malvado (remitente)"
+msgid "Request ambiguous"
+msgstr "Solicitud ambigua"
 
 #: ../libgaim/protocols/oscar/oscar.c:137
-msgid "Too evil (receiver)"
-msgstr "Demasiado malvado (destinatario)"
+msgid "Queue full"
+msgstr "Cola llena"
 
 #: ../libgaim/protocols/oscar/oscar.c:138
-msgid "User temporarily unavailable"
-msgstr "Usuario temporalmente no disponible"
-
-#: ../libgaim/protocols/oscar/oscar.c:139
-msgid "No match"
-msgstr "No hubo coincidencia"
-
-#: ../libgaim/protocols/oscar/oscar.c:140
-msgid "List overflow"
-msgstr "Desbordamiento de la lista"
-
-#: ../libgaim/protocols/oscar/oscar.c:141
-msgid "Request ambiguous"
-msgstr "Solicitud ambigua"
-
-#: ../libgaim/protocols/oscar/oscar.c:142
-msgid "Queue full"
-msgstr "Cola llena"
-
-#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
-#: ../libgaim/protocols/oscar/oscar.c:321
+#: ../libgaim/protocols/oscar/oscar.c:327
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
-msgstr "(Se produjo un error al recibir este mensaje. Es posible que el amigo con el que esta hablando utilice una codificación distinta de la que se esperaba. Puede indicar su condificación en las opciones de cuenta avanzadas para AIM/ICQ si sabe que codificación está utilizando.)"
-
-#: ../libgaim/protocols/oscar/oscar.c:424
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-"(Se produjo un error al recibir este mensaje. Es posible que el amigo con el "
-"que está hablando tenga un cliente defectuoso.)"
-
-#: ../libgaim/protocols/oscar/oscar.c:603
+msgstr "(Se produjo un error al recibir este mensaje. Es posible que el amigo con el que esta hablando utilice una codificación distinta de la que se esperaba. Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/ICQ si sabe que codificación está utilizando.)"
+
+#: ../libgaim/protocols/oscar/oscar.c:436
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr "(Se produjo un error al recibir este mensaje. O bien vd. y %s han seleccionado distintas codificaciones o bien %s tiene una aplicación cliente defectuosa.)"
+
+#: ../libgaim/protocols/oscar/oscar.c:621
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libgaim/protocols/oscar/oscar.c:606
+#: ../libgaim/protocols/oscar/oscar.c:624
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
 #: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "Charlar"
 
-#: ../libgaim/protocols/oscar/oscar.c:612
-#: ../libgaim/protocols/oscar/oscar.c:5852
+#: ../libgaim/protocols/oscar/oscar.c:630
+#: ../libgaim/protocols/oscar/oscar.c:5959
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: ../libgaim/protocols/oscar/oscar.c:619
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Games"
 msgstr "Juegos"
 
-#: ../libgaim/protocols/oscar/oscar.c:622
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: ../libgaim/protocols/oscar/oscar.c:625
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libgaim/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libgaim/protocols/oscar/oscar.c:634
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libgaim/protocols/oscar/oscar.c:661
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libgaim/protocols/oscar/oscar.c:664
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libgaim/protocols/oscar/oscar.c:667
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libgaim/protocols/oscar/oscar.c:670
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libgaim/protocols/oscar/oscar.c:673
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libgaim/protocols/oscar/oscar.c:676
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libgaim/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:680
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:683
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"
 
-#: ../libgaim/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:686
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
-#: ../libgaim/protocols/oscar/oscar.c:5629
+#: ../libgaim/protocols/oscar/oscar.c:704
+#: ../libgaim/protocols/oscar/oscar.c:5735
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: ../libgaim/protocols/oscar/oscar.c:690
-#: ../libgaim/protocols/oscar/oscar.c:5661
+#: ../libgaim/protocols/oscar/oscar.c:708
+#: ../libgaim/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libgaim/protocols/oscar/oscar.c:692
-#: ../libgaim/protocols/oscar/oscar.c:5647
+#: ../libgaim/protocols/oscar/oscar.c:710
+#: ../libgaim/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libgaim/protocols/oscar/oscar.c:696
+#: ../libgaim/protocols/oscar/oscar.c:714
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: ../libgaim/protocols/oscar/oscar.c:700
+#: ../libgaim/protocols/oscar/oscar.c:718
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libgaim/protocols/oscar/oscar.c:786
-#: ../libgaim/protocols/oscar/oscar.c:2804
+#: ../libgaim/protocols/oscar/oscar.c:824
+#: ../libgaim/protocols/oscar/oscar.c:2852
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: ../libgaim/protocols/oscar/oscar.c:795
+#: ../libgaim/protocols/oscar/oscar.c:834
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../libgaim/protocols/oscar/oscar.c:931
+#: ../libgaim/protocols/oscar/oscar.c:974
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10091,7 +10586,7 @@
 "No se pudo conectar al servidor de autenticación:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:939
+#: ../libgaim/protocols/oscar/oscar.c:982
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10100,20 +10595,20 @@
 "No se pudo conectar al servidor BOS:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:979
+#: ../libgaim/protocols/oscar/oscar.c:1022
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: ../libgaim/protocols/oscar/oscar.c:984
+#: ../libgaim/protocols/oscar/oscar.c:1027
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1013
+#: ../libgaim/protocols/oscar/oscar.c:1056
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#: ../libgaim/protocols/oscar/oscar.c:1197
+#: ../libgaim/protocols/oscar/oscar.c:1240
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10124,26 +10619,29 @@
 "no es válido. Los nombres de usuario deben empezar con letras y sólo pueden "
 "contener letras, números y espacios, o contener sólo números."
 
-#: ../libgaim/protocols/oscar/oscar.c:1282
+#: ../libgaim/protocols/oscar/oscar.c:1325
+#: ../libgaim/protocols/yahoo/yahoo.c:1900
 msgid "Invalid screen name."
 msgstr "Nombre de usuario no válido"
 
-#: ../libgaim/protocols/oscar/oscar.c:1287
-#: ../libgaim/protocols/yahoo/yahoo.c:1928
+#: ../libgaim/protocols/oscar/oscar.c:1332
+#: ../libgaim/protocols/qq/login_logout.c:483
+#: ../libgaim/protocols/simple/simple.c:1035
+#: ../libgaim/protocols/yahoo/yahoo.c:1923
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: ../libgaim/protocols/oscar/oscar.c:1292
+#: ../libgaim/protocols/oscar/oscar.c:1337
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1296
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
-#: ../libgaim/protocols/oscar/oscar.c:1301
+#: ../libgaim/protocols/oscar/oscar.c:1346
 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."
@@ -10152,35 +10650,47 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: ../libgaim/protocols/oscar/oscar.c:1306
+#: ../libgaim/protocols/oscar/oscar.c:1351
 #, 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"
 
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libgaim/protocols/oscar/oscar.c:1386
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libgaim/protocols/oscar/oscar.c:1391
 msgid "Received authorization"
 msgstr "Se recibió la autorización"
 
-#: ../libgaim/protocols/oscar/oscar.c:1369
+#: ../libgaim/protocols/oscar/oscar.c:1414
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es válida."
 
-#: ../libgaim/protocols/oscar/oscar.c:1383
+#: ../libgaim/protocols/oscar/oscar.c:1428
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: ../libgaim/protocols/oscar/oscar.c:1384
+#: ../libgaim/protocols/oscar/oscar.c:1429
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."
 
-#: ../libgaim/protocols/oscar/oscar.c:1424
-#: ../libgaim/protocols/oscar/oscar.c:1467
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../libgaim/protocols/oscar/oscar.c:1431
+#: ../libgaim/protocols/oscar/oscar.c:2233
+#: ../libgaim/protocols/oscar/oscar.c:2279
+#: ../libgaim/protocols/oscar/oscar.c:5837
+#: ../libgaim/protocols/oscar/oscar.c:6067
+#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+msgid "_OK"
+msgstr "_Aceptar"
+
+#: ../libgaim/protocols/oscar/oscar.c:1469
+#: ../libgaim/protocols/oscar/oscar.c:1512
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -10189,86 +10699,53 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: ../libgaim/protocols/oscar/oscar.c:1427
-#: ../libgaim/protocols/oscar/oscar.c:1470
+#: ../libgaim/protocols/oscar/oscar.c:1472
+#: ../libgaim/protocols/oscar/oscar.c:1515
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim no pudo obtener un «hash» de conexión a AIM válido."
 
-#: ../libgaim/protocols/oscar/oscar.c:1556
+#: ../libgaim/protocols/oscar/oscar.c:1601
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
 
-#: ../libgaim/protocols/oscar/oscar.c:1559
+#: ../libgaim/protocols/oscar/oscar.c:1604
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim no pudo un «hash» de conexión válido."
 
-#: ../libgaim/protocols/oscar/oscar.c:1585
+#: ../libgaim/protocols/oscar/oscar.c:1630
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
-#: ../libgaim/protocols/oscar/oscar.c:1641
-msgid "gaim_proxy_connect() failed"
-msgstr "Falló gaim_proxy_connect()"
-
-#: ../libgaim/protocols/oscar/oscar.c:2139
+#: ../libgaim/protocols/oscar/oscar.c:1686
+msgid "Unable to initialize connection"
+msgstr "No se pudo inicializar la conexión"
+
+#: ../libgaim/protocols/oscar/oscar.c:2203
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-#: ../libgaim/protocols/oscar/oscar.c:2148
+#: ../libgaim/protocols/oscar/oscar.c:2231
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2149
+#: ../libgaim/protocols/oscar/oscar.c:2232
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2181
-#, 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 autorización antes permitir que lo incorporen a una "
-"lista de amigos.  ¿Desea enviar una solicitud de autorización?"
-
-#: ../libgaim/protocols/oscar/oscar.c:2186
-msgid "Request Authorization"
-msgstr "Pedir autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:2188
-msgid "_Request Authorization"
-msgstr "_Pedir autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:2229
-#: ../libgaim/protocols/oscar/oscar.c:2236
-#: ../libgaim/protocols/oscar/oscar.c:2343
-#: ../libgaim/protocols/oscar/oscar.c:2367
-#: ../libgaim/protocols/oscar/oscar.c:5054
-#: ../libgaim/protocols/oscar/oscar.c:5106
+#: ../libgaim/protocols/oscar/oscar.c:2271
+#: ../libgaim/protocols/oscar/oscar.c:2278
+#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libgaim/protocols/yahoo/yahoo.c:959
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
-#: ../libgaim/protocols/oscar/oscar.c:2235
+#: ../libgaim/protocols/oscar/oscar.c:2277
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2345
-#, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"El usuario %u quiere añadir a %s a su lista de amigos por el siguiente "
-"motivo:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:2355
-#: ../libgaim/protocols/oscar/oscar.c:5066
-msgid "Authorization Request"
-msgstr "Solicitud de autorización"
-
-#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10279,18 +10756,18 @@
 "la siguiente razón:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2368
+#: ../libgaim/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2375
+#: ../libgaim/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petición de añadirlo a su lista de amigos."
 
-#: ../libgaim/protocols/oscar/oscar.c:2383
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10303,7 +10780,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2391
+#: ../libgaim/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10316,7 +10793,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2399
+#: ../libgaim/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10329,34 +10806,34 @@
 "El mensaje es:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libgaim/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2426
+#: ../libgaim/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "¿Desea añadir este amigo a su lista de amigos?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2430
+#: ../libgaim/protocols/oscar/oscar.c:2467
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../libgaim/protocols/oscar/oscar.c:2514
+#: ../libgaim/protocols/oscar/oscar.c:2551
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Usted perdió %hu mensaje de %s porque no era válido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran válidos."
 
-#: ../libgaim/protocols/oscar/oscar.c:2523
+#: ../libgaim/protocols/oscar/oscar.c:2560
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Se perdió %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: ../libgaim/protocols/oscar/oscar.c:2532
+#: ../libgaim/protocols/oscar/oscar.c:2569
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10366,89 +10843,88 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: ../libgaim/protocols/oscar/oscar.c:2541
+#: ../libgaim/protocols/oscar/oscar.c:2578
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Se perdió %hu mensaje de %s porque el/ella es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
 
-#: ../libgaim/protocols/oscar/oscar.c:2550
+#: ../libgaim/protocols/oscar/oscar.c:2587
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Se perdió %hu mensaje de %s porque usted es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
 
-#: ../libgaim/protocols/oscar/oscar.c:2559
+#: ../libgaim/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Se perdió %hu mensaje de %s por motivos desconocidos."
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
-#: ../libgaim/protocols/oscar/oscar.c:2615
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:2676
+#: ../libgaim/protocols/oscar/oscar.c:2718
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC envió el error: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2758
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2712
-#: ../libgaim/protocols/oscar/oscar.c:2717
-#: ../libgaim/protocols/oscar/oscar.c:2779
-#: ../libgaim/protocols/oscar/oscar.c:2783
+#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libgaim/protocols/oscar/oscar.c:2763
+#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libgaim/protocols/oscar/oscar.c:2829
 msgid "Unknown reason."
 msgstr "Razón desconocida."
 
-#: ../libgaim/protocols/oscar/oscar.c:2715
-#: ../libgaim/protocols/sametime/sametime.c:2363
+#: ../libgaim/protocols/oscar/oscar.c:2761
+#: ../libgaim/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2825
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario de no disponible: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2782
+#: ../libgaim/protocols/oscar/oscar.c:2828
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Información de usuario de %s no disponible:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2808
+#: ../libgaim/protocols/oscar/oscar.c:2857
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libgaim/protocols/oscar/oscar.c:2813
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1173
+#: ../libgaim/protocols/oscar/oscar.c:2862
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../libgaim/protocols/oscar/oscar.c:2818
+#: ../libgaim/protocols/oscar/oscar.c:2867
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libgaim/protocols/oscar/oscar.c:2836
+#: ../libgaim/protocols/oscar/oscar.c:2885
 msgid "Available Message"
 msgstr "Mensajes disponibles"
 
-#: ../libgaim/protocols/oscar/oscar.c:2936
+#: ../libgaim/protocols/oscar/oscar.c:2911
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libgaim/protocols/oscar/oscar.c:2988
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3117
+#: ../libgaim/protocols/oscar/oscar.c:3175
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -10456,11 +10932,11 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"
 
-#: ../libgaim/protocols/oscar/oscar.c:3338
+#: ../libgaim/protocols/oscar/oscar.c:3396
 msgid "Rate limiting error."
 msgstr "Error del limitador de tasa de mensajes."
 
-#: ../libgaim/protocols/oscar/oscar.c:3339
+#: ../libgaim/protocols/oscar/oscar.c:3397
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -10469,84 +10945,84 @@
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../libgaim/protocols/oscar/oscar.c:3411
+#: ../libgaim/protocols/oscar/oscar.c:3469
 msgid "You have been signed off for an unknown reason."
 msgstr "Ha sido desconectado por motivos desconocidos."
 
-#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
+#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3645
+#: ../libgaim/protocols/oscar/oscar.c:3723
 #: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../libgaim/protocols/oscar/oscar.c:3672
+#: ../libgaim/protocols/oscar/oscar.c:3753
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: ../libgaim/protocols/oscar/oscar.c:3676
-#: ../libgaim/protocols/qq/buddy_info.c:38
+#: ../libgaim/protocols/oscar/oscar.c:3758
+#: ../libgaim/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libgaim/protocols/oscar/oscar.c:3685
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libgaim/protocols/oscar/oscar.c:3766
+#: ../libgaim/protocols/oscar/oscar.c:3779
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libgaim/protocols/oscar/oscar.c:3697
+#: ../libgaim/protocols/oscar/oscar.c:3790
+msgid "Division"
+msgstr "Sección"
+
+#: ../libgaim/protocols/oscar/oscar.c:3791
+msgid "Position"
+msgstr "Cargo"
+
+#: ../libgaim/protocols/oscar/oscar.c:3793
+msgid "Web Page"
+msgstr "Página web"
+
+#: ../libgaim/protocols/oscar/oscar.c:3796
 msgid "Work Information"
 msgstr "Información de trabajo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3699
-msgid "Division"
-msgstr "Sección"
-
-#: ../libgaim/protocols/oscar/oscar.c:3700
-msgid "Position"
-msgstr "Cargo"
-
-#: ../libgaim/protocols/oscar/oscar.c:3702
-msgid "Web Page"
-msgstr "Página web"
-
-#: ../libgaim/protocols/oscar/oscar.c:3760
+#: ../libgaim/protocols/oscar/oscar.c:3852
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: ../libgaim/protocols/oscar/oscar.c:3800
+#: ../libgaim/protocols/oscar/oscar.c:3892
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "El siguiente nombre de usuario está asociado a %s"
 msgstr[1] "Los siguientes nombres de usuarios están asociados a %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3805
+#: ../libgaim/protocols/oscar/oscar.c:3897
 msgid "Screen name"
 msgstr "Nombre de usuario"
 
-#: ../libgaim/protocols/oscar/oscar.c:3831
+#: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libgaim/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3854
+#: ../libgaim/protocols/oscar/oscar.c:3946
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"
 
-#: ../libgaim/protocols/oscar/oscar.c:3885
+#: ../libgaim/protocols/oscar/oscar.c:3977
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la información de la cuenta"
 
-#: ../libgaim/protocols/oscar/oscar.c:3888
+#: ../libgaim/protocols/oscar/oscar.c:3980
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10555,14 +11031,14 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: ../libgaim/protocols/oscar/oscar.c:3891
+#: ../libgaim/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque es "
 "inválido."
 
-#: ../libgaim/protocols/oscar/oscar.c:3894
+#: ../libgaim/protocols/oscar/oscar.c:3986
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10571,7 +11047,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libgaim/protocols/oscar/oscar.c:3989
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -10580,7 +11056,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: ../libgaim/protocols/oscar/oscar.c:3900
+#: ../libgaim/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -10589,7 +11065,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada ya tiene demasiados nombres de usuarios asociados."
 
-#: ../libgaim/protocols/oscar/oscar.c:3903
+#: ../libgaim/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -10598,12 +11074,12 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada es inválida."
 
-#: ../libgaim/protocols/oscar/oscar.c:3906
+#: ../libgaim/protocols/oscar/oscar.c:3998
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../libgaim/protocols/oscar/oscar.c:3916
+#: ../libgaim/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -10612,28 +11088,28 @@
 "El formato de su nombre de usuario es actualmente el siguiente:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3917
-#: ../libgaim/protocols/oscar/oscar.c:3924
+#: ../libgaim/protocols/oscar/oscar.c:4009
+#: ../libgaim/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: ../libgaim/protocols/oscar/oscar.c:3922
+#: ../libgaim/protocols/oscar/oscar.c:4014
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La dirección de correo electrónico para %s es %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4097
+#: ../libgaim/protocols/oscar/oscar.c:4189
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
 "imágenes IM."
 
-#: ../libgaim/protocols/oscar/oscar.c:4349
+#: ../libgaim/protocols/oscar/oscar.c:4441
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../libgaim/protocols/oscar/oscar.c:4350
+#: ../libgaim/protocols/oscar/oscar.c:4442
 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 "
@@ -10643,7 +11119,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: ../libgaim/protocols/oscar/oscar.c:4364
+#: ../libgaim/protocols/oscar/oscar.c:4456
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -10658,11 +11134,11 @@
 "Se ha excedido el tamaño máximo de perfil de %d bytes.  Gaim lo aplicó "
 "truncado."
 
-#: ../libgaim/protocols/oscar/oscar.c:4369
+#: ../libgaim/protocols/oscar/oscar.c:4461
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../libgaim/protocols/oscar/oscar.c:4413
+#: ../libgaim/protocols/oscar/oscar.c:4505
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -10677,11 +11153,11 @@
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia.  "
 "Gaim lo ha truncado.."
 
-#: ../libgaim/protocols/oscar/oscar.c:4418
+#: ../libgaim/protocols/oscar/oscar.c:4510
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../libgaim/protocols/oscar/oscar.c:4487
+#: ../libgaim/protocols/oscar/oscar.c:4579
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -10692,17 +11168,17 @@
 "nombres de usuario deben empezar con letras y sólo pueden contener letras, "
 "números y espacios, o contener sólo números."
 
-#: ../libgaim/protocols/oscar/oscar.c:4489
-#: ../libgaim/protocols/oscar/oscar.c:4902
-#: ../libgaim/protocols/oscar/oscar.c:4916
+#: ../libgaim/protocols/oscar/oscar.c:4581
+#: ../libgaim/protocols/oscar/oscar.c:5004
+#: ../libgaim/protocols/oscar/oscar.c:5018
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
-#: ../libgaim/protocols/oscar/oscar.c:4593
+#: ../libgaim/protocols/oscar/oscar.c:4685
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: ../libgaim/protocols/oscar/oscar.c:4594
+#: ../libgaim/protocols/oscar/oscar.c:4686
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -10712,16 +11188,16 @@
 "de AIM. La lista no se ha borrado, y seguramente volverá a estar disponible "
 "en unas horas."
 
-#: ../libgaim/protocols/oscar/oscar.c:4797
-#: ../libgaim/protocols/oscar/oscar.c:4798
-#: ../libgaim/protocols/oscar/oscar.c:4803
-#: ../libgaim/protocols/oscar/oscar.c:4970
-#: ../libgaim/protocols/oscar/oscar.c:4971
-#: ../libgaim/protocols/oscar/oscar.c:4976
+#: ../libgaim/protocols/oscar/oscar.c:4890
+#: ../libgaim/protocols/oscar/oscar.c:4891
+#: ../libgaim/protocols/oscar/oscar.c:4896
+#: ../libgaim/protocols/oscar/oscar.c:5072
+#: ../libgaim/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:5078
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:5002
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -10730,12 +11206,12 @@
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: ../libgaim/protocols/oscar/oscar.c:4900
-#: ../libgaim/protocols/oscar/oscar.c:4914
+#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libgaim/protocols/oscar/oscar.c:5016
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libgaim/protocols/oscar/oscar.c:4914
+#: ../libgaim/protocols/oscar/oscar.c:5016
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -10746,7 +11222,7 @@
 "habitual es que ha llegado al máximo número de amigos permitidos en su lista "
 "de amigos."
 
-#: ../libgaim/protocols/oscar/oscar.c:5007
+#: ../libgaim/protocols/oscar/oscar.c:5109
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -10755,33 +11231,23 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5013
+#: ../libgaim/protocols/oscar/oscar.c:5115
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
-#: ../libgaim/protocols/oscar/oscar.c:5057
-#, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"El usuario %s quiere añadir a %s a su lista de amigos por el siguiente "
-"motivo:\n"
-"%s"
-
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5102
+#: ../libgaim/protocols/oscar/oscar.c:5193
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: ../libgaim/protocols/oscar/oscar.c:5103
+#: ../libgaim/protocols/oscar/oscar.c:5194
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5106
+#: ../libgaim/protocols/oscar/oscar.c:5197
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10792,112 +11258,118 @@
 "la siguiente razón:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5107
+#: ../libgaim/protocols/oscar/oscar.c:5198
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5183
+#: ../libgaim/protocols/oscar/oscar.c:5274
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido."
 
-#: ../libgaim/protocols/oscar/oscar.c:5253
+#: ../libgaim/protocols/oscar/oscar.c:5344
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
 
-#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5516
+#: ../libgaim/protocols/oscar/oscar.c:5521
+msgid "Away Message"
+msgstr "Mensajes de ausencia"
+
+#: ../libgaim/protocols/oscar/oscar.c:5521
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5728
+#: ../libgaim/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5775
+#: ../libgaim/protocols/oscar/oscar.c:5881
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:5779
+#: ../libgaim/protocols/oscar/oscar.c:5885
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
-msgstr "Puede considerarse como un riesgo a su privacidad  ya que hacer ésto revela su dirección IP. ¿Quiere continuar?"
-
-#: ../libgaim/protocols/oscar/oscar.c:5783
-#: ../libgaim/protocols/oscar/peer.c:990
-msgid "_Connect"
-msgstr "_Conectar"
+msgstr ""
+"Puede considerarse como un riesgo a su privacidad  ya que hacer ésto revela "
+"su dirección IP. ¿Quiere continuar?"
+
+#: ../libgaim/protocols/oscar/oscar.c:5889
+msgid "C_onnect"
+msgstr "C_onectar"
 
 # TBD - comprobar si esto afecta al botón en pantalla
-#: ../libgaim/protocols/oscar/oscar.c:5817
+#: ../libgaim/protocols/oscar/oscar.c:5924
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libgaim/protocols/oscar/oscar.c:5823
+#: ../libgaim/protocols/oscar/oscar.c:5930
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libgaim/protocols/oscar/oscar.c:5831
+#: ../libgaim/protocols/oscar/oscar.c:5938
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libgaim/protocols/oscar/oscar.c:5844
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libgaim/protocols/oscar/oscar.c:5866
+#: ../libgaim/protocols/oscar/oscar.c:5973
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: ../libgaim/protocols/oscar/oscar.c:5925
+#: ../libgaim/protocols/oscar/oscar.c:6032
 msgid "Require authorization"
 msgstr "Solicitar autorización"
 
-#: ../libgaim/protocols/oscar/oscar.c:5928
+#: ../libgaim/protocols/oscar/oscar.c:6035
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidad web (¡si activa esto hará que recibe SPAM!)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5933
+#: ../libgaim/protocols/oscar/oscar.c:6040
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:5950
+#: ../libgaim/protocols/oscar/oscar.c:6057
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libgaim/protocols/oscar/oscar.c:6058
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: ../libgaim/protocols/oscar/oscar.c:5958
+#: ../libgaim/protocols/oscar/oscar.c:6065
 msgid "New screen name formatting:"
 msgstr "Nuevo formato del nombre de usuario:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6014
+#: ../libgaim/protocols/oscar/oscar.c:6121
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6059
+#: ../libgaim/protocols/oscar/oscar.c:6166
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6062
+#: ../libgaim/protocols/oscar/oscar.c:6169
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos"
 
-#: ../libgaim/protocols/oscar/oscar.c:6063
+#: ../libgaim/protocols/oscar/oscar.c:6170
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -10905,73 +11377,670 @@
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: ../libgaim/protocols/oscar/oscar.c:6080
+#: ../libgaim/protocols/oscar/oscar.c:6187
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: ../libgaim/protocols/oscar/oscar.c:6081
+#: ../libgaim/protocols/oscar/oscar.c:6188
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: ../libgaim/protocols/oscar/oscar.c:6082
+#: ../libgaim/protocols/oscar/oscar.c:6189
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: ../libgaim/protocols/oscar/oscar.c:6251
+#: ../libgaim/protocols/oscar/oscar.c:6192
+msgid "_Search"
+msgstr "_Buscar"
+
+#: ../libgaim/protocols/oscar/oscar.c:6361
 msgid "Set User Info (URL)..."
 msgstr "Establecer su información de usuario (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6262
+#: ../libgaim/protocols/oscar/oscar.c:6372
 msgid "Change Password (URL)"
 msgstr "Cambiar su contraseña (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6266
+#: ../libgaim/protocols/oscar/oscar.c:6376
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6276
+#: ../libgaim/protocols/oscar/oscar.c:6386
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6283
+#: ../libgaim/protocols/oscar/oscar.c:6393
 msgid "Format Screen Name..."
 msgstr "Formato del nombre de usuario..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6287
+#: ../libgaim/protocols/oscar/oscar.c:6397
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libgaim/protocols/oscar/oscar.c:6291
+#: ../libgaim/protocols/oscar/oscar.c:6401
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libgaim/protocols/oscar/oscar.c:6295
+#: ../libgaim/protocols/oscar/oscar.c:6405
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar la dirección de correo registrada actualmente..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6302
+#: ../libgaim/protocols/oscar/oscar.c:6412
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: ../libgaim/protocols/oscar/oscar.c:6308
+#: ../libgaim/protocols/oscar/oscar.c:6418
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un amigo por correo electrónico..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6313
+#: ../libgaim/protocols/oscar/oscar.c:6423
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#: ../libgaim/protocols/oscar/oscar.c:6381
+#: ../libgaim/protocols/oscar/oscar.c:6491
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos reciente"
 
-#: ../libgaim/protocols/oscar/oscar.c:6384
+#: ../libgaim/protocols/oscar/oscar.c:6494
 msgid "Show how long you have been idle"
 msgstr "Mostrar cuánto tiempo se ha estado inactivo"
 
+#: ../libgaim/protocols/oscar/peer.c:674
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+"Solicitando a %s que se conecte con nosotros en %s:%hu para MI directo."
+
+#: ../libgaim/protocols/oscar/peer.c:759
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Intentando conectarse a %s:%hu."
+
+#: ../libgaim/protocols/oscar/peer.c:833
+msgid "Attempting to connect via proxy server."
+msgstr "Intentando la conexión a través de un servidor proxy."
+
+#: ../libgaim/protocols/oscar/peer.c:1010
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s pide conectarse directamente a %s"
+
+#: ../libgaim/protocols/oscar/peer.c:1014
+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 ""
+"Esto requiere una conexión directa entre las dos computadoras y es necesario "
+"para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
+"esto como un riesgo a su privacidad."
+
+#: ../libgaim/protocols/oscar/peer.c:1020
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Primary Information"
+msgstr "Información principal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:41
+msgid "Personal Introduction"
+msgstr "Introducción personal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:42
+msgid "QQ Number"
+msgstr "Número QQ"
+
+#: ../libgaim/protocols/qq/buddy_info.c:47
+msgid "Country/Region"
+msgstr "País/Región"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Province/State"
+msgstr "Provincia/Estado"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Horoscope Symbol"
+msgstr "Símbolo del horóscopo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "Zodiac Sign"
+msgstr "Signo zodiacal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Blood Type"
+msgstr "Grupo sanguíneo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:54
+msgid "College"
+msgstr "Universidad"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Zipcode"
+msgstr "Código postal"
+
+#: ../libgaim/protocols/qq/buddy_info.c:58
+msgid "Cellphone Number"
+msgstr "Número de móvil"
+
+#: ../libgaim/protocols/qq/buddy_info.c:59
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Aquarius"
+msgstr "Acuario"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Pisces"
+msgstr "Piscis"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Aries"
+msgstr "Aries"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Taurus"
+msgstr "Tauro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Gemini"
+msgstr "Géminis"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Cancer"
+msgstr "Cáncer"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Leo"
+msgstr "Leo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Virgo"
+msgstr "Virgo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Libra"
+msgstr "Libra"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Scorpio"
+msgstr "Escorpio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Sagittarius"
+msgstr "Sagitario"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Capricorn"
+msgstr "Capricornio"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rat"
+msgstr "Rata"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Ox"
+msgstr "Buey"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Tiger"
+msgstr "Tigre"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rabbit"
+msgstr "Conejo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Dragon"
+msgstr "Dragón"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Snake"
+msgstr "Serpiente"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Horse"
+msgstr "Caballo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Goat"
+msgstr "Cabra"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Monkey"
+msgstr "Mono"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Rooster"
+msgstr "Gallo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Dog"
+msgstr "Perro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Pig"
+msgstr "Cerdo"
+
+#: ../libgaim/protocols/qq/buddy_info.c:78
+msgid "Other"
+msgstr "Otro"
+
+#: ../libgaim/protocols/qq/buddy_info.c:481
+#: ../libgaim/protocols/qq/buddy_info.c:482
+msgid "Modify my information"
+msgstr "Modificar mi información"
+
+#: ../libgaim/protocols/qq/buddy_info.c:483
+msgid "Update my information"
+msgstr "Actualizar mi información"
+
+#: ../libgaim/protocols/qq/buddy_info.c:506
+msgid "Your information has been updated"
+msgstr "Se ha modificado su información."
+
+#: ../libgaim/protocols/qq/buddy_info.c:565
+msgid ""
+"You are attempting to set a custom face. Gaim currently only allows the "
+"standard faces. Please choose an image from "
+msgstr "Está vd. intentando fijar una cara a medida. Gaim sólo permite la configuración de las caras estándar. Por favor, escoja una imagen de "
+
+#: ../libgaim/protocols/qq/buddy_info.c:582
+#: ../libgaim/protocols/qq/buddy_info.c:595
+msgid "Invalid QQ Face"
+msgstr "Cara QQ inválida"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:207
+#: ../libgaim/protocols/qq/group_opt.c:135
+#, c-format
+msgid "You rejected %d's request"
+msgstr "Ha rechazado la solicitud de %d"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+#: ../libgaim/protocols/qq/group_opt.c:136
+msgid "Input your reason:"
+msgstr "Introduzca sus motivos:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+msgid "Reject request"
+msgstr "Rechazar solicitud"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:211
+#: ../libgaim/protocols/qq/group_opt.c:139
+msgid "Sorry, you are not my type..."
+msgstr "Lo siento, no eres mi tipo..."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/group_im.c:136
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Reject"
+msgstr "Rechazar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:272
+msgid "Add buddy with auth request fails"
+msgstr "Fallo al añadir un amigo con solicitud de autenticación"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:303
+msgid "You have successfully removed a buddy"
+msgstr "Ha eliminado un amigo con éxito"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:331
+msgid "You have successfully removed yourself from a buddy"
+msgstr "Se ha borrado con éxito de un amigo"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#, c-format
+msgid "User %d needs authentication"
+msgstr "El usuario %d necesita autenticación"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+msgid "Input request here"
+msgstr "Introduzca su solicitud a continuación"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:398
+#: ../libgaim/protocols/qq/group_join.c:135
+msgid "Would you be my friend?"
+msgstr "¿Quieres ser mi amigo?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:399
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_opt.c:140
+msgid "Send"
+msgstr "Enviar"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:406
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "Ha añadido %d a su lista de amigos."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:503
+msgid "QQid Error"
+msgstr "Error QQid"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:504
+msgid "Invalid QQid"
+msgstr "QQid inválido"
+
+#: ../libgaim/protocols/qq/group.c:65
+msgid "ID: "
+msgstr "ID: "
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Group ID"
+msgstr "ID de grupo:"
+
+#: ../libgaim/protocols/qq/group.c:100
+msgid "Creator"
+msgstr "Creador"
+
+#: ../libgaim/protocols/qq/group.c:103
+msgid "Group Description"
+msgstr "Descripción del grupo"
+
+#: ../libgaim/protocols/qq/group.c:109
+msgid "Auth"
+msgstr "Autorizar"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libgaim/protocols/qq/group.c:120
+msgid "Please input external group ID"
+msgstr "Indique su ID de grupo externo"
+
+#: ../libgaim/protocols/qq/group.c:121
+msgid "You can only search for permanent QQ groups\n"
+msgstr "Sólo puede buscar grupos QQ permanentes\n"
+
+#: ../libgaim/protocols/qq/group_im.c:122
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "El usuario %d solicitó entrar en el grupo %d"
+
+#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/sys_msg.c:180
+#, c-format
+msgid "Reason: %s"
+msgstr "Razón: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:130
+#: ../libgaim/protocols/qq/group_im.c:174
+#: ../libgaim/protocols/qq/group_im.c:214
+#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libgaim/protocols/qq/group_join.c:355
+#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libgaim/protocols/qq/group_opt.c:386
+msgid "QQ Qun Operation"
+msgstr "Opciones QQ Qun"
+
+#: ../libgaim/protocols/qq/group_im.c:133
+#: ../libgaim/protocols/qq/group_opt.c:127
+#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+msgid "Approve"
+msgstr "Aprobar"
+
+#: ../libgaim/protocols/qq/group_im.c:171
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+"Su solicitud de unirse al grupo %d ha sido rechazada por el administrador %d"
+
+#: ../libgaim/protocols/qq/group_im.c:212
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+"Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %d"
+
+#: ../libgaim/protocols/qq/group_im.c:248
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr "Vd. [%d] ha salido del grupo «%d»"
+
+#: ../libgaim/protocols/qq/group_im.c:282
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
+
+#: ../libgaim/protocols/qq/group_im.c:283
+msgid "This group has been added to your buddy list"
+msgstr "Se ha añadido este grupo a su lista de amigos."
+
+#: ../libgaim/protocols/qq/group_internal.c:41
+msgid "I am not member"
+msgstr "No soy miembro"
+
+#: ../libgaim/protocols/qq/group_internal.c:44
+msgid "I am a member"
+msgstr "Soy miembro"
+
+#: ../libgaim/protocols/qq/group_internal.c:47
+msgid "I am applying to join"
+msgstr "He solicitado unirme"
+
+#: ../libgaim/protocols/qq/group_internal.c:50
+msgid "I am the admin"
+msgstr "Soy el administrador"
+
+#: ../libgaim/protocols/qq/group_internal.c:53
+msgid "Unknown status"
+msgstr "Estado desconocido"
+
+#: ../libgaim/protocols/qq/group_join.c:80
+msgid "This group does not allow others to join"
+msgstr "Este grupo no permite que otros se unan"
+
+#: ../libgaim/protocols/qq/group_join.c:229
+msgid "You have successfully exited the group"
+msgstr "Ha salido con éxito del grupo"
+
+#: ../libgaim/protocols/qq/group_join.c:253
+msgid "QQ Group Auth"
+msgstr "Autenticación grupo QQ"
+
+#: ../libgaim/protocols/qq/group_join.c:254
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr "El servidor QQ ha aceptado su operación de autorización"
+
+#: ../libgaim/protocols/qq/group_join.c:325
+msgid "You inputted a group id outside the acceptable range"
+msgstr ""
+"Ha introducido un identificador de grupo que está fuera del rango permitido"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid "Are you sure to exit this Qun?"
+msgstr "¿Seguro que quiere dejar este Qun?"
+
+#: ../libgaim/protocols/qq/group_join.c:358
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"Tenga en cuenta que si vd. lo ha creado\n"
+"esta operación eliminará este Qun eventualmente."
+
+#: ../libgaim/protocols/qq/group_join.c:361
+msgid "Go ahead"
+msgstr "Adelante"
+
+#: ../libgaim/protocols/qq/group_network.c:90
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Código [0x%02X]: %s"
+
+#: ../libgaim/protocols/qq/group_network.c:91
+msgid "Group Operation Error"
+msgstr "Error de operación de grupo"
+
+#: ../libgaim/protocols/qq/group_opt.c:124
+#: ../libgaim/protocols/qq/sys_msg.c:84
+msgid "Do you wanna approve the request?"
+msgstr "¿Desea aprobar esta solicitud?"
+
+#: ../libgaim/protocols/qq/group_opt.c:230
+msgid "You have successfully modify Qun member"
+msgstr "Ha modificado el miembro Qun con éxito"
+
+#: ../libgaim/protocols/qq/group_opt.c:300
+msgid "You have successfully modify Qun information"
+msgstr "Ha modificado la información Qun con éxito"
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "You have successfully created a Qun"
+msgstr "Ha creado un Qun con éxito"
+
+#: ../libgaim/protocols/qq/group_opt.c:389
+msgid "Would you like to set up the Qun details now?"
+msgstr "¿Desea establecer los detalles de Qun ahora?"
+
+#: ../libgaim/protocols/qq/group_opt.c:390
+msgid "Setup"
+msgstr "Configurar"
+
+#: ../libgaim/protocols/qq/im.c:423
+msgid "System Message"
+msgstr "Mensaje del sistema"
+
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Server ACK"
+msgstr "ACK de servidor"
+
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Send IM fail\n"
+msgstr "Fallo en el envío de IM\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:85
+msgid "Keep alive error, seems connection lost!"
+msgstr "Error de mantenimiento, ¡parece que se ha perdido la conexión!"
+
+#: ../libgaim/protocols/qq/login_logout.c:408
+msgid "Request login token error!"
+msgstr "¡Error al solicitar token para conectarse!"
+
+#: ../libgaim/protocols/qq/login_logout.c:486
+msgid "Unable to login, check debug log"
+msgstr "No pudo conectarse, compruebe el registro de depuración"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2351
+#: ../libgaim/protocols/yahoo/yahoo.c:2378
+#: ../libgaim/protocols/yahoo/yahoo.c:2485
+#: ../libgaim/protocols/yahoo/yahoo.c:2506
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "No se pudo conectar."
+
+#: ../libgaim/protocols/qq/qq.c:186
+#, c-format
+msgid "Unknown-%d"
+msgstr "Desconocido-%d"
+
+#: ../libgaim/protocols/qq/qq.c:209
+#, c-format
+msgid "%s Address"
+msgstr "Dirección de %s"
+
+#: ../libgaim/protocols/qq/qq.c:240
+msgid "Level"
+msgstr "Nivel"
+
+#: ../libgaim/protocols/qq/qq.c:294
+msgid "QQ: Available"
+msgstr "QQ: Disponible"
+
+#: ../libgaim/protocols/qq/qq.c:298
+msgid "QQ: Away"
+msgstr "QQ: Ausente"
+
+#: ../libgaim/protocols/qq/qq.c:302
+msgid "QQ: Invisible"
+msgstr "QQ: Invisible"
+
+#: ../libgaim/protocols/qq/qq.c:306
+msgid "QQ: Offline"
+msgstr "QQ: Desconectado"
+
+#: ../libgaim/protocols/qq/qq.c:383
+msgid "Invalid name"
+msgstr "Nombre inválido"
+
+#: ../libgaim/protocols/qq/qq.c:450
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Conectados actualmente</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:451
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Última actualización</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:455
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Modo de conexión</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:456
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>IP del servidor</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:457
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<B>Mi IP pública</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:462
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Hora de conexión</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:463
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Última IP de conexión</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:464
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Último hora de conexión</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:468
+msgid "Login Information"
+msgstr "Información de conexión"
+
+#: ../libgaim/protocols/qq/qq.c:543
+msgid "Modify My Information"
+msgstr "Modificar mi información"
+
+#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: ../libgaim/protocols/qq/qq.c:549
+msgid "Show Login Information"
+msgstr "Mostrar la información de conexión"
+
+#: ../libgaim/protocols/qq/qq.c:570
+msgid "Exit this QQ Qun"
+msgstr "Salir de este Qun QQ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10982,827 +12051,174 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/oscar.c:6510
-#: ../libgaim/protocols/oscar/oscar.c:6512
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "Complemento de protocolo AIM/ICQ"
-
-#: ../libgaim/protocols/oscar/oscar.c:6537
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
-#: ../libgaim/protocols/zephyr/zephyr.c:2980
-msgid "Encoding"
-msgstr "Codificación"
-
-#: ../libgaim/protocols/oscar/oscar.c:6541
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr "Utilizar un servidor proxy de AIM/ICQ para transferencias de ficheros (lento, pero no descubre su dirección IP)"
-
-#: ../libgaim/protocols/oscar/peer.c:623
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-"Solicitando a %s que se conecte con nosotros en %s:%hu para MI directo."
-
-#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
-#, c-format
-msgid "Attempting to connect to %s:%hu."
-msgstr "Intentando conectarse a %s:%hu."
-
-#: ../libgaim/protocols/oscar/peer.c:803
-msgid "Attempting to connect via proxy server."
-msgstr "Intentando la conexión a través de un servidor proxy."
-
-#: ../libgaim/protocols/oscar/peer.c:980
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s pide conectarse directamente a %s"
-
-#: ../libgaim/protocols/oscar/peer.c:984
-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 ""
-"Esto requiere una conexión directa entre las dos computadoras y es necesario "
-"para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
-"esto como un riesgo a su privacidad."
-
-#: ../libgaim/protocols/qq/buddy_info.c:37
-msgid "Primary Information"
-msgstr "Información principal"
-
-#: ../libgaim/protocols/qq/buddy_info.c:39
-msgid "Personal Introduction"
-msgstr "Introducción personal"
-
-#: ../libgaim/protocols/qq/buddy_info.c:40
-msgid "QQ Number"
-msgstr "Número QQ"
-
-#: ../libgaim/protocols/qq/buddy_info.c:45
-msgid "Country/Region"
-msgstr "País/Región"
-
-#: ../libgaim/protocols/qq/buddy_info.c:46
-msgid "Province/State"
-msgstr "Provincia/Estado"
-
-#: ../libgaim/protocols/qq/buddy_info.c:48
-msgid "Horoscope Symbol"
-msgstr "Símbolo del horóscopo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:50
-msgid "Zodiac Sign"
-msgstr "Signo zodiacal"
-
-#: ../libgaim/protocols/qq/buddy_info.c:51
-msgid "Blood Type"
-msgstr "Grupo sanguíneo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:52
-msgid "College"
-msgstr "Universidad"
-
-#: ../libgaim/protocols/qq/buddy_info.c:53
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: ../libgaim/protocols/qq/buddy_info.c:55
-msgid "Zipcode"
-msgstr "Código postal"
-
-#: ../libgaim/protocols/qq/buddy_info.c:56
-msgid "Cellphone Number"
-msgstr "Número de móvil"
-
-#: ../libgaim/protocols/qq/buddy_info.c:57
-msgid "Phone Number"
-msgstr "Número de teléfono"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Aquarius"
-msgstr "Acuario"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Pisces"
-msgstr "Piscis"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Aries"
-msgstr "Aries"
-
-#: ../libgaim/protocols/qq/buddy_info.c:62
-msgid "Taurus"
-msgstr "Tauro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Gemini"
-msgstr "Géminis"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Cancer"
-msgstr "Cáncer"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Leo"
-msgstr "Leo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Virgo"
-msgstr "Virgo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:63
-msgid "Libra"
-msgstr "Libra"
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Scorpio"
-msgstr "Escorpio"
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Sagittarius"
-msgstr "Sagitario"
-
-#: ../libgaim/protocols/qq/buddy_info.c:64
-msgid "Capricorn"
-msgstr "Capricornio"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Rat"
-msgstr "Rata"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Ox"
-msgstr "Buey"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Tiger"
-msgstr "Tigre"
-
-#: ../libgaim/protocols/qq/buddy_info.c:69
-msgid "Rabbit"
-msgstr "Conejo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Dragon"
-msgstr "Dragón"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Snake"
-msgstr "Serpiente"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Horse"
-msgstr "Caballo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Goat"
-msgstr "Cabra"
-
-#: ../libgaim/protocols/qq/buddy_info.c:70
-msgid "Monkey"
-msgstr "Mono"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-msgid "Rooster"
-msgstr "Gallo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-msgid "Dog"
-msgstr "Perro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:71
-msgid "Pig"
-msgstr "Cerdo"
-
-#: ../libgaim/protocols/qq/buddy_info.c:76
-msgid "Other"
-msgstr "Otro"
-
-#: ../libgaim/protocols/qq/buddy_info.c:477
-#: ../libgaim/protocols/qq/buddy_info.c:478
-msgid "Modify my information"
-msgstr "Modificar mi información"
-
-#: ../libgaim/protocols/qq/buddy_info.c:479
-msgid "Update my information"
-msgstr "Actualizar mi información"
-
-#: ../libgaim/protocols/qq/buddy_info.c:502
-msgid "Your information has been updated"
-msgstr "Se ha modificado su información."
-
-#: ../libgaim/protocols/qq/buddy_opt.c:205
-#: ../libgaim/protocols/qq/group_opt.c:133
-#, c-format
-msgid "You rejected %d's request"
-msgstr "Ha rechazado la solicitud de %d"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:206
-#: ../libgaim/protocols/qq/group_opt.c:134
-msgid "Input your reason:"
-msgstr "Introduzca sus motivos:"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-msgid "Reject request"
-msgstr "Rechazar solicitud"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:209
-#: ../libgaim/protocols/qq/group_opt.c:137
-msgid "Sorry, you are not my type..."
-msgstr "Lo siento, no eres mi tipo..."
-
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/group_im.c:134
-#: ../libgaim/protocols/qq/group_opt.c:123
-#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
-msgid "Reject"
-msgstr "Rechazar"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:270
-msgid "Add buddy with auth request fails"
-msgstr "Fallo al añadir un amigo con solicitud de autenticación"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:301
-msgid "You have successfully removed a buddy"
-msgstr "Ha eliminado un amigo con éxito"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:329
-msgid "You have successfully removed yourself from a buddy"
-msgstr "Se ha borrado con éxito de un amigo"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:393
-#, c-format
-msgid "User %d needs authentication"
-msgstr "El usuario %d necesita autenticación"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:395
-#: ../libgaim/protocols/qq/group_join.c:132
-msgid "Input request here"
-msgstr "Introduzca su solicitud a continuación"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:396
-#: ../libgaim/protocols/qq/group_join.c:133
-msgid "Would you be my friend?"
-msgstr "¿Quieres ser mi amigo?"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
-#: ../libgaim/protocols/qq/group_opt.c:138
-#: ../libgaim/protocols/qq/sendqueue.c:198
-msgid "Send"
-msgstr "Enviar"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:404
-#, c-format
-msgid "You have added %d in buddy list"
-msgstr "Ha añadido %d a su lista de amigos."
-
-#: ../libgaim/protocols/qq/buddy_opt.c:501
-msgid "QQid Error"
-msgstr "Error QQid"
-
-#: ../libgaim/protocols/qq/buddy_opt.c:502
-msgid "Invalid QQid"
-msgstr "QQid inválido"
-
-#: ../libgaim/protocols/qq/group.c:63
-msgid "ID: "
-msgstr "ID: "
-
-#: ../libgaim/protocols/qq/group.c:96
-msgid "Group ID"
-msgstr "ID de grupo:"
-
-#: ../libgaim/protocols/qq/group.c:98
-msgid "Creator"
-msgstr "Creador"
-
-#: ../libgaim/protocols/qq/group.c:101
-msgid "Group Description"
-msgstr "Descripción del grupo"
-
-#: ../libgaim/protocols/qq/group.c:107
-msgid "Auth"
-msgstr "Autorizar"
-
-#: ../libgaim/protocols/qq/group.c:117
-msgid "QQ Qun"
-msgstr "QQ Qun"
-
-#: ../libgaim/protocols/qq/group.c:118
-msgid "Please input external group ID"
-msgstr "Indique su ID de grupo externo"
-
-#: ../libgaim/protocols/qq/group.c:119
-msgid "You can only search for permanent QQ groups\n"
-msgstr "Sólo puede buscar grupos QQ permanentes\n"
-
-#: ../libgaim/protocols/qq/group_im.c:120
-#, c-format
-msgid "User %d applied to join group %d"
-msgstr "El usuario %d solicitó entrar en el grupo %d"
-
-#: ../libgaim/protocols/qq/group_im.c:121
-#: ../libgaim/protocols/qq/group_im.c:170
-#: ../libgaim/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "Reason: %s"
-msgstr "Razón: %s"
-
-#: ../libgaim/protocols/qq/group_im.c:128
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/group_im.c:212
-#: ../libgaim/protocols/qq/group_im.c:247
-#: ../libgaim/protocols/qq/group_im.c:281
-#: ../libgaim/protocols/qq/group_join.c:227
-#: ../libgaim/protocols/qq/group_join.c:353
-#: ../libgaim/protocols/qq/group_opt.c:228
-#: ../libgaim/protocols/qq/group_opt.c:298
-#: ../libgaim/protocols/qq/group_opt.c:384
-msgid "QQ Qun Operation"
-msgstr "Opciones QQ Qun"
-
-#: ../libgaim/protocols/qq/group_im.c:131
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
-msgid "Approve"
-msgstr "Aprobar"
-
-#: ../libgaim/protocols/qq/group_im.c:169
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr "Su solicitud de unirse al grupo %d ha sido rechazada por el administrador %d"
-
-#: ../libgaim/protocols/qq/group_im.c:210
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %d"
-
-#: ../libgaim/protocols/qq/group_im.c:246
-#, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr "Vd. [%d] ha salido del grupo «%d»"
-
-#: ../libgaim/protocols/qq/group_im.c:280
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
-
-#: ../libgaim/protocols/qq/group_im.c:281
-msgid "This group has been added to your buddy list"
-msgstr "Se ha añadido este grupo a su lista de amigos."
-
-#: ../libgaim/protocols/qq/group_internal.c:39
-msgid "I am not member"
-msgstr "No soy miembro"
-
-#: ../libgaim/protocols/qq/group_internal.c:42
-msgid "I am a member"
-msgstr "Soy miembro"
-
-#: ../libgaim/protocols/qq/group_internal.c:45
-msgid "I am applying to join"
-msgstr "He solicitado unirme"
-
-#: ../libgaim/protocols/qq/group_internal.c:48
-msgid "I am the admin"
-msgstr "Soy el administrador"
-
-#: ../libgaim/protocols/qq/group_internal.c:51
-msgid "Unknown status"
-msgstr "Estado desconocido"
-
-#: ../libgaim/protocols/qq/group_join.c:78
-msgid "This group does not allow others to join"
-msgstr "Este grupo no permite que otros se unan"
-
-#: ../libgaim/protocols/qq/group_join.c:227
-msgid "You have successfully exited the group"
-msgstr "Ha salido con éxito del grupo"
-
-#: ../libgaim/protocols/qq/group_join.c:251
-msgid "QQ Group Auth"
-msgstr "Autenticación grupo QQ"
-
-#: ../libgaim/protocols/qq/group_join.c:252
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr "El servidor QQ ha aceptado su operación de autorización"
-
-#: ../libgaim/protocols/qq/group_join.c:323
-msgid "You inputted a group id outside the acceptable range"
-msgstr "Ha introducido un identificador de grupo que está fuera del rango permitido"
-
-#: ../libgaim/protocols/qq/group_join.c:354
-msgid "Are you sure to exit this Qun?"
-msgstr "¿Seguro que quiere dejar este Qun?"
-
-#: ../libgaim/protocols/qq/group_join.c:356
-msgid ""
-"Note, if you are the creator, \n"
-"this operation will eventually remove this Qun."
-msgstr ""
-"Tenga en cuenta que si vd. lo ha creado\n"
-"esta operación eliminará este Qun eventualmente."
-
-#: ../libgaim/protocols/qq/group_join.c:359
-msgid "Go ahead"
-msgstr "Adelante"
-
-#: ../libgaim/protocols/qq/group_network.c:88
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Código [0x%02X]: %s"
-
-#: ../libgaim/protocols/qq/group_network.c:89
-msgid "Group Operation Error"
-msgstr "Error de operación de grupo"
-
-#: ../libgaim/protocols/qq/group_opt.c:122
-#: ../libgaim/protocols/qq/sys_msg.c:82
-msgid "Do you wanna approve the request?"
-msgstr "¿Desea aprovar esta solicitud?"
-
-#: ../libgaim/protocols/qq/group_opt.c:228
-msgid "You have successfully modify Qun member"
-msgstr "Ha modificado el miembro Qun con éxito"
-
-#: ../libgaim/protocols/qq/group_opt.c:298
-msgid "You have successfully modify Qun information"
-msgstr "Ha modificado la información Qun con éxito"
-
-#: ../libgaim/protocols/qq/group_opt.c:385
-msgid "You have successfully created a Qun"
-msgstr "Ha creado un Qun con éxito"
-
-#: ../libgaim/protocols/qq/group_opt.c:387
-msgid "Would you like to set up the Qun details now?"
-msgstr "¿Desea establecer los detalles de Qun ahora?"
-
-#: ../libgaim/protocols/qq/group_opt.c:388
-msgid "Setup"
-msgstr "Configurar"
-
-#: ../libgaim/protocols/qq/im.c:421
-msgid "System Message"
-msgstr "Mensaje del sistema"
-
-#: ../libgaim/protocols/qq/im.c:565
-msgid "Server ACK"
-msgstr "ACK de servidor"
-
-#: ../libgaim/protocols/qq/im.c:565
-msgid "Send IM fail\n"
-msgstr "Fallo en el envío de IM\n"
-
-#: ../libgaim/protocols/qq/keep_alive.c:81
-msgid "Keep alive error, seems connection lost!"
-msgstr "Error de mantenimiento, ¡parece que se ha perdido la conexión!"
-
-#: ../libgaim/protocols/qq/login_logout.c:401
-msgid "Request login token error!"
-msgstr "¡Error al solicitar token para conectarse!"
-
-#: ../libgaim/protocols/qq/login_logout.c:472
-msgid "Wrong password!"
-msgstr "¡Contraseña errónea!"
-
-#: ../libgaim/protocols/qq/login_logout.c:475
-msgid "Unable to login, check debug log"
-msgstr "No pudo conectarse, compruebe el registro de depuración"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2356
-#: ../libgaim/protocols/yahoo/yahoo.c:2383
-#: ../libgaim/protocols/yahoo/yahoo.c:2490
-#: ../libgaim/protocols/yahoo/yahoo.c:2511
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
-msgid "Unable to connect."
-msgstr "No se pudo conectar."
-
-#: ../libgaim/protocols/qq/qq.c:283
-msgid "QQ: Available"
-msgstr "QQ: Disponible"
-
-#: ../libgaim/protocols/qq/qq.c:287
-msgid "QQ: Away"
-msgstr "QQ: Ausente"
-
-#: ../libgaim/protocols/qq/qq.c:291
-msgid "QQ: Invisible"
-msgstr "QQ: Invisible"
-
-#: ../libgaim/protocols/qq/qq.c:295
-msgid "QQ: Offline"
-msgstr "QQ: Desconectado"
-
-#: ../libgaim/protocols/qq/qq.c:372
-msgid "Invalid name"
-msgstr "Nombre inválido"
-
-#: ../libgaim/protocols/qq/qq.c:442
-msgid "Selection"
-msgstr "Selección"
-
-#: ../libgaim/protocols/qq/qq.c:445
-msgid "Select a number"
-msgstr "Seleccione un número"
-
-#: ../libgaim/protocols/qq/qq.c:451
-msgid "Faces"
-msgstr "Caras"
-
-#: ../libgaim/protocols/qq/qq.c:456
-msgid "Change Your QQ Face"
-msgstr "Cambiaar tu cara QQ"
-
-#: ../libgaim/protocols/qq/qq.c:457
-msgid "Change Face"
-msgstr "Cambiar cara"
-
-#: ../libgaim/protocols/qq/qq.c:458
-msgid "Update"
-msgstr "Actualizar"
-
-#: ../libgaim/protocols/qq/qq.c:512
-#, c-format
-msgid "<b>Current Online</b>: %d<br>\n"
-msgstr "<b>Conectados actualmente</b>: %d<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:513
-#, c-format
-msgid "<b>Last Refresh</b>: %s<br>\n"
-msgstr "<b>Última actualización</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:517
-#, c-format
-msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>Modo de conexión</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:518
-#, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP del servidor</b>: %s: %d<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:519
-#, c-format
-msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr "<B>Mi IP pública</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:524
-#, c-format
-msgid "<b>Login Time</b>: %s<br>\n"
-msgstr "<b>Hora de conexión</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:525
-#, c-format
-msgid "<b>Last Login IP</b>: %s<br>\n"
-msgstr "<b>Última IP de conexión</b>: %s<br>\n"
-
-#: ../libgaim/protocols/qq/qq.c:526
-#, c-format
-msgid "<b>Last Login Time</b>: %s\n"
-msgstr "<b>Último hora de conexión</b>: %s\n"
-
-#: ../libgaim/protocols/qq/qq.c:530
-msgid "Login Information"
-msgstr "Información de conexión"
-
-#: ../libgaim/protocols/qq/qq.c:802
-msgid "Modify My Information"
-msgstr "Modificar mi información"
-
-#: ../libgaim/protocols/qq/qq.c:805
-msgid "Change My Face"
-msgstr "Cambiar mi cara"
-
-#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
-msgid "Change Password"
-msgstr "Cambiar contraseña"
-
-#: ../libgaim/protocols/qq/qq.c:811
-msgid "Show Login Information"
-msgstr "Mostrar la información de conexión"
-
-#: ../libgaim/protocols/qq/qq.c:837
-msgid "Exit this QQ Qun"
-msgstr "Salir de este Qun QQ"
-
-#: ../libgaim/protocols/qq/qq.c:922
-msgid "This function has not be implemented yet"
-msgstr "Aún no se ha implementado esta función"
-
-#: ../libgaim/protocols/qq/qq.c:922
-msgid "Please wait for new version"
-msgstr "Por favor, espere a una nueva versión"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
 msgid "QQ Protocol\tPlugin"
 msgstr "Complemento de protocolo QQ"
 
-#: ../libgaim/protocols/qq/qq.c:1025
+#: ../libgaim/protocols/qq/qq.c:752
 msgid "Login in TCP"
 msgstr "Conexión en TCP"
 
-#: ../libgaim/protocols/qq/qq.c:1028
+#: ../libgaim/protocols/qq/qq.c:755
 msgid "Login Hidden"
 msgstr "Conexión oculta"
 
-#: ../libgaim/protocols/qq/qq.c:1031
-msgid "QQ Server"
-msgstr "Servidor QQ"
-
-#: ../libgaim/protocols/qq/qq.c:1034
-msgid "QQ Port"
-msgstr "Puerto QQ"
-
-#: ../libgaim/protocols/qq/qq_proxy.c:493
+#: ../libgaim/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr "Error de envío al socket"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:496
+#: ../libgaim/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Conexión rehusada"
 
-#: ../libgaim/protocols/qq/recv_core.c:298
+#: ../libgaim/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Error de socket"
 
-#: ../libgaim/protocols/qq/recv_core.c:308
+#: ../libgaim/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "No se pudo leer del socket"
 
-#: ../libgaim/protocols/qq/send_file.c:708
-#, c-format
-msgid "Your request to send file[%s] has been rejected by buddy[%d]"
-msgstr "Su solicitud de envío de archivo[%s] ha sido rechazada por el amigo[%d]"
-
-#: ../libgaim/protocols/qq/send_file.c:711
-#: ../libgaim/protocols/qq/send_file.c:740
+#: ../libgaim/protocols/qq/send_file.c:706
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d ha rechazado el archivo %s"
+
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr "Archivo enviado"
 
-#: ../libgaim/protocols/qq/send_file.c:737
-#, c-format
-msgid "The sending process of file[%s] has been canceled by buddy[%d]"
-msgstr "El proceso de envío de fichero[%s] ha sido cancelado por el amigo[%d]"
-
-#: ../libgaim/protocols/qq/sendqueue.c:167
-msgid "Connection lost!"
-msgstr "¡Conexión perdida!"
-
-#. cancel logging progress
-#: ../libgaim/protocols/qq/sendqueue.c:174
-msgid "Login failed, no reply!"
-msgstr "Fallo en la conexión, ¡no ha habido respuesta!"
-
-#: ../libgaim/protocols/qq/sendqueue.c:179
-msgid "Connection timeout!"
-msgstr "¡Expiró la conexión!"
-
-#: ../libgaim/protocols/qq/sendqueue.c:179
-msgid "User info is not updated"
-msgstr "La información del usuario no está actualizada"
-
-#: ../libgaim/protocols/qq/sendqueue.c:194
-msgid "Send packet"
-msgstr "Enviar paquete"
-
-#: ../libgaim/protocols/qq/sendqueue.c:196
-msgid "Packets lost, send again?"
-msgstr "Se han perdido paquetes, ¿enviar de nuevo?"
-
-#: ../libgaim/protocols/qq/sys_msg.c:101
+#: ../libgaim/protocols/qq/send_file.c:735
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%d canceló la transferencia de %s"
+
+#: ../libgaim/protocols/qq/sendqueue.c:122
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
+#. cancel login progress
+#: ../libgaim/protocols/qq/sendqueue.c:130
+msgid "Login failed, no reply"
+msgstr "Fallo en la conexión, no ha habido respuesta"
+
+#: ../libgaim/protocols/qq/sys_msg.c:103
 msgid "Do you wanna add this buddy?"
 msgstr "¿Desea añadir este amigo?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:153
+#: ../libgaim/protocols/qq/sys_msg.c:155
 #, c-format
 msgid "You have been added by %s"
 msgstr "Ha sido añadido por %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:156
+#: ../libgaim/protocols/qq/sys_msg.c:158
 msgid "Would like to add him?"
 msgstr "¿Desea añadirle?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:162
+#: ../libgaim/protocols/qq/sys_msg.c:164
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s le ha añadido [%s]"
 
-#: ../libgaim/protocols/qq/sys_msg.c:177
+#: ../libgaim/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr "El usuario %s rechazó su solicitud"
 
-#: ../libgaim/protocols/qq/sys_msg.c:197
+#: ../libgaim/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "User %s has approved your request"
 msgstr "El usuario %s ha aprobado su solicitud"
 
-#: ../libgaim/protocols/qq/sys_msg.c:220
+#: ../libgaim/protocols/qq/sys_msg.c:222
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s quiere añadirle [%s] como amigo"
 
-#: ../libgaim/protocols/qq/sys_msg.c:221
+#: ../libgaim/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:242
+#: ../libgaim/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s no está en su lista de amigos"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libgaim/protocols/qq/sys_msg.c:246
 msgid "Would you like to add him?"
 msgstr "¿Desea añadirle?"
 
-#: ../libgaim/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Conexión cerrada (escribiendo)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título de grupo:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1262
+#: ../libgaim/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Identificador de grupo «Notes»:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1264
+#: ../libgaim/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Información sobre el grupo %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1266
+#: ../libgaim/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Información de la libreta de direcciones «Notes»"
 
-#: ../libgaim/protocols/sametime/sametime.c:1298
+#: ../libgaim/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo a la conferencia..."
 
-#: ../libgaim/protocols/sametime/sametime.c:1308
+#: ../libgaim/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Obtener la información de la libreta de direcciones «Notes»"
 
-#: ../libgaim/protocols/sametime/sametime.c:1461
+#: ../libgaim/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Enviando negociación"
 
-#: ../libgaim/protocols/sametime/sametime.c:1466
+#: ../libgaim/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptación del saludo inicial"
 
-#: ../libgaim/protocols/sametime/sametime.c:1471
+#: ../libgaim/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se aceptó el saludo inicial. Enviando la identificación"
 
-#: ../libgaim/protocols/sametime/sametime.c:1476
+#: ../libgaim/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptación de la identificación"
 
-#: ../libgaim/protocols/sametime/sametime.c:1481
+#: ../libgaim/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Identificación redirigida"
 
-#: ../libgaim/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Forzando la identificación"
 
-#: ../libgaim/protocols/sametime/sametime.c:1491
+#: ../libgaim/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Identificación aceptada"
 
-#: ../libgaim/protocols/sametime/sametime.c:1496
+#: ../libgaim/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Arrancando servicios"
 
-#: ../libgaim/protocols/sametime/sametime.c:1501
+#: ../libgaim/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libgaim/protocols/sametime/sametime.c:1599
+#: ../libgaim/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
@@ -11810,80 +12226,73 @@
 "Un administrador de «Sametime» ha enviado el siguiente anuncio en el "
 "servidor %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1604
+#: ../libgaim/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador «Sametime»"
 
-#: ../libgaim/protocols/sametime/sametime.c:1656
+#: ../libgaim/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Conexión rehusada"
 
-#: ../libgaim/protocols/sametime/sametime.c:1663
+#: ../libgaim/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Error al leer del socket: %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1688
-#: ../libgaim/protocols/sametime/sametime.c:3685
+#: ../libgaim/protocols/sametime/sametime.c:1732
+#: ../libgaim/protocols/sametime/sametime.c:3745
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libgaim/protocols/sametime/sametime.c:1726
+#: ../libgaim/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1900
+#: ../libgaim/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Conferencia cerrada"
 
-#: ../libgaim/protocols/sametime/sametime.c:2357
+#: ../libgaim/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "No se pudo enviar el mensaje:"
 
-#: ../libgaim/protocols/sametime/sametime.c:2914
+#: ../libgaim/protocols/sametime/sametime.c:2960
 msgid "Place Closed"
 msgstr "Lugar cerrado"
 
-#: ../libgaim/protocols/sametime/sametime.c:3205
+#: ../libgaim/protocols/sametime/sametime.c:3251
 msgid "Microphone"
 msgstr "Micrófono"
 
-#: ../libgaim/protocols/sametime/sametime.c:3206
+#: ../libgaim/protocols/sametime/sametime.c:3252
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../libgaim/protocols/sametime/sametime.c:3207
+#: ../libgaim/protocols/sametime/sametime.c:3253
 msgid "Video Camera"
 msgstr "Vídeo cámara"
 
-#: ../libgaim/protocols/sametime/sametime.c:3211
+#: ../libgaim/protocols/sametime/sametime.c:3257
 msgid "File Transfer"
 msgstr "Transferencia de archivo"
 
-#: ../libgaim/protocols/sametime/sametime.c:3245
-#, c-format
-msgid ""
-"\n"
-"<b>Supports:</b> %s"
-msgstr ""
-"\n"
-"<b>Soporta:</b> %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:3250
-msgid ""
-"\n"
-"<b>External User</b>"
-msgstr ""
-"\n"
-"<b>Usuario externo</b>"
-
-#: ../libgaim/protocols/sametime/sametime.c:3356
+#: ../libgaim/protocols/sametime/sametime.c:3291
+#: ../libgaim/protocols/sametime/sametime.c:4165
+msgid "Supports"
+msgstr "Soporta"
+
+#: ../libgaim/protocols/sametime/sametime.c:3296
+#: ../libgaim/protocols/sametime/sametime.c:4139
+msgid "External User"
+msgstr "Usuario externo"
+
+#: ../libgaim/protocols/sametime/sametime.c:3402
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:3357
+#: ../libgaim/protocols/sametime/sametime.c:3403
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -11892,27 +12301,27 @@
 "Por favor ingrese tema para la nueva conferencia, y un mensaje de invitación "
 "que se enviará a %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3407
 msgid "New Conference"
 msgstr "Nueva conferencia"
 
-#: ../libgaim/protocols/sametime/sametime.c:3363
+#: ../libgaim/protocols/sametime/sametime.c:3409
 msgid "Create"
 msgstr "Crear"
 
-#: ../libgaim/protocols/sametime/sametime.c:3427
+#: ../libgaim/protocols/sametime/sametime.c:3473
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"
 
-#: ../libgaim/protocols/sametime/sametime.c:3433
+#: ../libgaim/protocols/sametime/sametime.c:3479
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3440
+#: ../libgaim/protocols/sametime/sametime.c:3486
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"
 
-#: ../libgaim/protocols/sametime/sametime.c:3441
+#: ../libgaim/protocols/sametime/sametime.c:3487
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11923,23 +12332,23 @@
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario también."
 
-#: ../libgaim/protocols/sametime/sametime.c:3446
+#: ../libgaim/protocols/sametime/sametime.c:3492
 msgid "Invite to Conference"
 msgstr "Invitar a conferencia"
 
-#: ../libgaim/protocols/sametime/sametime.c:3536
+#: ../libgaim/protocols/sametime/sametime.c:3582
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3541
+#: ../libgaim/protocols/sametime/sametime.c:3587
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../libgaim/protocols/sametime/sametime.c:3588
+#: ../libgaim/protocols/sametime/sametime.c:3634
 msgid "No Sametime Community Server specified"
 msgstr "No se ha especificado el servidor de comunidad «Sametime»"
 
-#: ../libgaim/protocols/sametime/sametime.c:3610
+#: ../libgaim/protocols/sametime/sametime.c:3656
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -11948,62 +12357,38 @@
 "No se ha configurado ninguna dirección IP o nombre de equipo para la cuenta "
 "«Meanwhile» %s. Introduzca uno más abajo para continuar el registro."
 
-#: ../libgaim/protocols/sametime/sametime.c:3615
+#: ../libgaim/protocols/sametime/sametime.c:3661
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración de la conexión «Meanwhile»"
 
-#: ../libgaim/protocols/sametime/sametime.c:3616
+#: ../libgaim/protocols/sametime/sametime.c:3662
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad «Sametime»"
 
-#: ../libgaim/protocols/sametime/sametime.c:4084
-msgid "<b>External User</b><br>"
-msgstr "<b>Usuario externo</b><br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4087
-#, c-format
-msgid "<b>User ID:</b> %s<br>"
-msgstr "<b>ID de usuario:</b> %s<br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4093
-#, c-format
-msgid "<b>Full Name:</b> %s<br>"
-msgstr "Nombre completo:</b> %s<br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4099
-msgid "<b>Last Known Client:</b> "
-msgstr "<b>Último cliente conocido:</b> "
-
-#: ../libgaim/protocols/sametime/sametime.c:4107
+#: ../libgaim/protocols/sametime/sametime.c:4155
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4114
-#, c-format
-msgid "<b>Supports:</b> %s<br>"
-msgstr "<b>Soportados:</b> %s<br>"
-
-#: ../libgaim/protocols/sametime/sametime.c:4120
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>Estado:</b> %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:4263
-#: ../libgaim/protocols/sametime/sametime.c:5427
+#: ../libgaim/protocols/sametime/sametime.c:4157
+msgid "Last Known Client"
+msgstr "Último cliente conocido:"
+
+#: ../libgaim/protocols/sametime/sametime.c:4321
+#: ../libgaim/protocols/sametime/sametime.c:5516
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:4266
-#: ../libgaim/protocols/sametime/sametime.c:5430
+#: ../libgaim/protocols/sametime/sametime.c:4324
+#: ../libgaim/protocols/sametime/sametime.c:5519
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libgaim/protocols/sametime/sametime.c:4290
+#: ../libgaim/protocols/sametime/sametime.c:4348
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"
 
-#: ../libgaim/protocols/sametime/sametime.c:4291
+#: ../libgaim/protocols/sametime/sametime.c:4349
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12013,15 +12398,15 @@
 "usuarios. Por favor seleccione el usuario de la lista mostrada para añadirlo "
 "a su lista de amigos."
 
-#: ../libgaim/protocols/sametime/sametime.c:4296
+#: ../libgaim/protocols/sametime/sametime.c:4354
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:4366
+#: ../libgaim/protocols/sametime/sametime.c:4438
 msgid "Unable to add user: user not found"
 msgstr "No se pudo añadir al usuario: el usuario no se ha encontrado"
 
-#: ../libgaim/protocols/sametime/sametime.c:4368
+#: ../libgaim/protocols/sametime/sametime.c:4440
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -12030,11 +12415,11 @@
 "El identificador «%s» no coincide con ningún usuario en la comunidad "
 "«Sametime». Se ha eliminado esta entrada de la lista de amigos."
 
-#: ../libgaim/protocols/sametime/sametime.c:4373
+#: ../libgaim/protocols/sametime/sametime.c:4445
 msgid "Unable to add user"
 msgstr "No puede añadir al usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:4945
+#: ../libgaim/protocols/sametime/sametime.c:5031
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12043,65 +12428,65 @@
 "Error al leer el archivo %s: \n"
 "%s\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5077
+#: ../libgaim/protocols/sametime/sametime.c:5166
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../libgaim/protocols/sametime/sametime.c:5082
+#: ../libgaim/protocols/sametime/sametime.c:5171
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"
 
 # Usar empotrable? (jfs)
-#: ../libgaim/protocols/sametime/sametime.c:5085
+#: ../libgaim/protocols/sametime/sametime.c:5174
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"
 
-#: ../libgaim/protocols/sametime/sametime.c:5087
+#: ../libgaim/protocols/sametime/sametime.c:5176
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"
 
-#: ../libgaim/protocols/sametime/sametime.c:5089
+#: ../libgaim/protocols/sametime/sametime.c:5178
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"
 
-#: ../libgaim/protocols/sametime/sametime.c:5091
+#: ../libgaim/protocols/sametime/sametime.c:5180
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"
 
-#: ../libgaim/protocols/sametime/sametime.c:5140
+#: ../libgaim/protocols/sametime/sametime.c:5229
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar la lista «Sametime» para la cuenta %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5179
+#: ../libgaim/protocols/sametime/sametime.c:5268
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista «Sametime» para la cuenta %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5232
+#: ../libgaim/protocols/sametime/sametime.c:5321
 msgid "Unable to add group: group exists"
 msgstr "No se pudo añadir el grupo: el grupo ya existe"
 
-#: ../libgaim/protocols/sametime/sametime.c:5233
+#: ../libgaim/protocols/sametime/sametime.c:5322
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grupo llamado '%s' ya existe en su lista de amigos."
 
-#: ../libgaim/protocols/sametime/sametime.c:5236
-#: ../libgaim/protocols/sametime/sametime.c:5365
+#: ../libgaim/protocols/sametime/sametime.c:5325
+#: ../libgaim/protocols/sametime/sametime.c:5454
 msgid "Unable to add group"
 msgstr "No se pudo añadir el grupo"
 
-#: ../libgaim/protocols/sametime/sametime.c:5295
+#: ../libgaim/protocols/sametime/sametime.c:5384
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"
 
-#: ../libgaim/protocols/sametime/sametime.c:5311
+#: ../libgaim/protocols/sametime/sametime.c:5400
 msgid "Notes Address Book group results"
 msgstr ""
 "Resultados de las notas de los grupos de la libreta de direcciones «Notes»"
 
-#: ../libgaim/protocols/sametime/sametime.c:5312
+#: ../libgaim/protocols/sametime/sametime.c:5401
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12112,15 +12497,15 @@
 "de la libreta de direcciones «Notes». Escoja el grupo más apropiado de la "
 "lista que se muestra abajo para añadirlo a su lista de amigos."
 
-#: ../libgaim/protocols/sametime/sametime.c:5317
+#: ../libgaim/protocols/sametime/sametime.c:5406
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones «Notes»"
 
-#: ../libgaim/protocols/sametime/sametime.c:5359
+#: ../libgaim/protocols/sametime/sametime.c:5448
 msgid "Unable to add group: group not found"
 msgstr "No se pudo añadir el grupo: no se ha encontrado el grupo"
 
-#: ../libgaim/protocols/sametime/sametime.c:5361
+#: ../libgaim/protocols/sametime/sametime.c:5450
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -12129,11 +12514,11 @@
 "El identificador «%s» no coincide con ninguno de los grupos de la libreta de "
 "direcciones «Notes» en su comunidad «Sametime»."
 
-#: ../libgaim/protocols/sametime/sametime.c:5402
+#: ../libgaim/protocols/sametime/sametime.c:5491
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos «Notes»"
 
-#: ../libgaim/protocols/sametime/sametime.c:5403
+#: ../libgaim/protocols/sametime/sametime.c:5492
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -12142,12 +12527,12 @@
 "campo a continuación para añadir al grupo y a sus miembros en su lista de "
 "amigos."
 
-#: ../libgaim/protocols/sametime/sametime.c:5451
+#: ../libgaim/protocols/sametime/sametime.c:5540
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la búsqueda '%s'"
 
-#: ../libgaim/protocols/sametime/sametime.c:5452
+#: ../libgaim/protocols/sametime/sametime.c:5541
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12158,24 +12543,26 @@
 "a continuación. Puede añadir estos usuarios a su lista de amigos o enviarles "
 "mensajes con los botones de acciones mostrados abajo."
 
-#: ../libgaim/protocols/sametime/sametime.c:5484
+#: ../libgaim/protocols/sametime/sametime.c:5573
 msgid "No matches"
 msgstr "No hubo coincidencias"
 
-#: ../libgaim/protocols/sametime/sametime.c:5485
+#: ../libgaim/protocols/sametime/sametime.c:5574
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "El identificador «%s» no coincide con ninguno de los usuarios en su comunidad «Sametime»."
-
-#: ../libgaim/protocols/sametime/sametime.c:5489
+msgstr ""
+"El identificador «%s» no coincide con ninguno de los usuarios en su "
+"comunidad «Sametime»."
+
+#: ../libgaim/protocols/sametime/sametime.c:5578
 msgid "No Matches"
 msgstr "No hubo coincidencias"
 
-#: ../libgaim/protocols/sametime/sametime.c:5526
+#: ../libgaim/protocols/sametime/sametime.c:5615
 msgid "Search for a user"
 msgstr "Buscar un usuario"
 
-#: ../libgaim/protocols/sametime/sametime.c:5527
+#: ../libgaim/protocols/sametime/sametime.c:5616
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -12183,32 +12570,32 @@
 "Introduzca el nombre o identificador parcial en el campo mostrado a "
 "continuación para buscar usuarios coincidentes en su comunidad «Sametime»."
 
-#: ../libgaim/protocols/sametime/sametime.c:5530
+#: ../libgaim/protocols/sametime/sametime.c:5619
 msgid "User Search"
 msgstr "Búsqueda de usuarios"
 
-#: ../libgaim/protocols/sametime/sametime.c:5542
+#: ../libgaim/protocols/sametime/sametime.c:5631
 msgid "Import Sametime List..."
 msgstr "Importar la lista «Sametime»..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5546
+#: ../libgaim/protocols/sametime/sametime.c:5635
 msgid "Export Sametime List..."
 msgstr "Exportar la lista «Sametime»..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5550
+#: ../libgaim/protocols/sametime/sametime.c:5639
 msgid "Add Notes Address Book Group..."
 msgstr "Añadir a la libreta de direcciones de grupos «Notes»..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5554
+#: ../libgaim/protocols/sametime/sametime.c:5643
 msgid "User Search..."
 msgstr "Búsqueda de los usuarios..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5651
+#: ../libgaim/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexión (ignorar redirecciones del servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5661
+#: ../libgaim/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Ocultar identidad de cliente"
 
@@ -12297,12 +12684,12 @@
 msgstr "Establecer contraseña MI"
 
 #: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1491 ../libgaim/protocols/silc/ops.c:1502
+#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obtener clave pública"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1492
-#: ../libgaim/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
+#: ../libgaim/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "No se pudo obtener la clave pública"
 
@@ -12316,14 +12703,14 @@
 msgid "Could not load public key"
 msgstr "No se pudo cargar la clave pública"
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1086
-#: ../libgaim/protocols/silc/ops.c:1158 ../libgaim/protocols/silc/ops.c:1293
-#: ../libgaim/protocols/silc/ops.c:1294 ../libgaim/protocols/silc/ops.c:1312
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Información de usuario"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1159
-#: ../libgaim/protocols/silc/ops.c:1313
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "No se pudo obtener la información del usuario %s"
 
@@ -12402,32 +12789,32 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
 #: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
 #: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
 #: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
 #: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:680
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
 #: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
 #: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "Invencible"
@@ -12436,52 +12823,52 @@
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
 #: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "Dormido"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
 #: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:690
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
 #: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:692
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
 #: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1195
+#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1204
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Ánimo"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1216
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1221
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1226
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1231
-#: ../libgaim/protocols/silc/silc.c:740 ../libgaim/protocols/silc/silc.c:742
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
+#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1236
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Localización"
 
@@ -12501,7 +12888,7 @@
 msgid "Get Public Key..."
 msgstr "Obtener clave pública..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1621
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Matar usuario"
 
@@ -12616,8 +13003,8 @@
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1906
-#: ../libgaim/protocols/silc/silc.c:948
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "Contraseña"
 
@@ -12715,15 +13102,15 @@
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "Orden de llamada"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1157
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "Orden desconocida"
 
@@ -12822,104 +13209,104 @@
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1016
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libgaim/protocols/silc/ops.c:1039
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Cumpleaños"
 
-#: ../libgaim/protocols/silc/ops.c:1047
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../libgaim/protocols/silc/ops.c:1051 ../libgaim/protocols/silc/silc.c:941
+#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "Organización"
 
-#: ../libgaim/protocols/silc/ops.c:1055
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Unidad"
 
-#: ../libgaim/protocols/silc/ops.c:1079
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libgaim/protocols/silc/ops.c:1127
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
-#: ../libgaim/protocols/silc/ops.c:1182 ../libgaim/protocols/silc/ops.c:1331
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
+#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Nombre real"
 
-#: ../libgaim/protocols/silc/ops.c:1210
+#: ../libgaim/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libgaim/protocols/silc/ops.c:1283 ../libgaim/protocols/silc/ops.c:1353
+#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Huella digital de la clave pública"
 
-#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Huella babble de la clave pública"
 
-#: ../libgaim/protocols/silc/ops.c:1297
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Más..."
 
-#: ../libgaim/protocols/silc/ops.c:1368 ../libgaim/protocols/silc/silc.c:1007
+#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1368
+#: ../libgaim/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: ../libgaim/protocols/silc/ops.c:1379
+#: ../libgaim/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: ../libgaim/protocols/silc/ops.c:1411
+#: ../libgaim/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libgaim/protocols/silc/ops.c:1459
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libgaim/protocols/silc/ops.c:1459
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "No se pudo obtener la lista de salas"
 
-#: ../libgaim/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "No se ha recibido una clave pública"
 
-#: ../libgaim/protocols/silc/ops.c:1516 ../libgaim/protocols/silc/ops.c:1529
+#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1517
+#: ../libgaim/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la información del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1546 ../libgaim/protocols/silc/ops.c:1555
+#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estadísticas del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1547
+#: ../libgaim/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estadísticas del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1556
+#: ../libgaim/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr "No se disponen de estadísticas del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1578
+#: ../libgaim/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12954,102 +13341,102 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: ../libgaim/protocols/silc/ops.c:1601
+#: ../libgaim/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estadísticas de red"
 
-#: ../libgaim/protocols/silc/ops.c:1609 ../libgaim/protocols/silc/ops.c:1614
+#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libgaim/protocols/silc/ops.c:1609
+#: ../libgaim/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr "Falló el ping"
 
-#: ../libgaim/protocols/silc/ops.c:1614
+#: ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Se recibió una respuesta al ping del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1622
+#: ../libgaim/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: ../libgaim/protocols/silc/ops.c:1706
+#: ../libgaim/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexión al servidor SILC"
 
-#: ../libgaim/protocols/silc/ops.c:1711
+#: ../libgaim/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr "Falló el intercambio de claves"
 
-#: ../libgaim/protocols/silc/ops.c:1720
+#: ../libgaim/protocols/silc/ops.c:1723
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Se produjo un fallo al retomar la sesión desligada. Pulse «Reconectar» para "
 "crear una nueva conexión."
 
-#: ../libgaim/protocols/silc/ops.c:1755
+#: ../libgaim/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1817 ../libgaim/protocols/silc/ops.c:1864
-#: ../libgaim/protocols/silc/silc.c:189
+#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
+#: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr "Reanudando la sesión"
 
-#: ../libgaim/protocols/silc/ops.c:1819
+#: ../libgaim/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Autenticando la conexión"
 
-#: ../libgaim/protocols/silc/ops.c:1866
+#: ../libgaim/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pública del servidor"
 
-#: ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/ops.c:1910
 msgid "Passphrase required"
 msgstr "Se necesita una contraseña"
 
-#: ../libgaim/protocols/silc/ops.c:1936
+#: ../libgaim/protocols/silc/ops.c:1939
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Fallo: Existe una diferencia en las versiones, por favor, actualice su "
 "cliente"
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libgaim/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libgaim/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libgaim/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libgaim/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libgaim/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
 
-#: ../libgaim/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
-#: ../libgaim/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1961
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"
 
-#: ../libgaim/protocols/silc/ops.c:1969
+#: ../libgaim/protocols/silc/ops.c:1972
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"
 
@@ -13092,53 +13479,53 @@
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pública no soportada"
 
-#: ../libgaim/protocols/silc/silc.c:160
+#: ../libgaim/protocols/silc/silc.c:159
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: ../libgaim/protocols/silc/silc.c:181
+#: ../libgaim/protocols/silc/silc.c:180
 msgid "Cannot initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexión del cliente SILC"
 
-#: ../libgaim/protocols/silc/silc.c:192
+#: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#: ../libgaim/protocols/silc/silc.c:278
+#: ../libgaim/protocols/silc/silc.c:277
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: ../libgaim/protocols/silc/silc.c:324
+#: ../libgaim/protocols/silc/silc.c:323
 msgid "Cannot initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
-#: ../libgaim/protocols/silc/silc.c:331
+#: ../libgaim/protocols/silc/silc.c:330
 msgid "Cannot find/access ~/.silc directory"
 msgstr "No se puede encontrar o acceder al directorio ~/.silc"
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:336
+#: ../libgaim/protocols/silc/silc.c:335
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#: ../libgaim/protocols/silc/silc.c:345
+#: ../libgaim/protocols/silc/silc.c:344
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "No se pudo cargar la clave pública SILC: %s"
 
-#: ../libgaim/protocols/silc/silc.c:367
+#: ../libgaim/protocols/silc/silc.c:365
 msgid "Unable to create connection"
 msgstr "No se pudo crear la conexión"
 
-#: ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "Su estado de ánimo actual"
 
-#: ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/silc.c:680
 msgid "In love"
 msgstr "Enamorado"
 
-#: ../libgaim/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13146,43 +13533,43 @@
 "\n"
 "Sus métodos de contacto preferidos"
 
-#: ../libgaim/protocols/silc/silc.c:703 ../libgaim/protocols/silc/util.c:559
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:705 ../libgaim/protocols/silc/util.c:561
+#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:707
+#: ../libgaim/protocols/silc/silc.c:703
 msgid "Video conferencing"
 msgstr "Video conferencia"
 
-#: ../libgaim/protocols/silc/silc.c:712
+#: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: ../libgaim/protocols/silc/silc.c:719
+#: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "Servicios en línea"
 
-#: ../libgaim/protocols/silc/silc.c:722
+#: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten qué servicios está utilizando"
 
-#: ../libgaim/protocols/silc/silc.c:728
+#: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten qué ordenador está utilizando"
 
-#: ../libgaim/protocols/silc/silc.c:735
+#: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: ../libgaim/protocols/silc/silc.c:747 ../libgaim/protocols/silc/silc.c:748
+#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en línea"
 
-#: ../libgaim/protocols/silc/silc.c:749
+#: ../libgaim/protocols/silc/silc.c:745
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -13192,169 +13579,169 @@
 "línea así como su información personal. Por favor, rellene la información "
 "que desea que otros usuarios vean de vd."
 
-#: ../libgaim/protocols/silc/silc.c:789 ../libgaim/protocols/silc/silc.c:795
-#: ../libgaim/protocols/silc/silc.c:1434
+#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
 msgstr "Mensaje del día"
 
-#: ../libgaim/protocols/silc/silc.c:789
+#: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del día"
 
-#: ../libgaim/protocols/silc/silc.c:790 ../libgaim/protocols/silc/silc.c:1429
+#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del día asociado con esta conexión"
 
-#: ../libgaim/protocols/silc/silc.c:841 ../libgaim/protocols/silc/silc.c:885
-#: ../libgaim/protocols/silc/silc.c:956 ../libgaim/protocols/silc/silc.c:957
+#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
+#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"
 
-#: ../libgaim/protocols/silc/silc.c:841
+#: ../libgaim/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
 msgstr "Las contraseñas no coinciden."
 
-#: ../libgaim/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
 msgstr "Falló la generación de claves"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libgaim/protocols/silc/silc.c:920
 msgid "Key length"
 msgstr "Longitud de clave"
 
-#: ../libgaim/protocols/silc/silc.c:926
+#: ../libgaim/protocols/silc/silc.c:922
 msgid "Public key file"
 msgstr "Fichero de clave pública"
 
-#: ../libgaim/protocols/silc/silc.c:928
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Private key file"
 msgstr "Fichero de clave privada"
 
-#: ../libgaim/protocols/silc/silc.c:951
+#: ../libgaim/protocols/silc/silc.c:947
 msgid "Passphrase (retype)"
 msgstr "Contraseña (escribir de nuevo)"
 
-#: ../libgaim/protocols/silc/silc.c:958
+#: ../libgaim/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"
 
-#: ../libgaim/protocols/silc/silc.c:1002
+#: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "Estado en línea"
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del día"
 
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../libgaim/protocols/silc/silc.c:1114
+#: ../libgaim/protocols/silc/silc.c:1110
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "El usuario <I>%s</I> no está en la red"
 
-#: ../libgaim/protocols/silc/silc.c:1305
+#: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: ../libgaim/protocols/silc/silc.c:1386
+#: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: ../libgaim/protocols/silc/silc.c:1488
+#: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: ../libgaim/protocols/silc/silc.c:1493
+#: ../libgaim/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "los modos del canal de %s son: %s"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libgaim/protocols/silc/silc.c:1495
+#: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no se han definido modos de canal para %s"
 
-#: ../libgaim/protocols/silc/silc.c:1508
+#: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "No se pudieron fijar los modos de canal para %s"
 
-#: ../libgaim/protocols/silc/silc.c:1538
+#: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Orden desconocida: %s, (puede ser un error de Gaim)"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
+#: ../libgaim/protocols/silc/silc.c:1601
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [canal]:  Abandonar un chat"
+
 #: ../libgaim/protocols/silc/silc.c:1605
-msgid "leave [channel]:  Leave the chat"
-msgstr "leave [canal]:  Abandonar un chat"
-
-#: ../libgaim/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuevo tema&gt;]:  Ver o cambiar el tema"
 
+#: ../libgaim/protocols/silc/silc.c:1610
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "join &lt;canal&gt; [&lt;contraseña&gt;:  Unirse a un chat en esta red"
+
 #: ../libgaim/protocols/silc/silc.c:1614
-msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;canal&gt; [&lt;contraseña&gt;:  Unirse a un chat en esta red"
-
-#: ../libgaim/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: ../libgaim/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: ../libgaim/protocols/silc/silc.c:1626
-#: ../libgaim/protocols/zephyr/zephyr.c:2681
+#: ../libgaim/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libgaim/protocols/silc/silc.c:1626
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar el mensaje del día del servidor"
 
+#: ../libgaim/protocols/silc/silc.c:1634
+msgid "detach:  Detach this session"
+msgstr "detach:  Desligar esta sesión"
+
 #: ../libgaim/protocols/silc/silc.c:1638
-msgid "detach:  Detach this session"
-msgstr "detach:  Desligar esta sesión"
-
-#: ../libgaim/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual opcionalmente indicando un "
 "mensaje"
 
-#: ../libgaim/protocols/silc/silc.c:1646
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;orden&gt;:  Ejecutar una orden cualquiera del cliente SILC"
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libgaim/protocols/silc/silc.c:1648
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|%lt;razón%gt;]:  Matar un alias"
 
+#: ../libgaim/protocols/silc/silc.c:1652
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
+
 #: ../libgaim/protocols/silc/silc.c:1656
-msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;apodo&gt;:  Mostrar información del apodo"
 
 #: ../libgaim/protocols/silc/silc.c:1660
-msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;apodo&gt;:  Mostrar información del apodo"
-
-#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -13362,7 +13749,7 @@
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libgaim/protocols/silc/silc.c:1664
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -13370,15 +13757,15 @@
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos_usuario&gt;:  Establecer sus modos en la red"
 
+#: ../libgaim/protocols/silc/silc.c:1672
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
+
 #: ../libgaim/protocols/silc/silc.c:1676
-msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
-
-#: ../libgaim/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -13386,39 +13773,39 @@
 "invite &lt;canal&gt; [-|+]&lt;apodo&gt;:   invita a un apodo o añade/elimina "
 "el apodo de la lista de invitados para el canal"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;apodo&gt; [comentario]:  Echar a un cliente del canal"
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
+#: ../libgaim/protocols/silc/silc.c:1688
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;canal&gt; +|-&lt;apodo&gt;]:  Expulsar a un cliente del canal"
+
 #: ../libgaim/protocols/silc/silc.c:1692
-msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;canal&gt; +|-&lt;apodo&gt;]:  Expulsar a un cliente del canal"
-
-#: ../libgaim/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;apodo|servidor&gt;:  Obtiene la clave pública del servidor o del "
 "cliente"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadísticas del servidor y de la red"
 
-#: ../libgaim/protocols/silc/silc.c:1704
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que está conectado"
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;canal&gt;:  Obtiene la lista de los usuarios que están en el canal"
 
-#: ../libgaim/protocols/silc/silc.c:1713
+#: ../libgaim/protocols/silc/silc.c:1709
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13435,60 +13822,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1823
+#: ../libgaim/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1825
+#: ../libgaim/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: ../libgaim/protocols/silc/silc.c:1862
+#: ../libgaim/protocols/silc/silc.c:1859
 msgid "Public Key file"
 msgstr "Fichero de clave pública"
 
-#: ../libgaim/protocols/silc/silc.c:1866
+#: ../libgaim/protocols/silc/silc.c:1863
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: ../libgaim/protocols/silc/silc.c:1876
+#: ../libgaim/protocols/silc/silc.c:1873
 msgid "Cipher"
 msgstr "Cifrado"
 
+#: ../libgaim/protocols/silc/silc.c:1883
+msgid "HMAC"
+msgstr "HMAC"
+
 #: ../libgaim/protocols/silc/silc.c:1886
-msgid "HMAC"
-msgstr "HMAC"
+msgid "Public key authentication"
+msgstr "Autenticación de clave pública"
 
 #: ../libgaim/protocols/silc/silc.c:1889
-msgid "Public key authentication"
-msgstr "Autenticación de clave pública"
+msgid "Reject watching by other users"
+msgstr "Impedir que otros usuarios miren"
 
 #: ../libgaim/protocols/silc/silc.c:1892
-msgid "Reject watching by other users"
-msgstr "Impedir que otros usuarios miren"
+msgid "Block invites"
+msgstr "Bloquear invitaciones"
 
 #: ../libgaim/protocols/silc/silc.c:1895
-msgid "Block invites"
-msgstr "Bloquear invitaciones"
+msgid "Block IMs without Key Exchange"
+msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
 #: ../libgaim/protocols/silc/silc.c:1898
-msgid "Block IMs without Key Exchange"
-msgstr "Bloquear MIs que no hagan un intercambio de claves"
+msgid "Reject online status attribute requests"
+msgstr "Rechazar solicitudes de los atributos del estado en línea"
 
 #: ../libgaim/protocols/silc/silc.c:1901
-msgid "Reject online status attribute requests"
-msgstr "Rechazar solicitudes de los atributos del estado en línea"
-
-#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensajes a la pizarra"
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra automáticamente"
 
-#: ../libgaim/protocols/silc/silc.c:1910
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Digitally sign and verify all messages"
 msgstr "Firmar digitalmente todos los mensajes instantáneos"
 
@@ -13606,33 +13993,28 @@
 msgstr "No se pudo escribir"
 
 #: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1484
+#: ../libgaim/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: ../libgaim/protocols/simple/simple.c:1037
-msgid "Wrong Password"
-msgstr "Contraseña errónea"
-
-#: ../libgaim/protocols/simple/simple.c:1518
-#: ../libgaim/protocols/simple/simple.c:1560
-#: ../libgaim/protocols/simple/simple.c:1574
-#: ../libgaim/protocols/simple/simple.c:1626
+#: ../libgaim/protocols/simple/simple.c:1516
+#: ../libgaim/protocols/simple/simple.c:1558
+#: ../libgaim/protocols/simple/simple.c:1571
+#: ../libgaim/protocols/simple/simple.c:1622
 msgid "Could not create listen socket"
 msgstr "No se pudo crear el socket de escucha"
 
-#: ../libgaim/protocols/simple/simple.c:1541
+#: ../libgaim/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr "No se pudo resolver el nombre"
 
-#: ../libgaim/protocols/simple/simple.c:1634
+#: ../libgaim/protocols/simple/simple.c:1630
 msgid "Could not resolve hostname"
 msgstr "No se pudo resolver el nombre de sistema"
 
-#: ../libgaim/protocols/simple/simple.c:1651
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr ""
-"Los nombres de usuario SIP no pueden tener espacios en blanco ni el símbolo @"
+#: ../libgaim/protocols/simple/simple.c:1647
+msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgstr "Los nombres de usuario SIP no pueden tener espacios en blanco ni el símbolo @"
 
 #. *< type
 #. *< ui_requirement
@@ -13642,36 +14024,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1819
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1820
+#: ../libgaim/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El complemento de protocolo SIP/SIMPLE"
 
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libgaim/protocols/simple/simple.c:1839
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estatus público (nota: todos podrán verlo)"
 
-#: ../libgaim/protocols/simple/simple.c:1848
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Use UDP"
 msgstr "Utilizar UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1850
+#: ../libgaim/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libgaim/protocols/simple/simple.c:1852
+#: ../libgaim/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libgaim/protocols/simple/simple.c:1854
+#: ../libgaim/protocols/simple/simple.c:1851
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../libgaim/protocols/simple/simple.c:1856
+#: ../libgaim/protocols/simple/simple.c:1853
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
@@ -13783,7 +14165,7 @@
 msgstr "Fallo desconocido: %s."
 
 #: ../libgaim/protocols/toc/toc.c:549
-msgid "Incorrect nickname or password."
+msgid "Incorrect screen name or password."
 msgstr "Nombre de cuenta o contraseña incorrecta."
 
 #: ../libgaim/protocols/toc/toc.c:552
@@ -13915,7 +14297,7 @@
 msgstr "Su mensaje Yahoo! no se envió."
 
 #: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3738
+#: ../libgaim/protocols/yahoo/yahoo.c:3732
 msgid "Buzz!!"
 msgstr "¡¡Buzz!!"
 
@@ -13924,26 +14306,18 @@
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#.
-#: ../libgaim/protocols/yahoo/yahoo.c:994
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "El usuario %s quiere añadir a %s a su lista de amigos%s%s."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1000
-msgid "Message (optional) :"
-msgstr "Mensaje (opcional) :"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1042
+#: ../libgaim/protocols/yahoo/yahoo.c:958
+msgid "Authorization denied message:"
+msgstr "Mensaje de autorización denegada:"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1037
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
 "forma retroactiva)."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1045
+#: ../libgaim/protocols/yahoo/yahoo.c:1040
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -13952,11 +14326,11 @@
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1048
+#: ../libgaim/protocols/yahoo/yahoo.c:1043
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1799
+#: ../libgaim/protocols/yahoo/yahoo.c:1794
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13967,11 +14341,11 @@
 "desconocido. Esta versión de Gaim posiblemente no sea capaz de conectarse a "
 "Yahoo. Compruebe %s para obtener una actualización."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1802
+#: ../libgaim/protocols/yahoo/yahoo.c:1797
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1868
+#: ../libgaim/protocols/yahoo/yahoo.c:1863
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13980,19 +14354,15 @@
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1871
+#: ../libgaim/protocols/yahoo/yahoo.c:1866
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1905
-msgid "Invalid username."
-msgstr "Nombre de usuario no válido."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1919
+#: ../libgaim/protocols/yahoo/yahoo.c:1914
 msgid "Normal authentication failed!"
 msgstr "¡Falló la autenticación habitual!"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1920
+#: ../libgaim/protocols/yahoo/yahoo.c:1915
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -14005,145 +14375,145 @@
 "Mensajería web que podrá dar lugar a un acceso a menos funcionalidades y "
 "funciones."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1931
+#: ../libgaim/protocols/yahoo/yahoo.c:1926
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1934
+#: ../libgaim/protocols/yahoo/yahoo.c:1929
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1988
+#: ../libgaim/protocols/yahoo/yahoo.c:1983
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1991
+#: ../libgaim/protocols/yahoo/yahoo.c:1986
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2110
+#: ../libgaim/protocols/yahoo/yahoo.c:2105
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2441
+#: ../libgaim/protocols/yahoo/yahoo.c:2436
 msgid "Received unexpected HTTP response from server."
 msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2465
-#: ../libgaim/protocols/yahoo/yahoo.c:2637
-#: ../libgaim/protocols/yahoo/yahoo.c:2740
-#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoo.c:2460
+#: ../libgaim/protocols/yahoo/yahoo.c:2632
+#: ../libgaim/protocols/yahoo/yahoo.c:2735
+#: ../libgaim/protocols/yahoo/yahoo.c:2745
 #: ../libgaim/protocols/yahoo/yahoochat.c:1455
 #: ../libgaim/protocols/yahoo/yahoochat.c:1525
 #: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Error de conexión"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2865
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libgaim/protocols/yahoo/yahoo.c:2860
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2867
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libgaim/protocols/yahoo/yahoo.c:2862
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2869
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libgaim/protocols/yahoo/yahoo.c:2864
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libgaim/protocols/yahoo/yahoo.c:2868
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2877
-#: ../libgaim/protocols/yahoo/yahoo.c:3490
+#: ../libgaim/protocols/yahoo/yahoo.c:2872
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2970
-#: ../libgaim/protocols/yahoo/yahoo.c:3000
+#: ../libgaim/protocols/yahoo/yahoo.c:2965
+#: ../libgaim/protocols/yahoo/yahoo.c:2995
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3017
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libgaim/protocols/yahoo/yahoo.c:3012
+#: ../libgaim/protocols/yahoo/yahoo.c:3070
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3020
-#: ../libgaim/protocols/yahoo/yahoo.c:3097
+#: ../libgaim/protocols/yahoo/yahoo.c:3015
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3039
+#: ../libgaim/protocols/yahoo/yahoo.c:3033
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3082
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libgaim/protocols/yahoo/yahoo.c:3085
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
+#: ../libgaim/protocols/yahoo/yahoo.c:3133
+msgid "Join in Chat"
+msgstr "Unirse a un chat"
+
 #: ../libgaim/protocols/yahoo/yahoo.c:3139
-msgid "Join in Chat"
-msgstr "Unirse a un chat"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libgaim/protocols/yahoo/yahoo.c:3167
 msgid "Presence Settings"
 msgstr "Usar configuración del entorno"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3179
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Start Doodling"
 msgstr "Comenzar una sesión de Doodle"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3211
+#: ../libgaim/protocols/yahoo/yahoo.c:3205
 msgid "Active which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3220
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
 msgid "Join who in chat?"
 msgstr "¿Juntarse con quién en un chat?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3230
+#: ../libgaim/protocols/yahoo/yahoo.c:3224
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3234
+#: ../libgaim/protocols/yahoo/yahoo.c:3228
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3797
+#: ../libgaim/protocols/yahoo/yahoo.c:3791
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3802
+#: ../libgaim/protocols/yahoo/yahoo.c:3796
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3806
+#: ../libgaim/protocols/yahoo/yahoo.c:3800
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Avisar a un contacto para llamar su atención"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3810
+#: ../libgaim/protocols/yahoo/yahoo.c:3804
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
 
@@ -14157,56 +14527,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3904
-#: ../libgaim/protocols/yahoo/yahoo.c:3906
+#: ../libgaim/protocols/yahoo/yahoo.c:3899
+#: ../libgaim/protocols/yahoo/yahoo.c:3901
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3923
+#: ../libgaim/protocols/yahoo/yahoo.c:3918
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3926
+#: ../libgaim/protocols/yahoo/yahoo.c:3921
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3929
+#: ../libgaim/protocols/yahoo/yahoo.c:3924
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonés"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3932
+#: ../libgaim/protocols/yahoo/yahoo.c:3927
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3935
+#: ../libgaim/protocols/yahoo/yahoo.c:3930
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3938
+#: ../libgaim/protocols/yahoo/yahoo.c:3933
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonés"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3941
+#: ../libgaim/protocols/yahoo/yahoo.c:3936
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3944
+#: ../libgaim/protocols/yahoo/yahoo.c:3939
 msgid "Chat room locale"
 msgstr "Localización de la sala de chat"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3947
+#: ../libgaim/protocols/yahoo/yahoo.c:3942
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3955
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3958
+#: ../libgaim/protocols/yahoo/yahoo.c:3953
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3961
+#: ../libgaim/protocols/yahoo/yahoo.c:3956
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
@@ -14285,7 +14655,7 @@
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:96
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Enviar petición Doodle."
 
@@ -14300,20 +14670,15 @@
 msgid "Write Error"
 msgstr "Error de escritura"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>Dirección IP:</b> %s<br>"
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! Japón"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -14321,61 +14686,60 @@
 "Lo siento, los perfiles con contenido sólo para adultos no están soportados "
 "aún."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-"Si desea ver este perfil, deberá visitar este enlace con su navegador web"
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
+"web browser:"
+msgstr "Si desea ver este perfil, deberá visitar este enlace con su navegador web:"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Aficiones"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Últimas noticias"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Página personal"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "Enlace interesante 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "Enlace interesante 2"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "Enlace interesante 3"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1178
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Última actualización"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1184
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s no disponible"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1190
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 "Lo siento, este perfil parece estar en un idioma o formato aún no soportado."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1206
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -14383,7 +14747,7 @@
 "No se pudo obtener el perfil del usuario. Esto es habitualmente un problema "
 "temporal en el lado del servidor. Por favor, pruebe de nuevo más tarde."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1209
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -14394,7 +14758,7 @@
 "de usuario. Si está seguro de que el usuario existe inténtelo de nuevo más "
 "tarde."
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
@@ -14424,78 +14788,77 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:786
-#: ../libgaim/protocols/zephyr/zephyr.c:1203
-#, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>Usuario:</b> %s<br>"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:790
-#: ../libgaim/protocols/zephyr/zephyr.c:1208
-msgid "<br>Hidden or not logged-in"
-msgstr "<br>Oculto o no conectado"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:787
+#: ../libgaim/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Usuario"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:792
 #: ../libgaim/protocols/zephyr/zephyr.c:1210
+msgid "Hidden or not logged-in"
+msgstr "Oculto o no conectado"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:798
+#: ../libgaim/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1542
-#: ../libgaim/protocols/zephyr/zephyr.c:1543
+#: ../libgaim/protocols/zephyr/zephyr.c:1546
+#: ../libgaim/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2350
+#: ../libgaim/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2356
+#: ../libgaim/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2362
+#: ../libgaim/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2373
+#: ../libgaim/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Falló el intento de suscripción a %s,%s,%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2686
+#: ../libgaim/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;apodo&gt;: Localiza un usuario"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2691
+#: ../libgaim/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;apodo&gt;: Localiza un usuario"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2696
+#: ../libgaim/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2701
+#: ../libgaim/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2706
+#: ../libgaim/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2712
+#: ../libgaim/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Unirse a un nuevo chat"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2717
+#: ../libgaim/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar un mensaje a &lt;mensaje,<i>instancia</i>,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2723
+#: ../libgaim/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -14503,7 +14866,7 @@
 "zci &lt;clase&gt; &lt;instancia&gt;: Enviar un mensaje a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2729
+#: ../libgaim/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -14511,7 +14874,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a "
 "&lt;<i>clase</i>,<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2735
+#: ../libgaim/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -14519,15 +14882,15 @@
 "zir &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;MENSAJE,"
 "<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2740
+#: ../libgaim/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar un mensaje a &lt;<i>clase</i>,PERSONAL,*&gt;"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2846
+#: ../libgaim/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2849
+#: ../libgaim/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Obtener las suscripciones del servidor"
 
@@ -14541,45 +14904,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2935
-#: ../libgaim/protocols/zephyr/zephyr.c:2937
+#: ../libgaim/protocols/zephyr/zephyr.c:2940
+#: ../libgaim/protocols/zephyr/zephyr.c:2942
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2956
+#: ../libgaim/protocols/zephyr/zephyr.c:2961
 msgid "Use tzc"
 msgstr "Use tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2959
+#: ../libgaim/protocols/zephyr/zephyr.c:2964
 msgid "tzc command"
 msgstr "orden tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2962
+#: ../libgaim/protocols/zephyr/zephyr.c:2967
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2965
+#: ../libgaim/protocols/zephyr/zephyr.c:2970
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2968
+#: ../libgaim/protocols/zephyr/zephyr.c:2973
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2971
+#: ../libgaim/protocols/zephyr/zephyr.c:2976
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2974
+#: ../libgaim/protocols/zephyr/zephyr.c:2979
 msgid "Realm"
 msgstr "Dominio"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2977
+#: ../libgaim/protocols/zephyr/zephyr.c:2982
 msgid "Exposure"
 msgstr "Exposición"
 
-#: ../libgaim/proxy.c:446 ../libgaim/proxy.c:868 ../libgaim/proxy.c:1025
-#: ../libgaim/proxy.c:1583
+#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
+#: ../libgaim/proxy.c:1579
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -14588,35 +14951,47 @@
 "No se pudo crear el socket:\n"
 "%s"
 
-#: ../libgaim/proxy.c:648
+#: ../libgaim/proxy.c:644
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"
 
-#: ../libgaim/proxy.c:676 ../libgaim/proxy.c:722 ../libgaim/proxy.c:760
-#: ../libgaim/proxy.c:772
+#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:768
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexión en el proxy HTTP %d"
 
-#: ../libgaim/proxy.c:768
+#: ../libgaim/proxy.c:764
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d."
-
-#: ../libgaim/proxy.c:988
+msgstr ""
+"Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d."
+
+#: ../libgaim/proxy.c:984
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"
 
-#: ../libgaim/proxy.c:1677
+#: ../libgaim/proxy.c:1676
 msgid "Could not resolve host name"
 msgstr "No se pudo resolver el nombre de equipo"
 
 #. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../libgaim/request.h:1341
+msgid "_Yes"
+msgstr "_Sí"
+
+#: ../libgaim/request.h:1341
+msgid "_No"
+msgstr "_No"
+
+#. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1354
+#: ../libgaim/request.h:1360
 msgid "_Accept"
 msgstr "_Aceptar"
 
@@ -14636,7 +15011,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: ../libgaim/server.c:686
+#: ../libgaim/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14645,12 +15020,12 @@
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: ../libgaim/server.c:691
+#: ../libgaim/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitado a %s a la sala de chat %s\n"
 
-#: ../libgaim/server.c:695
+#: ../libgaim/server.c:683
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"
 
@@ -14707,12 +15082,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2429
+#: ../libgaim/util.c:2434
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../libgaim/util.c:2430
+#: ../libgaim/util.c:2435
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -14721,83 +15096,461 @@
 "Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
 "antiguo se ha renombrado a %s~."
 
-#: ../libgaim/util.c:2893
+#: ../libgaim/util.c:2898
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libgaim/util.c:2896
+#: ../libgaim/util.c:2901
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../libgaim/util.c:2922
+#: ../libgaim/util.c:2927
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libgaim/util.c:2934
+#: ../libgaim/util.c:2939
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../libgaim/util.c:2942
+#: ../libgaim/util.c:2947
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libgaim/util.c:2948
+#: ../libgaim/util.c:2953
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libgaim/util.c:2956
+#: ../libgaim/util.c:2961
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libgaim/util.c:2962
+#: ../libgaim/util.c:2967
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"
 
-#: ../libgaim/util.c:3287
+#: ../libgaim/util.c:3292
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
-msgstr "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es posible que el servidor web esté intentando algo con malas intenciones."
-
-#: ../libgaim/util.c:3324
+msgstr ""
+"No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es "
+"posible que el servidor web esté intentando algo con malas intenciones."
+
+#: ../libgaim/util.c:3327
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"
 
-#: ../libgaim/util.c:3355
+#: ../libgaim/util.c:3358
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"
 
-#: ../libgaim/util.c:3380
+#: ../libgaim/util.c:3383
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
 
+#~ msgid "Tag"
+#~ msgstr "Marca"
+
+#~ msgid ""
+#~ "\n"
+#~ "Idle: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Inactivo: %s"
+
+#~ msgid "Nickname: %s\n"
+#~ msgstr "Apodo: %s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Buddy Alias:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Apodo de amigo:</b> %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Nickname:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Apodo:</b> %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Logged In:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Conectado:</b> %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Inactivo:</b> %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Last Seen:</b> %s ago"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Visto por última vez:</b> hace %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Offline"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Estado:</b> Desconectado"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Description:</b> Spooky"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Descripción:</b> Terrorífica"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Awesome"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Estado:</b> Genial"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Rockin'"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Estado:</b> Rock & roll"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "The specified buddy was not found in the Evolution Contacts."
+#~ msgstr ""
+#~ "No se encontró al amigo especificado dentro en los contactos de Evolution."
+
+#~ msgid "Delay"
+#~ msgstr "Retardo"
+
+#~ msgid "minutes."
+#~ msgstr "minutos."
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Estado:</b> %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Mensaje:</b> %s"
+
+#~ msgid "<b>%s:</b> %s"
+#~ msgstr "<b>%s:</b> %s"
+
+#~ msgid "<b>%s:</b> %s<br>"
+#~ msgstr "<b>%s:</b> %s<br>"
+
+#~ msgid "<b>Idle for:</b> %s<br>"
+#~ msgstr "<b>Inactivo desde:</b> %s<br>"
+
+#~ msgid "Client:"
+#~ msgstr "Cliente:"
+
+#~ msgid "The user %s wants to add %s to his or her buddy list."
+#~ msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
+
+#~ msgid "_Authorize"
+#~ msgstr "_Autorizar"
+
+#~ msgid "_Deny"
+#~ msgstr "_Denegar"
+
+#~ msgid "Invalid Username"
+#~ msgstr "Nombre de usuario no válido"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+
+#~ msgid "<b>Alias:</b> %s<br>"
+#~ msgstr "<B>Apodo:</b> %s<br>"
+
+#~ msgid "<b>%s:</b> "
+#~ msgstr "<b>%s:</b>"
+
+#~ msgid "MSN Profile"
+#~ msgstr "Perfil MSN"
+
+#~ msgid "%s<b>General</b><br>%s"
+#~ msgstr "%s<b>General</b><br>%s"
+
+#~ msgid "%s<b>Social</b><br>%s"
+#~ msgstr "%s<b>Social</b><br>%s"
+
+#~ msgid "<br><b>Personal</b><br>%s"
+#~ msgstr "<br><b>Personal</b><br>%s"
+
+#~ msgid "<br><b>Business</b><br>%s"
+#~ msgstr "<br><b>Negocio</b><br>%s"
+
+#~ msgid "<hr><b>Contact Info</b>%s%s"
+#~ msgstr "<hr><b>Información de contacto</b>%s%s"
+
+#~ msgid "<hr><b>%s:</b> "
+#~ msgstr "<hr><b>%s:</b> "
+
+#~ 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."
+
+#~ msgid "Invalid password"
+#~ msgstr "Contraseña inválida"
+
+#~ msgid "Invalid username or password"
+#~ msgstr "Nombre o contraseña de usuario no válido"
+
+#~ 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 autorización antes permitir que lo incorporen a "
+#~ "una lista de amigos.  ¿Desea enviar una solicitud de autorización?"
+
+#~ msgid "Request Authorization"
+#~ msgstr "Pedir autorización"
+
+#~ msgid "_Request Authorization"
+#~ msgstr "_Pedir autorización"
+
+#~ msgid ""
+#~ "The user %u wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "El usuario %u quiere añadir a %s a su lista de amigos por el siguiente "
+#~ "motivo:\n"
+#~ "%s"
+
+#~ msgid "Authorization Request"
+#~ msgstr "Solicitud de autorización"
+
+#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
+
+#~ msgid ""
+#~ "The user %s wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "El usuario %s quiere añadir a %s a su lista de amigos por el siguiente "
+#~ "motivo:\n"
+#~ "%s"
+
+#~ msgid "Wrong password!"
+#~ msgstr "¡Contraseña errónea!"
+
+#~ msgid "Selection"
+#~ msgstr "Selección"
+
+#~ msgid "Select a number"
+#~ msgstr "Seleccione un número"
+
+#~ msgid "Faces"
+#~ msgstr "Caras"
+
+#~ msgid "Change Your QQ Face"
+#~ msgstr "Cambiaar tu cara QQ"
+
+#~ msgid "Change Face"
+#~ msgstr "Cambiar cara"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "<i>Information below may not be accurate</i><br>\n"
+#~ msgstr "<i>La información a continuación puede no ser correcta</i><br>\n"
+
+#~ msgid "Change My Face"
+#~ msgstr "Cambiar mi cara"
+
+#~ msgid "This function has not be implemented yet"
+#~ msgstr "Aún no se ha implementado esta función"
+
+#~ msgid "Please wait for new version"
+#~ msgstr "Por favor, espere a una nueva versión"
+
+#~ msgid "Connection timeout!"
+#~ msgstr "¡Expiró la conexión!"
+
+#~ msgid "User info is not updated"
+#~ msgstr "La información del usuario no está actualizada"
+
+#~ msgid "Send packet"
+#~ msgstr "Enviar paquete"
+
+#~ msgid "Packets lost, send again?"
+#~ msgstr "Se han perdido paquetes, ¿enviar de nuevo?"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Supports:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Soporta:</b> %s"
+
+#~ msgid "<b>External User</b><br>"
+#~ msgstr "<b>Usuario externo</b><br>"
+
+#~ msgid "<b>User ID:</b> %s<br>"
+#~ msgstr "<b>ID de usuario:</b> %s<br>"
+
+#~ msgid "<b>Full Name:</b> %s<br>"
+#~ msgstr "Nombre completo:</b> %s<br>"
+
+#~ msgid "<b>Supports:</b> %s<br>"
+#~ msgstr "<b>Soportados:</b> %s<br>"
+
+#~ msgid "<b>Status:</b> %s"
+#~ msgstr "<b>Estado:</b> %s"
+
+#~ msgid "Wrong Password"
+#~ msgstr "Contraseña errónea"
+
+#~ msgid "Message (optional) :"
+#~ msgstr "Mensaje (opcional) :"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nombre de usuario no válido."
+
+#~ msgid "<b>IP Address:</b> %s<br>"
+#~ msgstr "<b>Dirección IP:</b> %s<br>"
+
+#~ msgid "<b>User:</b> %s<br>"
+#~ msgstr "<b>Usuario:</b> %s<br>"
+
+#~ msgid "Blink tray icon for unread..."
+#~ msgstr ""
+#~ "Hacer parpadear el icono en el área de notificación del sistema para los "
+#~ "mensajes sin leer..."
+
+#~ msgid "_Instant Messages:"
+#~ msgstr "Mensajes instantáneos:"
+
+#~ msgid "C_hat Messages:"
+#~ msgstr "Mensajes del c_hat"
+
+#~ msgid "Send unknown \"_slash\" commands as messages"
+#~ msgstr "Enviar órdenes «_slash» desconocidas como mensajes"
+
+#~ msgid "Tab Options"
+#~ msgstr "Opciones de las solapas"
+
+#~ msgid "_Sounds while away"
+#~ msgstr "_Sonidos mientras vd. está ausente"
+
+#~ msgid "Away / Idle"
+#~ msgstr "Ausencia / Inactividad"
+
+#~ msgid "gaim_proxy_connect() failed"
+#~ msgstr "Falló gaim_proxy_connect()"
+
+#~ msgid "QQ Server"
+#~ msgstr "Servidor QQ"
+
+#~ msgid "QQ Port"
+#~ msgstr "Puerto QQ"
+
+#~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+#~ msgstr ""
+#~ "Su solicitud de envío de archivo[%s] ha sido rechazada por el amigo[%d]"
+
+#~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
+#~ msgstr ""
+#~ "El proceso de envío de fichero[%s] ha sido cancelado por el amigo[%d]"
+
+#~ msgid "Crazychat"
+#~ msgstr "Crazychat"
+
+#~ msgid "Plugin to establish a Crazychat session."
+#~ msgstr "Complemento para establecer una sesión de «Crazychat»"
+
+#~ msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+#~ msgstr ""
+#~ "Usar Gaim para obtener direcciones IP de los amigos para conectar a una "
+#~ "sesión de «Crazychat»"
+
+#~ msgid "Network Configuration"
+#~ msgstr "Configuración de red"
+
+#~ msgid "TCP port"
+#~ msgstr "Puerto TCP"
+
+#~ msgid "UDP port"
+#~ msgstr "Puerto UDP"
+
+#~ msgid "Feature Calibration"
+#~ msgstr "Ajuste de la función"
+
+#~ msgid "Disabled"
+#~ msgstr "Deshabilitado"
+
+#~ msgid "Displays an icon for Gaim in the system tray."
+#~ msgstr "Muestra un icono para Gaim en el área de notificación del sistema."
+
+#~ msgid ""
+#~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
+#~ "show the current status of Gaim, allow fast access to commonly used "
+#~ "functions, and to toggle display of the buddy list. Also provides options "
+#~ "to blink for unread messages."
+#~ msgstr ""
+#~ "Muestra un icono en el área de notificación del sistema (por ejemplo en "
+#~ "Gnome, KDE o Windows) para mostrar el estado actual de Gaim. Permite un "
+#~ "acceso rápido a las funciones más comunes, e indicar si se debe mostrar "
+#~ "la lista de de amigos. También ofrece opciones para hacer parpadear los "
+#~ "mensajes sin leer."
+
 #~ msgid "DBus"
 #~ msgstr "DBus"
 
@@ -14894,9 +15647,6 @@
 #~ msgid "Reject Call"
 #~ msgstr "Rechazar llamada"
 
-#~ msgid "Accept call"
-#~ msgstr "Aceptar llamada"
-
 #~ msgid "Connected to %s"
 #~ msgstr "Conectado a %s"
 
@@ -15082,15 +15832,9 @@
 #~ msgid " left the room (%s)."
 #~ msgstr " salió de la sala (%s)."
 
-#~ msgid "Offline "
-#~ msgstr "Desconectado "
-
 #~ msgid "Conversation in %s on %s"
 #~ msgstr "Conversaciones en %s sobre %s"
 
-#~ msgid "Default"
-#~ msgstr "Valores por omisión"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">De:</span> %s\n"
 
@@ -15109,9 +15853,6 @@
 #~ msgid "Pounce Action"
 #~ msgstr "Acción del aviso"
 
-#~ msgid "Custom..."
-#~ msgstr "Personalizado..."
-
 #~ msgid "_Warn"
 #~ msgstr "_Avisar"
 
@@ -15292,9 +16033,6 @@
 #~ msgstr[0] "minuto"
 #~ msgstr[1] "minutos"
 
-#~ msgid "Error Message Suppression"
-#~ msgstr "Supresión de mensajes de error"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Ocultar errores de desconexión"
 
@@ -15304,9 +16042,6 @@
 #~ msgid "Hide Reconnecting Dialog"
 #~ msgstr "Ocultar dialogo de re-conexión"
 
-#~ msgid "Auto-Reconnect"
-#~ msgstr "Reconexión automática"
-
 #~ msgid "When you are kicked offline, this reconnects you."
 #~ msgstr ""
 #~ "Cuando por alguna razón Ud. se le expulsa, esto lo vuelve a conectar."
@@ -15588,9 +16323,6 @@
 #~ msgid "Away title: "
 #~ msgstr "Título del mensaje de ausencia: "
 
-#~ msgid "_Save"
-#~ msgstr "_Guardar"
-
 #~ msgid "Buddy List Error"
 #~ msgstr "Error en la lista de amigos"
 
@@ -15803,9 +16535,6 @@
 #~ msgid "Invite a user"
 #~ msgstr "Invitar al usuario"
 
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Añadir el chat a su lista de amigos"
-
 #~ msgid "Remove the chat from your buddy list"
 #~ msgstr "Eliminar el chat de su lista de amigos"
 
@@ -15833,9 +16562,6 @@
 #~ msgid "Punjabi"
 #~ msgstr "Punjabí"
 
-#~ msgid "Albanian"
-#~ msgstr "Albanés"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Ucraniano"
 
@@ -15880,15 +16606,9 @@
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "Mostrar la _hora en los mensajes"
 
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignorar _aspectos de la tipografía"
-
 #~ msgid "Ignore font si_zes"
 #~ msgstr "Ignorar t_amaños de tipografía"
 
-#~ msgid "Default Formatting"
-#~ msgstr "Formato por omisión"
-
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "_Enviar formato por omisión en los mensajes salientes"
 
@@ -15998,18 +16718,12 @@
 #~ msgid "Details"
 #~ msgstr "Detalles"
 
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
 #~ msgid "Message Text"
 #~ msgstr "Texto de los mensajes"
 
 #~ msgid "Shortcuts"
 #~ msgstr "Atajos"
 
-#~ msgid "Away Messages"
-#~ msgstr "Mensajes de ausencia"
-
 #~ msgid "Please create an account."
 #~ msgstr "Por favor, cree una cuenta."
 
@@ -16019,9 +16733,6 @@
 #~ msgid "<b>_Account:</b>"
 #~ msgstr "<b>_Cuenta:</b>"
 
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>Contra_seña:</b>"
-
 #~ msgid "A_ccounts"
 #~ msgstr "_Cuentas"
 
@@ -16123,9 +16834,6 @@
 #~ msgid "Unable to ping server"
 #~ msgstr "No se pudo hacer ping al servidor"
 
-#~ msgid "Send as message"
-#~ msgstr "Enviar como mensaje"
-
 #~ msgid "Looking up GG server"
 #~ msgstr "Buscando servidor GG"
 
@@ -16247,9 +16955,6 @@
 #~ msgid "Roomlist Error"
 #~ msgstr "Error en la lista de salas"
 
-#~ msgid "Logged out"
-#~ msgstr "Desconectado"
-
 #~ msgid "The user %s wants to add you to their buddy list."
 #~ msgstr "El usuario %s quiere añadirle a su lista de amigos."
 
@@ -16325,9 +17030,6 @@
 #~ msgid "Set your Trepia profile data."
 #~ msgstr "Introduzca los datos de su perfil Trepia."
 
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
 #~ msgid "Set Profile"
 #~ msgstr "Establecer su perfil"
 
@@ -16457,7 +17159,9 @@
 #~ msgid ""
 #~ "\n"
 #~ "<b>Idle</b>"
-#~ msgstr "\n<b>Inactivo</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Inactivo</b>"
 
 #~ msgid "_Preferences"
 #~ msgstr "_Preferencias"
@@ -16668,9 +17372,6 @@
 #~ msgid "ZLocate"
 #~ msgstr "ZLocate"
 
-#~ msgid "idle for"
-#~ msgstr "inactivo durante"
-
 #~ msgid "/Tools/P_rotocol Actions"
 #~ msgstr "/Herramientas/Acciones del _protocolo"
 
@@ -16762,9 +17463,6 @@
 #~ "No está conectado con ningún protocolo que tenga con el que pueda listar "
 #~ "salas."
 
-#~ msgid "<b>Screen Name:</b>"
-#~ msgstr "<b>Nombre de usuario:</b>"
-
 #~ msgid "Unable to send password"
 #~ msgstr "No se pudo enviar la contraseña"
 
@@ -17061,9 +17759,6 @@
 #~ msgid "Add To"
 #~ msgstr "Añadir a"
 
-#~ msgid "Directory Info"
-#~ msgstr "Información del Directorio"
-
 #~ msgid "Allow Web Searches To Find Your Info"
 #~ msgstr "Dejar que búsquedas en la Web encuentren su información"
 
@@ -17375,9 +18070,6 @@
 #~ msgid "The plugin %s did not return any valid plugin information"
 #~ msgstr "El plugin %s no devolvió información de plugin válida"
 
-#~ msgid "File Transfers..."
-#~ msgstr "Transferencia de archivos..."
-
 #~ msgid "Accounts..."
 #~ msgstr "Cuentas..."
 
@@ -17467,9 +18159,6 @@
 #~ msgid "Proxy _Type"
 #~ msgstr "_Tipo de proxy"
 
-#~ msgid "_Login"
-#~ msgstr "_Entrada"
-
 #~ 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 "
@@ -17519,9 +18208,6 @@
 #~ msgid "_Manual: "
 #~ msgstr "_Manual:"
 
-#~ msgid "Tabs"
-#~ msgstr "Solapas"
-
 #~ msgid "ICQ Protocol detected."
 #~ msgstr "Protocolo ICQ detectado."