pidgin: 23de2d42: Updated Spanish translation. Thanks Jav...

Thu May 15 06:31:06 EDT 2008

-----------------------------------------------------------------
Revision: 23de2d4217f5421a63892ff1bcf19406e80802ef
Ancestor: 00064a7d6b4d7c04993b461082953e861a433038
Author: markdoliner at pidgin.im
Date: 2008-05-15T10:13:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/23de2d4217f5421a63892ff1bcf19406e80802ef

Modified files:
        po/ChangeLog po/es.po

ChangeLog: 

Updated Spanish translation.  Thanks Javier!
Fixes #5787.

-------------- next part --------------
============================================================

--- po/ChangeLog	78c05a47cd9bfc58bb4c7b7115ad046d6c927b1b
+++ po/ChangeLog	6ec6087e28d3340c7ac305ae2e9ac957866215de
@@ -4,6 +4,7 @@ version 2.4.2
 	* Finnish translation updated (Timo Jyrinki)
 	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
 	  Marques Flores)
+	* Spanish translation updated (Javier FernÃ¡ndez-Sanguino)
 
 version 2.4.1
 	* Arabic translation updated (Khaled Hosny)
============================================================
--- po/es.po	e2bd68bcef8a4fb3cb5db828fecaf85b4813a43a
+++ po/es.po	cc1a8db63703d125bd4b9b617d3d9634820ae4eb
@@ -53,8 +53,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-27 03:24-0400\n"
-"PO-Revision-Date: 2008-03-29 13:48+0100\n"
+"POT-Creation-Date: 2008-05-12 03:22-0400\n"
+"PO-Revision-Date: 2008-05-13 23:08+0200\n"
 "Last-Translator: Javier FernÃ¡ndez-Sanguino <jfs at debian.org>\n"
 "Language-Team:  Spanish team <es at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr ""
 "  -n, --nologin        no conectarse de forma automÃ¡tica\n"
 "  -v, --version        mostrar la versiÃ³n actual y salir\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:737
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:738
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -108,18 +108,18 @@ msgstr ""
 "el problema y complete la migraciÃ³n de forma manual. Por favor, informe de "
 "este error en http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:574
-#: ../finch/gntblist.c:710 ../finch/gntblist.c:723 ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2079
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:595
+#: ../finch/gntblist.c:759 ../finch/gntblist.c:772 ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244 ../finch/gntrequest.c:380 ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:310 ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121 ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2080
+#: ../libpurple/protocols/jabber/chat.c:682
+#: ../libpurple/protocols/jabber/chat.c:693
 #: ../libpurple/protocols/jabber/jabber.c:1594
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
-#: ../libpurple/protocols/silc/ops.c:1475
+#: ../libpurple/protocols/silc/ops.c:1473
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
@@ -129,7 +129,7 @@ msgstr "No se ha aÃ±adido la cuenta"
 msgstr "No se ha aÃ±adido la cuenta"
 
 #: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
+msgid "Username of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vacÃo."
 
 #: ../finch/gntaccount.c:437
@@ -149,7 +149,7 @@ msgstr "(Posiblemente se olvido de ejecu
 msgstr "(Posiblemente se olvido de ejecutar 'make install'.)"
 
 #: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4588
+#: ../pidgin/gtkaccount.c:1449 ../pidgin/gtkblist.c:4671
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
@@ -163,7 +163,7 @@ msgstr "Protocolo:"
 
 #: ../finch/gntaccount.c:529
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:294
-msgid "Screen name:"
+msgid "Username:"
 msgstr "Nombre de usuario:"
 
 #: ../finch/gntaccount.c:542
@@ -177,27 +177,27 @@ msgstr "Apodo:"
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:620 ../finch/gntblist.c:698
-#: ../finch/gntblist.c:733 ../finch/gntblist.c:1077 ../finch/gntblist.c:1303
-#: ../finch/gntblist.c:1437 ../finch/gntblist.c:2604 ../finch/gntblist.c:2655
-#: ../finch/gntblist.c:2719 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1064 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
-#: ../libpurple/account.c:1118 ../libpurple/account.c:1421
-#: ../libpurple/account.c:1456 ../libpurple/conversation.c:1222
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
-#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
-#: ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:758
-#: ../libpurple/protocols/jabber/buddy.c:2473
-#: ../libpurple/protocols/jabber/buddy.c:2509
-#: ../libpurple/protocols/jabber/chat.c:786
+#: ../finch/gntaccount.c:890 ../finch/gntblist.c:641 ../finch/gntblist.c:747
+#: ../finch/gntblist.c:782 ../finch/gntblist.c:1134 ../finch/gntblist.c:1360
+#: ../finch/gntblist.c:1494 ../finch/gntblist.c:2661 ../finch/gntblist.c:2712
+#: ../finch/gntblist.c:2776 ../finch/gntblist.c:2838 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:471 ../finch/gntpounce.c:679
+#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1064 ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/plugins/gnthistory.c:178 ../libpurple/account.c:1118
+#: ../libpurple/account.c:1437 ../libpurple/account.c:1472
+#: ../libpurple/conversation.c:1235 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
+#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
+#: ../libpurple/protocols/jabber/buddy.c:759
+#: ../libpurple/protocols/jabber/buddy.c:2474
+#: ../libpurple/protocols/jabber/buddy.c:2510
+#: ../libpurple/protocols/jabber/chat.c:791
 #: ../libpurple/protocols/jabber/jabber.c:1063
 #: ../libpurple/protocols/jabber/jabber.c:1072
 #: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/jabber/usermood.c:202
+#: ../libpurple/protocols/jabber/si.c:1113
+#: ../libpurple/protocols/jabber/usermood.c:199
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:403
 #: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
@@ -209,7 +209,7 @@ msgstr "Apodo:"
 #: ../libpurple/protocols/msnp9/msn.c:356
 #: ../libpurple/protocols/myspace/user.c:582
 #: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6223
+#: ../libpurple/protocols/oscar/oscar.c:6209
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -222,20 +222,20 @@ msgstr "Apodo:"
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3439
-#: ../libpurple/protocols/sametime/sametime.c:3525
-#: ../libpurple/protocols/sametime/sametime.c:3699
-#: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5542
-#: ../libpurple/protocols/sametime/sametime.c:5667
+#: ../libpurple/protocols/sametime/sametime.c:3440
+#: ../libpurple/protocols/sametime/sametime.c:3526
+#: ../libpurple/protocols/sametime/sametime.c:3700
+#: ../libpurple/protocols/sametime/sametime.c:5453
+#: ../libpurple/protocols/sametime/sametime.c:5543
+#: ../libpurple/protocols/sametime/sametime.c:5668
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1835
-#: ../libpurple/protocols/silc/silc.c:966
-#: ../libpurple/protocols/silc/silc.c:1174
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc/chat.c:753
+#: ../libpurple/protocols/silc/ops.c:1833
+#: ../libpurple/protocols/silc/silc.c:1039
+#: ../libpurple/protocols/silc/silc.c:1247
 #: ../libpurple/protocols/silc10/buddy.c:468
 #: ../libpurple/protocols/silc10/buddy.c:1087
 #: ../libpurple/protocols/silc10/buddy.c:1192
@@ -245,21 +245,21 @@ msgstr "Apodo:"
 #: ../libpurple/protocols/silc10/silc.c:742
 #: ../libpurple/protocols/silc10/silc.c:948
 #: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3560
-#: ../libpurple/protocols/yahoo/yahoo.c:3571 ../pidgin/gtkaccount.c:1841
-#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6796
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:766
-#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkdialogs.c:1041
-#: ../pidgin/gtkdialogs.c:1063 ../pidgin/gtkdialogs.c:1111
-#: ../pidgin/gtkdialogs.c:1152 ../pidgin/gtkdialogs.c:1208
-#: ../pidgin/gtkdialogs.c:1247 ../pidgin/gtkdialogs.c:1274
-#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:294 ../pidgin/gtkpounce.c:1113
+#: ../libpurple/protocols/yahoo/yahoo.c:3564
+#: ../libpurple/protocols/yahoo/yahoo.c:3575 ../pidgin/gtkaccount.c:1843
+#: ../pidgin/gtkaccount.c:2404 ../pidgin/gtkblist.c:684
+#: ../pidgin/gtkblist.c:6879 ../pidgin/gtkcertmgr.c:197
+#: ../pidgin/gtkdialogs.c:768 ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1113 ../pidgin/gtkdialogs.c:1154
+#: ../pidgin/gtkdialogs.c:1210 ../pidgin/gtkdialogs.c:1249
+#: ../pidgin/gtkdialogs.c:1276 ../pidgin/gtkimhtmltoolbar.c:438
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:302 ../pidgin/gtkpounce.c:1113
 #: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
 #: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
 #: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1610
+#: ../pidgin/gtkstatusbox.c:1619
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -268,14 +268,14 @@ msgstr "Cancelar"
 #: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
 #: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1455 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:757 ../pidgin/gtkdebug.c:746
-#: ../pidgin/gtkrequest.c:279
+#: ../libpurple/account.c:1471 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:758 ../pidgin/gtkblist.c:684
+#: ../pidgin/gtkdebug.c:746 ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Guardar"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1834
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1613
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Â¿Seguro que quiere borrar a %s?"
@@ -288,14 +288,14 @@ msgstr "Borrar cuenta"
 #: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
 #: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkaccount.c:1842 ../pidgin/gtklog.c:326
 #: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1618
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2471 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2528 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2263 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -304,17 +304,17 @@ msgstr "Puede (desh)habilitar cuentas de
 msgstr "Puede (desh)habilitar cuentas de la lista a continuaciÃ³n."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
-#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2823
+#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:640
+#: ../finch/gntblist.c:747 ../finch/gntblist.c:782 ../finch/gntblist.c:2947
 #: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
 #: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
 #: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5541
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
-#: ../pidgin/gtkblist.c:6795 ../pidgin/gtkconv.c:1696
+#: ../libpurple/protocols/sametime/sametime.c:5542
+#: ../libpurple/protocols/silc/chat.c:618
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2403
+#: ../pidgin/gtkblist.c:6878 ../pidgin/gtkconv.c:1721
 #: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "AÃ±adir"
@@ -324,33 +324,33 @@ msgstr "Modificar"
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2350
 #, 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"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2400
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2402
 msgid "Add buddy to your list?"
 msgstr "Â¿Desea aÃ±adir el amigo a su lista?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2460
 #, 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."
 
 #: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
-#: ../pidgin/gtkaccount.c:2488
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2483
+#: ../pidgin/gtkaccount.c:2490
 msgid "Authorize buddy?"
 msgstr "Â¿Autorizar al amigo?"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
+#: ../pidgin/gtkaccount.c:2484 ../pidgin/gtkaccount.c:2491
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkaccount.c:2492
 msgid "Deny"
 msgstr "Denegar"
 
@@ -382,49 +382,66 @@ msgstr "(por omisiÃ³n)"
 msgid "Default"
 msgstr "(por omisiÃ³n)"
 
-#: ../finch/gntblist.c:563
-msgid "You must provide a screename for the buddy."
+#: ../finch/gntblist.c:584
+msgid "You must provide a username for the buddy."
 msgstr "Debe dar un nombre de usuario para el amigo."
 
-#: ../finch/gntblist.c:565
+#: ../finch/gntblist.c:586
 msgid "You must provide a group."
 msgstr "Debe indicar un grupo."
 
-#: ../finch/gntblist.c:567
+#: ../finch/gntblist.c:588
 msgid "You must select an account."
 msgstr "Debe seleccionar una cuenta."
 
-#: ../finch/gntblist.c:569
+#: ../finch/gntblist.c:590
 msgid "The selected account is not online."
 msgstr "La cuenta seleccionada no estÃ¡ conectada."
 
-#: ../finch/gntblist.c:574
+#: ../finch/gntblist.c:595
 msgid "Error adding buddy"
 msgstr "Error al aÃ±adir al amigo"
 
-#: ../finch/gntblist.c:601 ../pidgin/gtkaccount.c:1914
+#: ../finch/gntblist.c:622 ../libpurple/protocols/irc/irc.c:974
+#: ../libpurple/protocols/irc/msgs.c:364
+#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:976
+#: ../libpurple/protocols/oscar/oscar.c:2944
+#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/silc/buddy.c:1542
+#: ../libpurple/protocols/silc/ops.c:1210
+#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1349
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/silc.c:1221
+#: ../libpurple/protocols/silc10/buddy.c:1542
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:922 ../pidgin/gtkaccount.c:1916
 #: ../pidgin/gtksavedstatuses.c:971
-msgid "Screen Name"
+msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../finch/gntblist.c:604
+#: ../finch/gntblist.c:625
 msgid "Alias (optional)"
 msgstr "Apodo (opcional)"
 
-#: ../finch/gntblist.c:607
+#: ../finch/gntblist.c:628
 msgid "Add in group"
 msgstr "AÃ±adir a un grupo"
 
-#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
-#: ../finch/gntblist.c:2585 ../finch/gntblist.c:2641 ../finch/gntblist.c:2706
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../finch/gntblist.c:632 ../finch/gntblist.c:726 ../finch/gntblist.c:1705
+#: ../finch/gntblist.c:2642 ../finch/gntblist.c:2698 ../finch/gntblist.c:2763
+#: ../finch/gntblist.c:2823 ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3237 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkblist.c:3319 ../pidgin/gtknotify.c:530
 #: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
+#: ../finch/gntblist.c:638 ../finch/gntblist.c:1183
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -433,205 +450,206 @@ msgstr "Cuenta"
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6344
+#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6427
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "AÃ±adir amigo"
 
-#: ../finch/gntblist.c:617
+#: ../finch/gntblist.c:638
 msgid "Please enter buddy information."
 msgstr "Introduzca la informaciÃ³n del amigo."
 
-#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
+#: ../finch/gntblist.c:694 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:684 ../finch/gntblist.c:2580 ../finch/gntblist.c:2636
-#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:991
+#: ../finch/gntblist.c:732 ../finch/gntblist.c:2637 ../finch/gntblist.c:2693
+#: ../finch/gntblist.c:2818 ../finch/gntroomlist.c:298
+#: ../libpurple/protocols/jabber/jabber.c:991
 #: ../libpurple/protocols/jabber/jabber.c:994
 #: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
 #: ../libpurple/protocols/msn/msn.c:1846
 #: ../libpurple/protocols/msnp9/msn.c:1595
 #: ../libpurple/protocols/msnp9/msn.c:1660
 #: ../libpurple/protocols/msnp9/msn.c:1687
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:656
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:766
 #: ../pidgin/gtkroomlist.c:749
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nombre"
 
-#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../finch/gntblist.c:735 ../finch/gntblist.c:1646
 #: ../libpurple/protocols/msn/msn.c:1573
 #: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc/chat.c:609
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1016
-#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1062
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1042 ../pidgin/gtkdialogs.c:1064
 #: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Apodo"
 
-#: ../finch/gntblist.c:690 ../finch/gntblist.c:2839
+#: ../finch/gntblist.c:738 ../finch/gntblist.c:2963
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
+#: ../finch/gntblist.c:742 ../finch/gntblist.c:1150
 msgid "Auto-join"
 msgstr "Conectarse automÃ¡ticamente"
 
-#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6709
+#: ../finch/gntblist.c:745 ../finch/gntblist.c:1185 ../pidgin/gtkblist.c:6792
 msgid "Add Chat"
 msgstr "AÃ±adir chat"
 
-#: ../finch/gntblist.c:697
+#: ../finch/gntblist.c:746
 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."
 
-#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
+#: ../finch/gntblist.c:759 ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "Error al aÃ±adir al grupo"
 
-#: ../finch/gntblist.c:711
+#: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a aÃ±adir."
 
-#: ../finch/gntblist.c:724
+#: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
-#: ../libpurple/protocols/sametime/sametime.c:5451
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtkblist.c:6792
+#: ../finch/gntblist.c:780 ../finch/gntblist.c:1187
+#: ../libpurple/protocols/sametime/sametime.c:5452
+#: ../libpurple/protocols/sametime/sametime.c:5540 ../pidgin/gtkblist.c:6875
 msgid "Add Group"
 msgstr "AÃ±adir grupo"
 
-#: ../finch/gntblist.c:731
+#: ../finch/gntblist.c:780
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"
 
-#: ../finch/gntblist.c:1076
+#: ../finch/gntblist.c:1133 ../pidgin/gtkblist.c:683
 msgid "Edit Chat"
 msgstr "Editar chat"
 
-#: ../finch/gntblist.c:1076
+#: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."
 
-#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1134 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:1102
+#: ../finch/gntblist.c:1159
 msgid "Edit Settings"
 msgstr "Editar configuraciÃ³n"
 
-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Information"
 msgstr "InformaciÃ³n"
 
-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Retrieving..."
 msgstr "Obteniendo..."
 
 # 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
-#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:903
+#: ../finch/gntblist.c:1249 ../finch/gntconv.c:591
+#: ../libpurple/protocols/silc/chat.c:906
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:1196
+#: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
 msgstr "AÃ±adir aviso de amigo"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1109
+#: ../finch/gntblist.c:1260 ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1113
 #: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1644
+#: ../pidgin/gtkconv.c:1669
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
+#: ../finch/gntblist.c:1267 ../libpurple/protocols/gg/gg.c:1629
 #: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../finch/gntblist.c:1216 ../finch/gntblist.c:1605
+#: ../finch/gntblist.c:1273 ../finch/gntblist.c:1662 ../finch/gntblist.c:2832
 msgid "View Log"
 msgstr "Ver registro"
 
-#: ../finch/gntblist.c:1298
+#: ../finch/gntblist.c:1355
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"
 
-#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
+#: ../finch/gntblist.c:1357 ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../finch/gntblist.c:1300
+#: ../finch/gntblist.c:1357
 msgid "Set Alias"
 msgstr "Fijar el apodo"
 
-#: ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vacÃa para resetear el nombre."
 
-#: ../finch/gntblist.c:1415
+#: ../finch/gntblist.c:1472
 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"
 
-#: ../finch/gntblist.c:1423
+#: ../finch/gntblist.c:1480
 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"
 
-#: ../finch/gntblist.c:1428
+#: ../finch/gntblist.c:1485
 #, 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?
-#: ../finch/gntblist.c:1431
+#: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"
 
-#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1693 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:267
+#: ../finch/gntblist.c:1493 ../finch/gntblist.c:1648 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1718 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:268
 msgid "Remove"
 msgstr "Quitar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2880 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5083
+#: ../finch/gntblist.c:1622 ../finch/gntblist.c:3004 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5166
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1596
+#: ../finch/gntblist.c:1653
 msgid "Place tagged"
 msgstr "Lugares marcados"
 
-#: ../finch/gntblist.c:1601
+#: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
 msgstr "Cambiar marca"
 
 #. General
-#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
+#: ../finch/gntblist.c:1698 ../libpurple/protocols/gg/gg.c:638
 #: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
 #: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1284
-#: ../libpurple/protocols/jabber/buddy.c:2264
-#: ../libpurple/protocols/jabber/buddy.c:2456
+#: ../libpurple/protocols/jabber/buddy.c:309
+#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:2265
+#: ../libpurple/protocols/jabber/buddy.c:2457
 #: ../libpurple/protocols/jabber/jabber.c:1002
 #: ../libpurple/protocols/jabber/jabber.c:1614
 #: ../libpurple/protocols/jabber/jabber.c:1628
@@ -643,77 +661,79 @@ msgstr "Cambiar marca"
 #: ../libpurple/protocols/msnp9/msn.c:1598
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1017
-#: ../libpurple/protocols/silc/ops.c:1201
-#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/ops.c:1016
+#: ../libpurple/protocols/silc/ops.c:1199
+#: ../libpurple/protocols/silc/ops.c:1337
 #: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3261
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3343
 msgid "Nickname"
 msgstr "Apodo"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../finch/gntblist.c:1720 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:982
 #: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
 #: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/msnp9/msn.c:541
 #: ../libpurple/protocols/msnp9/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2980
+#: ../libpurple/protocols/oscar/oscar.c:2968
 #: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3289
-#: ../pidgin/gtkblist.c:3749 ../pidgin/gtkprefs.c:1946
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3371
+#: ../pidgin/gtkblist.c:3831 ../pidgin/gtkprefs.c:2056
 msgid "Idle"
 msgstr "EstÃ¡ inactivo"
 
 # El latinoamÃ©rica se prefiere 'Celular', creo, jfs
-#: ../finch/gntblist.c:1677
+#: ../finch/gntblist.c:1734
 msgid "On Mobile"
 msgstr "En el mÃ³vil"
 
-#: ../finch/gntblist.c:1978 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:2035 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../finch/gntblist.c:1985 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:2042 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Guardado..."
 
-#: ../finch/gntblist.c:2439 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:605
+#: ../finch/gntblist.c:2496 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:715
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2593 ../finch/gntblist.c:2598
+#: ../finch/gntblist.c:2650 ../finch/gntblist.c:2655
 msgid "Block/Unblock"
 msgstr "Bloquear/Desbloquear"
 
-#: ../finch/gntblist.c:2594 ../libpurple/protocols/gg/gg.c:1665
+#: ../finch/gntblist.c:2651 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../finch/gntblist.c:2595 ../libpurple/protocols/gg/gg.c:1661
+#: ../finch/gntblist.c:2652 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../finch/gntblist.c:2600
+#: ../finch/gntblist.c:2657
 msgid ""
-"Please enter the screen name or alias of the person you would like to Block/"
+"Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "Introduzca el nombre de usuario o apodo de la persona que quiere Bloquear/Desbloquear."
+msgstr ""
+"Introduzca el nombre de usuario o apodo de la persona que quiere Bloquear/"
+"Desbloquear."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2603 ../finch/gntblist.c:2654 ../finch/gntcertmgr.c:89
-#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
+#: ../finch/gntblist.c:2660 ../finch/gntblist.c:2711 ../finch/gntblist.c:2837
+#: ../finch/gntcertmgr.c:89 ../finch/gntconn.c:137 ../finch/gntnotify.c:80
 #: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
-#: ../libpurple/account.c:1420 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/account.c:1436 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/jabber/jabber.c:1786
 #: ../libpurple/protocols/jabber/xdata.c:402
@@ -725,15 +745,15 @@ msgstr "Introduzca el nombre de usuario 
 #: ../libpurple/protocols/msnp9/msn.c:334
 #: ../libpurple/protocols/myspace/user.c:581
 #: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6222
+#: ../libpurple/protocols/oscar/oscar.c:6208
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1308
-#: ../libpurple/protocols/silc/ops.c:1834
-#: ../libpurple/protocols/silc/silc.c:965
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
+#: ../libpurple/protocols/silc/chat.c:752
+#: ../libpurple/protocols/silc/ops.c:1306
+#: ../libpurple/protocols/silc/ops.c:1832
+#: ../libpurple/protocols/silc/silc.c:1038
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
@@ -743,98 +763,107 @@ msgstr "Introduzca el nombre de usuario 
 #: ../libpurple/protocols/silc10/ops.c:1909
 #: ../libpurple/protocols/silc10/silc.c:741
 #: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3559
-#: ../libpurple/protocols/yahoo/yahoo.c:3570 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:765 ../pidgin/gtkdialogs.c:904
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/yahoo/yahoo.c:3563
+#: ../libpurple/protocols/yahoo/yahoo.c:3574 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:767 ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../finch/gntblist.c:2649 ../pidgin/gtkdialogs.c:760
+#: ../finch/gntblist.c:2706 ../pidgin/gtkdialogs.c:762
 msgid "New Instant Message"
 msgstr "Mensaje instantÃ¡neo nuevo"
 
-#: ../finch/gntblist.c:2651 ../pidgin/gtkdialogs.c:762
-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."
+#: ../finch/gntblist.c:2708 ../pidgin/gtkdialogs.c:764
+msgid "Please enter the username 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."
 
-#: ../finch/gntblist.c:2702
+#: ../finch/gntblist.c:2759
 msgid "Channel"
 msgstr "Canal"
 
-#: ../finch/gntblist.c:2714 ../pidgin/gtkblist.c:962
+#: ../finch/gntblist.c:2771 ../pidgin/gtkblist.c:1036
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: ../finch/gntblist.c:2716
+#: ../finch/gntblist.c:2773
 msgid "Please enter the name of the chat you want to join."
 msgstr "Introduzca el nombre del chat al que quiere unirse."
 
-#: ../finch/gntblist.c:2718 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2775 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Unirse"
 
+#: ../finch/gntblist.c:2834 ../pidgin/gtkdialogs.c:995
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
+"ver informaciÃ³n de registro."
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2763 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2882 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Opciones"
 
-#: ../finch/gntblist.c:2769
+#: ../finch/gntblist.c:2888
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2774
+#: ../finch/gntblist.c:2893
 msgid "Block/Unblock..."
 msgstr "Bloquear/Desbloquear..."
 
-#: ../finch/gntblist.c:2779
+#: ../finch/gntblist.c:2898
 msgid "Join Chat..."
 msgstr "Unirse a un chat..."
 
-#: ../finch/gntblist.c:2784
+#: ../finch/gntblist.c:2903 ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "Ver registro..."
+
+#: ../finch/gntblist.c:2908
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../finch/gntblist.c:2789
+#: ../finch/gntblist.c:2913
 msgid "Empty groups"
 msgstr "Grupos vacÃos"
 
-#: ../finch/gntblist.c:2796
+#: ../finch/gntblist.c:2920
 msgid "Offline buddies"
 msgstr "Amigos desconectados"
 
-#: ../finch/gntblist.c:2803
+#: ../finch/gntblist.c:2927
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../finch/gntblist.c:2808
+#: ../finch/gntblist.c:2932
 msgid "By Status"
 msgstr "Por estado"
 
-#: ../finch/gntblist.c:2813 ../pidgin/gtkblist.c:4240
+#: ../finch/gntblist.c:2937 ../pidgin/gtkblist.c:4322
 msgid "Alphabetically"
 msgstr "AlfabÃ©ticamente"
 
-#: ../finch/gntblist.c:2818
+#: ../finch/gntblist.c:2942
 msgid "By Log Size"
 msgstr "Por tamaÃ±o de registro"
 
-#: ../finch/gntblist.c:2829
+#: ../finch/gntblist.c:2953
 msgid "Buddy"
 msgstr "Amigo"
 
-#: ../finch/gntblist.c:2834 ../libpurple/protocols/oscar/oscar.c:649
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:563
+#: ../finch/gntblist.c:2958 ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/silc/silc.c:984
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Charlar"
 
-#: ../finch/gntblist.c:2844 ../finch/plugins/grouping.c:255
+#: ../finch/gntblist.c:2968 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Agrupar"
 
@@ -929,13 +958,13 @@ msgstr "Gestor de certificados"
 msgstr "Gestor de certificados"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
-#: ../libpurple/protocols/silc/silc.c:1150
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:695
+#: ../libpurple/protocols/silc/silc.c:1223
 #: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Servidor"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1672
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1697
 #: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Info"
@@ -945,8 +974,8 @@ msgstr "Info"
 #: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
 #: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
 #: ../libpurple/protocols/msn/msn.c:417 ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2377
 #: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Cerrar"
@@ -990,24 +1019,24 @@ msgstr "No existe esa orden."
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:494
 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."
 
-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:500
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:507
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sÃ³lo funciona en chats, no en MIs."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:510
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sÃ³lo funciona en MIs, no en chats."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:515
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
@@ -1025,7 +1054,7 @@ msgstr "%s [%s]"
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3470
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3566
 #, c-format
 msgid ""
 "\n"
@@ -1038,13 +1067,13 @@ msgstr "Ha dejado este chat"
 msgid "You have left this chat."
 msgstr "Ha dejado este chat"
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1378
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1403
 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."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1386
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1411
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -1071,10 +1100,6 @@ msgstr "AÃ±adir aviso de amigo..."
 msgid "Add Buddy Pounce..."
 msgstr "AÃ±adir aviso de amigo..."
 
-#: ../finch/gntconv.c:611
-msgid "View Log..."
-msgstr "Ver registro..."
-
 #: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "Habilitar registro"
@@ -1092,15 +1117,15 @@ msgstr "Lista de usuarios:\n"
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:339
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuraciÃ³n soportadas son:  version"
 
-#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:391
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:392
+#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:394
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1108,7 +1133,7 @@ msgstr ""
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes Ã³rdenes estÃ¡n disponibles en este contexto:\n"
 
-#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7769
+#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7932
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1116,12 +1141,12 @@ msgstr ""
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7772
+#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7935
 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."
 
-#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7775
+#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7938
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1129,11 +1154,11 @@ msgstr ""
 "debug &lt;opciÃ³n&gt;: Enviar informaciÃ³n de depuraciÃ³n sobre la conversaciÃ³n "
 "actual."
 
-#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7778
+#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7941
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histÃ³rico de la ventana de conversaciÃ³n."
 
-#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7784
+#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7947
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
@@ -1165,7 +1190,7 @@ msgstr "status: Muestra la ventana Â«sav
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana Â«savedstatusesÂ»."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:942 ../pidgin/gtkconv.c:2652
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:967 ../pidgin/gtkconv.c:2707
 #: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
@@ -1223,12 +1248,12 @@ msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:380
+#: ../libpurple/protocols/bonjour/bonjour.c:381
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/jabber/buddy.c:812
-#: ../libpurple/protocols/jabber/buddy.c:971
+#: ../libpurple/protocols/jabber/buddy.c:809
+#: ../libpurple/protocols/jabber/buddy.c:813
+#: ../libpurple/protocols/jabber/buddy.c:972
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
 #: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
@@ -1237,12 +1262,12 @@ msgstr "Restante"
 #: ../libpurple/protocols/oscar/oscar.c:822
 #: ../libpurple/protocols/oscar/oscar.c:827
 #: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:2768
-#: ../libpurple/protocols/oscar/oscar.c:3827
-#: ../libpurple/protocols/sametime/sametime.c:3314
-#: ../libpurple/protocols/sametime/sametime.c:4205
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3333
-#: ../pidgin/gtkblist.c:3347 ../pidgin/gtkblist.c:3349
+#: ../libpurple/protocols/oscar/oscar.c:2756
+#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/sametime/sametime.c:3315
+#: ../libpurple/protocols/sametime/sametime.c:4206
+#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3415
+#: ../pidgin/gtkblist.c:3429 ../pidgin/gtkblist.c:3431
 #: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Estado"
@@ -1271,41 +1296,51 @@ msgstr "FallÃ³"
 msgid "Failed"
 msgstr "FallÃ³"
 
-#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:436 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:445
+#: ../finch/gntft.c:447
+msgid "Sent"
+msgstr "Enviado"
+
+#: ../finch/gntft.c:447
+msgid "Received"
+msgstr "Recibido:"
+
+#: ../finch/gntft.c:448 ../pidgin/gtkft.c:160 ../pidgin/gtkft.c:1080
+msgid "Finished"
+msgstr "Terminado"
+
+#: ../finch/gntft.c:450
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Se guardÃ³ el archivo como %s."
 
-#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1080
-msgid "Finished"
-msgstr "Terminado"
+#: ../finch/gntft.c:457
+msgid "Sending"
+msgstr "Enviando"
 
-#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
-msgid "Transferring"
-msgstr "Transfiriendo"
+#: ../finch/gntft.c:457
+msgid "Receiving"
+msgstr "Recibiendo"
 
-#: ../finch/gntlog.c:183
+#: ../finch/gntlog.c:184
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Conversaciones en %s sobre %s"
 
-#: ../finch/gntlog.c:186
+#: ../finch/gntlog.c:187
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "ConversaciÃ³n con %s sobre %s"
 
-#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+#: ../finch/gntlog.c:230 ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+#: ../finch/gntlog.c:270 ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -1313,7 +1348,7 @@ msgstr ""
 "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Â»."
 
-#: ../finch/gntlog.c:275 ../pidgin/gtklog.c:554
+#: ../finch/gntlog.c:274 ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -1321,14 +1356,14 @@ msgstr ""
 "SÃ³lo se registrarÃ¡n los mensajes instantÃ¡neos si estÃ¡ habilitada la "
 "preferencia Â«Registrar todos los mensajes instantÃ¡neosÂ»."
 
-#: ../finch/gntlog.c:278 ../pidgin/gtklog.c:557
+#: ../finch/gntlog.c:277 ../pidgin/gtklog.c:557
 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."
 
-#: ../finch/gntlog.c:284 ../pidgin/gtklog.c:566
+#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "No se encontraron registros"
 
@@ -1364,11 +1399,11 @@ msgstr "Â¡Tiene correo!"
 msgid "You have mail!"
 msgstr "Â¡Tiene correo!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:537
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:544
 msgid "Subject"
 msgstr "Asunto"
 
@@ -1379,17 +1414,17 @@ msgstr[1] "%s (%s) tiene %d nuevos mensa
 msgstr[0] "%s (%s) tiene %d mensaje nuevo."
 msgstr[1] "%s (%s) tiene %d nuevos mensajes."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
 msgstr "Nuevo correo"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:984
 #, c-format
 msgid "Info for %s"
 msgstr "InformaciÃ³n sobre %s:"
 
 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:960
+#: ../pidgin/gtknotify.c:985
 msgid "Buddy Information"
 msgstr "InformaciÃ³n de amigos"
 
@@ -1397,11 +1432,11 @@ msgstr "Continuar"
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1633
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1658
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3524
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3525
 msgid "Invite"
 msgstr "Invitar"
 
@@ -1409,6 +1444,10 @@ msgstr "(ninguno)"
 msgid "(none)"
 msgstr "(ninguno)"
 
+#: ../finch/gntnotify.c:426
+msgid "URI"
+msgstr "URI"
+
 #: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "ERROR"
@@ -1483,7 +1522,7 @@ msgstr "Configurar complemento"
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2180
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -1669,12 +1708,12 @@ msgstr "Basado en el uso del teclado"
 msgid "Based on keyboard use"
 msgstr "Basado en el uso del teclado"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2061
 msgid "From last sent message"
 msgstr "Del Ãºltimo mensaje enviado"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
-#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:948 ../pidgin/gtkprefs.c:956
+#: ../pidgin/gtkprefs.c:2060 ../pidgin/gtkprefs.c:2074
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
@@ -1724,31 +1763,39 @@ msgstr "Cambiar estado a"
 msgstr "Cambiar estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1046 ../pidgin/gtkprefs.c:2147
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversaciones"
 
 #: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
+#: ../pidgin/gtkprefs.c:1617 ../pidgin/gtkprefs.c:2158
 msgid "Logging"
 msgstr "Registro"
 
-#: ../finch/gntrequest.c:621
+#: ../finch/gntrequest.c:381
+msgid "You must fill all the required fields."
+msgstr "Debe completar todos los campos obligatorios."
+
+#: ../finch/gntrequest.c:382
+msgid "The required fields are underlined."
+msgstr "Los campos obligatorios estÃ¡n subrayados."
+
+#: ../finch/gntrequest.c:640
 msgid "Not implemented yet."
 msgstr "No implementado aÃºn."
 
-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1554
+#: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: ../finch/gntrequest.c:743
+#: ../finch/gntrequest.c:762
 msgid "Choose Location..."
 msgstr "Escojer ubicaciÃ³n..."
 
@@ -1802,8 +1849,8 @@ msgstr "Otros hablan en el chat"
 msgstr "Otros hablan en el chat"
 
 #: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
-msgid "Someone says your screen name in chat"
-msgstr "Alguien dice su nombre de usuario en el chat"
+msgid "Someone says your username in chat"
+msgstr "Alguien dice su nombre en el chat"
 
 #: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
@@ -1813,8 +1860,8 @@ msgstr "No se pudo inicializar gstreamer
 msgid "GStreamer failed to initialize."
 msgstr "No se pudo inicializar gstreamer."
 
-#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1631
-#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
+#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1830 ../pidgin/gtkprefs.c:2003
 msgid "(default)"
 msgstr "(por omisiÃ³n)"
 
@@ -1830,7 +1877,7 @@ msgstr "Perfiles"
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1868
 msgid "Automatic"
 msgstr "AutomÃ¡tico"
 
@@ -1838,7 +1885,7 @@ msgstr "Timbre de la consola"
 msgid "Console Beep"
 msgstr "Timbre de la consola"
 
-#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1872
 msgid "Command"
 msgstr "Comando"
 
@@ -1846,7 +1893,7 @@ msgstr "Sin sonido"
 msgid "No Sound"
 msgstr "Sin sonido"
 
-#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1753
+#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1863
 msgid "Sound Method"
 msgstr "MÃ©todo para reproducir sonidos"
 
@@ -1864,7 +1911,7 @@ msgstr ""
 "(%s para nombre de archivo)"
 
 #. Sound options
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1784
+#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1894
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
@@ -1872,18 +1919,18 @@ msgstr "Suena cuando la conversaciÃ³n ob
 msgid "Sounds when conversation has focus"
 msgstr "Suena cuando la conversaciÃ³n obtiene el foco"
 
-#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
-#: ../pidgin/gtkprefs.c:1791 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:946 ../pidgin/gtkprefs.c:958
+#: ../pidgin/gtkprefs.c:1901 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Siempre"
 
-#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1789
+#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1899
 msgid "Only when available"
 msgstr "SÃ³lo cuando estoy disponible"
 
-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1790
+#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1900
 msgid "Only when not available"
 msgstr "SÃ³lo cuando no estoy disponible"
 
@@ -1892,11 +1939,11 @@ msgstr "Volumen(0-100):"
 msgstr "Volumen(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1819
+#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1929
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1988
 msgid "Event"
 msgstr "Acontecimiento"
 
@@ -1904,15 +1951,15 @@ msgstr "Archivo"
 msgid "File"
 msgstr "Archivo"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1897
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:2007
 msgid "Test"
 msgstr "Probar"
 
-#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:1901
+#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:2011
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:1905
+#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:2015
 msgid "Choose..."
 msgstr "Seleccionar..."
 
@@ -1930,8 +1977,8 @@ msgstr "Estados guardados"
 msgstr "Estados guardados"
 
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:326
-#: ../libpurple/protocols/jabber/buddy.c:1396
+#: ../libpurple/protocols/jabber/buddy.c:321
+#: ../libpurple/protocols/jabber/buddy.c:1397
 #: ../libpurple/protocols/msn/msn.c:747
 #: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
@@ -1952,9 +1999,9 @@ msgstr "Tipo"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:292
-#: ../libpurple/protocols/bonjour/bonjour.c:299
-#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/bonjour/bonjour.c:293
+#: ../libpurple/protocols/bonjour/bonjour.c:300
+#: ../libpurple/protocols/bonjour/bonjour.c:383
 #: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
 #: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
 #: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
@@ -1973,21 +2020,21 @@ msgstr "Tipo"
 #: ../libpurple/protocols/novell/novell.c:2959
 #: ../libpurple/protocols/novell/novell.c:2965
 #: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5669
+#: ../libpurple/protocols/oscar/oscar.c:5887
 #: ../libpurple/protocols/oscar/oscar.c:5901
-#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5917
+#: ../libpurple/protocols/oscar/oscar.c:5924
 #: ../libpurple/protocols/oscar/oscar.c:5931
-#: ../libpurple/protocols/oscar/oscar.c:5938
-#: ../libpurple/protocols/oscar/oscar.c:5945
-#: ../libpurple/protocols/sametime/sametime.c:3337
-#: ../libpurple/protocols/sametime/sametime.c:3343
-#: ../libpurple/protocols/sametime/sametime.c:3349
-#: ../libpurple/protocols/sametime/sametime.c:3428
+#: ../libpurple/protocols/sametime/sametime.c:3338
+#: ../libpurple/protocols/sametime/sametime.c:3344
+#: ../libpurple/protocols/sametime/sametime.c:3350
+#: ../libpurple/protocols/sametime/sametime.c:3429
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3813
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3817
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 #: ../libpurple/protocols/zephyr/zephyr.c:2352
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
@@ -2043,7 +2090,7 @@ msgstr "Certificados"
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2149
 msgid "Sounds"
 msgstr "Sonidos"
 
@@ -2146,16 +2193,16 @@ msgstr "Complemento Â«toasterÂ»"
 msgid "Toaster plugin"
 msgstr "Complemento Â«toasterÂ»"
 
-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:132
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>ConversaciÃ³n con %s sobre %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:159
 msgid "History Plugin Requires Logging"
 msgstr "Debe estar conectad para utilizar el complemento de histÃ³rico"
 
-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:160
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2171,13 +2218,13 @@ msgstr "HistÃ³ricoGnt"
 msgid "GntHistory"
 msgstr "HistÃ³ricoGnt"
 
-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:203
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."
 
-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:204
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2191,19 +2238,19 @@ msgstr "Conectado"
 
 #: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
 #: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2081
+#: ../libpurple/protocols/jabber/buddy.c:2082
 #: ../libpurple/protocols/novell/novell.c:2846
 #: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:5733
+#: ../libpurple/protocols/oscar/oscar.c:5719
 #: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
 #: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3333 ../pidgin/gtkblist.c:3725
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:155
+#: ../pidgin/gtkblist.c:3415 ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1090
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3369
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3451
 msgid "Online Buddies"
 msgstr "Amigos conectados"
 
@@ -2248,7 +2295,8 @@ msgstr "cuentas"
 msgid "accounts"
 msgstr "cuentas"
 
-#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:204
+#: ../libpurple/protocols/silc/silc.c:473
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contraseÃ±a."
 
@@ -2280,44 +2328,44 @@ msgstr "Las nuevas contraseÃ±as no coinc
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseÃ±as no coinciden."
 
-#: ../libpurple/account.c:1366
+#: ../libpurple/account.c:1370
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: ../libpurple/account.c:1389
+#: ../libpurple/account.c:1402
 msgid "Original password"
 msgstr "ContraseÃ±a original"
 
-#: ../libpurple/account.c:1396
+#: ../libpurple/account.c:1410
 msgid "New password"
 msgstr "Nueva contraseÃ±a"
 
-#: ../libpurple/account.c:1403
+#: ../libpurple/account.c:1418
 msgid "New password (again)"
 msgstr "Nueva contraseÃ±a (otra vez)"
 
-#: ../libpurple/account.c:1409
+#: ../libpurple/account.c:1425
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseÃ±a de %s"
 
-#: ../libpurple/account.c:1417
+#: ../libpurple/account.c:1433
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseÃ±a actual y la contraseÃ±a nueva."
 
-#: ../libpurple/account.c:1448
+#: ../libpurple/account.c:1464
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la informaciÃ³n del usuario %s"
 
-#: ../libpurple/account.c:1451 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1467 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Establecer su informaciÃ³n de usuario"
 
-#: ../libpurple/account.c:1922 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:812
-#: ../libpurple/protocols/jabber/buddy.c:2077
-#: ../libpurple/protocols/jabber/buddy.c:2094
+#: ../libpurple/account.c:1938 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:813
+#: ../libpurple/protocols/jabber/buddy.c:2078
+#: ../libpurple/protocols/jabber/buddy.c:2095
 #: ../libpurple/protocols/novell/novell.c:2849
 #: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
@@ -2325,7 +2373,7 @@ msgstr "Desconocido"
 
 #: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
 #: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3435 ../pidgin/gtkblist.c:6234
+#: ../libpurple/protocols/myspace/myspace.c:3442 ../pidgin/gtkblist.c:6317
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2517,7 +2565,7 @@ msgstr "+++ %s se ha desconectado"
 msgstr "+++ %s se ha desconectado"
 
 #: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2397
+#: ../libpurple/protocols/jabber/buddy.c:2398
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
@@ -2539,45 +2587,45 @@ msgstr "El mensaje es demasiado largo"
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
-#: ../libpurple/protocols/bonjour/jabber.c:315
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:296
+#: ../libpurple/protocols/bonjour/jabber.c:339
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
-#: ../libpurple/conversation.c:1218
+#: ../libpurple/conversation.c:1231
 msgid "Send Message"
 msgstr "Enviar un mensaje"
 
-#: ../libpurple/conversation.c:1221
+#: ../libpurple/conversation.c:1234
 msgid "_Send Message"
 msgstr "Enviar un _mensaje"
 
-#: ../libpurple/conversation.c:1627
+#: ../libpurple/conversation.c:1640
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1630
+#: ../libpurple/conversation.c:1643
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1740
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"
 
-#: ../libpurple/conversation.c:1760
+#: ../libpurple/conversation.c:1773
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: ../libpurple/conversation.c:1835
+#: ../libpurple/conversation.c:1848
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: ../libpurple/conversation.c:1838
+#: ../libpurple/conversation.c:1851
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
@@ -2597,7 +2645,7 @@ msgstr "No se pudo obtener el nombre del
 msgid "Failed to get serv name: %s"
 msgstr "No se pudo obtener el nombre del servidor: %s"
 
-#: ../libpurple/dbus-server.h:84
+#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 "El servidor D-BUS de Purple no estÃ¡ ejecutÃ¡ndose por la razÃ³n indicada a "
@@ -2969,15 +3017,15 @@ msgstr "Formato antiguo plano"
 msgid "Old flat format"
 msgstr "Formato antiguo plano"
 
-#: ../libpurple/log.c:838
+#: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversaciÃ³n."
 
-#: ../libpurple/log.c:1281
+#: ../libpurple/log.c:1293
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1365
+#: ../libpurple/log.c:1377
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2986,7 +3034,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÃTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1367
+#: ../libpurple/log.c:1379
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2995,17 +3043,17 @@ msgstr ""
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÃTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Â¡No se pudo encontrar la ruta del registro!</b></font>"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
+#: ../libpurple/log.c:1449 ../libpurple/log.c:1579
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 
-#: ../libpurple/log.c:1499
+#: ../libpurple/log.c:1511
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÃTICA>: %s\n"
@@ -3099,12 +3147,12 @@ msgstr "_Guardar"
 #: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:2301
-#: ../libpurple/protocols/oscar/oscar.c:2350
-#: ../libpurple/protocols/oscar/oscar.c:6015
-#: ../libpurple/protocols/oscar/oscar.c:6070
-#: ../libpurple/protocols/oscar/oscar.c:6297
-#: ../libpurple/protocols/oscar/oscar.c:6367 ../libpurple/request.h:1401
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2338
+#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6056
+#: ../libpurple/protocols/oscar/oscar.c:6283
+#: ../libpurple/protocols/oscar/oscar.c:6353 ../libpurple/request.h:1401
 #: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -3392,7 +3440,7 @@ msgstr "_Enviar respuesta automÃ¡tica:"
 
 #: ../libpurple/plugins/log_reader.c:1570
 #: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
+#: ../libpurple/plugins/statenotify.c:84
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se ha desconectado."
@@ -3426,7 +3474,7 @@ msgstr "No se enviÃ³ su mensaje."
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
+#: ../libpurple/plugins/log_reader.c:2855
 msgid "Adium"
 msgstr "Adium"
 
@@ -3434,7 +3482,7 @@ msgstr "Adium"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2840
+#: ../libpurple/plugins/log_reader.c:2860
 msgid "Fire"
 msgstr "Fire"
 
@@ -3442,7 +3490,7 @@ msgstr "Fire"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2844
+#: ../libpurple/plugins/log_reader.c:2864
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
@@ -3450,7 +3498,7 @@ msgstr "Messenger Plus!"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2849
+#: ../libpurple/plugins/log_reader.c:2869
 msgid "QIP"
 msgstr "QIP"
 
@@ -3458,7 +3506,7 @@ msgstr "QIP"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
+#: ../libpurple/plugins/log_reader.c:2873
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -3466,7 +3514,7 @@ msgstr "MSN Messenger"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2857
+#: ../libpurple/plugins/log_reader.c:2877
 msgid "Trillian"
 msgstr "Trillian"
 
@@ -3474,25 +3522,25 @@ msgstr "Trillian"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2861
+#: ../libpurple/plugins/log_reader.c:2881
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
+#: ../libpurple/plugins/log_reader.c:2837
 msgid "General Log Reading Configuration"
 msgstr "ConfiguraciÃ³n general de lectura del registro"
 
-#: ../libpurple/plugins/log_reader.c:2821
+#: ../libpurple/plugins/log_reader.c:2841
 msgid "Fast size calculations"
 msgstr "CÃ¡lculos de tamaÃ±o rÃ¡pido"
 
-#: ../libpurple/plugins/log_reader.c:2825
+#: ../libpurple/plugins/log_reader.c:2845
 msgid "Use name heuristics"
 msgstr "Utilizar heurÃsticos de nombres"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
+#: ../libpurple/plugins/log_reader.c:2851
 msgid "Log Directory"
 msgstr "Directorio de registro"
 
@@ -3502,19 +3550,19 @@ msgstr "Directorio de registro"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
+#: ../libpurple/plugins/log_reader.c:2910
 msgid "Log Reader"
 msgstr "Lector de registro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
+#: ../libpurple/plugins/log_reader.c:2914
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
+#: ../libpurple/plugins/log_reader.c:2918
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3570,10 +3618,8 @@ msgid ""
 #: ../libpurple/plugins/newline.c:107
 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."
+"the username 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."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
@@ -3800,44 +3846,44 @@ msgstr ""
 msgstr ""
 "Proporciona un recubrimiento a travÃ©s de las bibliotecas de soporte de SSL."
 
-#: ../libpurple/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:54
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ya no estÃ¡ ausente."
 
-#: ../libpurple/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:56
 #, c-format
 msgid "%s has gone away."
 msgstr "%s se ha marchado."
 
-#: ../libpurple/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:66
 #, c-format
 msgid "%s has become idle."
 msgstr "%s estÃ¡ ahora inactivo."
 
-#: ../libpurple/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:68
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ya no estÃ¡ inactivo."
 
-#: ../libpurple/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s has signed on."
 msgstr "%s se ha conectado."
 
-#: ../libpurple/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:95
 msgid "Notify When"
 msgstr "Notificar cuando"
 
-#: ../libpurple/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:98
 msgid "Buddy Goes _Away"
 msgstr "El amigo se _ausenta"
 
-#: ../libpurple/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:101
 msgid "Buddy Goes _Idle"
 msgstr "El amigo estÃ¡ _inactivo"
 
-#: ../libpurple/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:104
 msgid "Buddy _Signs On/Off"
 msgstr "Un amigo _se conecta/desconecta"
 
@@ -3847,7 +3893,7 @@ msgstr "Un amigo _se conecta/desconecta"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:152
 msgid "Buddy State Notification"
 msgstr "NotificaciÃ³n de estado de amigos"
 
@@ -3855,8 +3901,8 @@ msgstr "NotificaciÃ³n de estado de amigo
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:151
-#: ../libpurple/plugins/statenotify.c:154
+#: ../libpurple/plugins/statenotify.c:155
+#: ../libpurple/plugins/statenotify.c:158
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -3880,7 +3926,7 @@ 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"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:101
+#: ../libpurple/protocols/bonjour/bonjour.c:102
 msgid ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
@@ -3890,11 +3936,11 @@ msgstr ""
 "mÃ¡s informaciÃ³n consulte las preguntas frecuentas (FAQ) en http://developer."
 "pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:120
+#: ../libpurple/protocols/bonjour/bonjour.c:121
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:147
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -3902,40 +3948,40 @@ msgstr ""
 "arrancado?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:392
-#: ../libpurple/protocols/bonjour/bonjour.c:698
+#: ../libpurple/protocols/bonjour/bonjour.c:393
+#: ../libpurple/protocols/bonjour/bonjour.c:699
 #: ../libpurple/protocols/gg/gg.c:633
 #: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "Nombre:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:701
+#: ../libpurple/protocols/bonjour/bonjour.c:395
+#: ../libpurple/protocols/bonjour/bonjour.c:702
 #: ../libpurple/protocols/gg/gg.c:628
 #: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "Apellidos:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1362
-#: ../libpurple/protocols/jabber/buddy.c:1372
-#: ../libpurple/protocols/jabber/buddy.c:2266
-#: ../libpurple/protocols/silc/ops.c:1056
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/bonjour/bonjour.c:399
+#: ../libpurple/protocols/jabber/buddy.c:318
+#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1373
+#: ../libpurple/protocols/jabber/buddy.c:2267
+#: ../libpurple/protocols/silc/ops.c:1055
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "E-Mail"
 msgstr "Correo electrÃ³nico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:401
-#: ../libpurple/protocols/bonjour/bonjour.c:707
+#: ../libpurple/protocols/bonjour/bonjour.c:402
+#: ../libpurple/protocols/bonjour/bonjour.c:708
 msgid "AIM Account"
 msgstr "Cuenta AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:710
+#: ../libpurple/protocols/bonjour/bonjour.c:405
+#: ../libpurple/protocols/bonjour/bonjour.c:711
 msgid "XMPP Account"
 msgstr "Cuenta XMPP"
 
@@ -3949,20 +3995,20 @@ msgstr "Cuenta XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:508
-#: ../libpurple/protocols/bonjour/bonjour.c:510
+#: ../libpurple/protocols/bonjour/bonjour.c:509
+#: ../libpurple/protocols/bonjour/bonjour.c:511
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:651
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 msgid "Purple Person"
 msgstr "Persona morada"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
+#: ../libpurple/protocols/bonjour/bonjour.c:705
 #: ../libpurple/protocols/gg/gg.c:478
 #: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
+#: ../libpurple/protocols/silc/silc.c:986
+#: ../libpurple/protocols/silc/silc.c:1227
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
@@ -3972,32 +4018,32 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:407
+#: ../libpurple/protocols/bonjour/jabber.c:431
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversaciÃ³n."
 
-#: ../libpurple/protocols/bonjour/jabber.c:457
-#: ../libpurple/protocols/bonjour/jabber.c:522
-#: ../libpurple/protocols/bonjour/jabber.c:567
-#: ../libpurple/protocols/bonjour/jabber.c:744
-#: ../libpurple/protocols/bonjour/jabber.c:762
+#: ../libpurple/protocols/bonjour/jabber.c:481
+#: ../libpurple/protocols/bonjour/jabber.c:546
+#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:768
+#: ../libpurple/protocols/bonjour/jabber.c:786
 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."
 
-#: ../libpurple/protocols/bonjour/jabber.c:661
+#: ../libpurple/protocols/bonjour/jabber.c:685
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:671
+#: ../libpurple/protocols/bonjour/jabber.c:695
 msgid "Error setting socket options"
 msgstr "Error al establecer las opciones del socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:697
+#: ../libpurple/protocols/bonjour/jabber.c:721
 msgid "Could not bind socket to port"
 msgstr "No se pudo vincular el socket al puerto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:707
+#: ../libpurple/protocols/bonjour/jabber.c:731
 msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"
 
@@ -4112,8 +4158,8 @@ msgstr "Por favor, rellene los siguiente
 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
 #: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/oscar/oscar.c:3836
-#: ../libpurple/protocols/oscar/oscar.c:3849
+#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3841
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
@@ -4125,7 +4171,7 @@ msgstr "AÃ±o de nacimiento"
 #: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1759
 #: ../libpurple/protocols/msnp9/msn.c:1600
 #: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
 #: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
@@ -4138,14 +4184,14 @@ msgstr "Hombre o mujer"
 msgstr "Hombre o mujer"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Hombre"
 
 #: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -4205,7 +4251,7 @@ msgstr "AÃ±adir al chat"
 msgstr "AÃ±adir al chat"
 
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2083
+#: ../libpurple/protocols/jabber/buddy.c:2084
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/msnp9/state.c:29
@@ -4214,8 +4260,8 @@ msgstr "AÃ±adir al chat"
 #: ../libpurple/protocols/msnp9/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
+#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1086
 msgid "Available"
 msgstr "Disponible"
 
@@ -4223,32 +4269,32 @@ msgstr "Disponible"
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2087
+#: ../libpurple/protocols/irc/msgs.c:358
+#: ../libpurple/protocols/jabber/buddy.c:2088
 #: ../libpurple/protocols/novell/novell.c:2837
 #: ../libpurple/protocols/oscar/oscar.c:734
-#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5747
 #: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
 #: ../libpurple/protocols/silc/buddy.c:1479
 #: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3715
-#: ../libpurple/protocols/yahoo/yahoo.c:3789 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
-#: ../pidgin/gtkstatusbox.c:1082
+#: ../libpurple/protocols/yahoo/yahoo.c:3719
+#: ../libpurple/protocols/yahoo/yahoo.c:3793 ../libpurple/status.c:159
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2070
+#: ../pidgin/gtkstatusbox.c:1087
 msgid "Away"
 msgstr "Ausente"
 
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2767
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2260
-#: ../libpurple/protocols/jabber/buddy.c:2446
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/silc/ops.c:1005
+#: ../libpurple/protocols/jabber/buddy.c:2261
+#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/silc/ops.c:1004
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
@@ -4258,7 +4304,7 @@ msgstr "AÃ±o de nacimiento"
 msgstr "AÃ±o de nacimiento"
 
 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3950
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la bÃºsqueda."
 
@@ -4375,23 +4421,23 @@ msgstr "Usuario de Gadu-Gadu"
 msgstr "Usuario de Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc/silc.c:1853
 #: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:509
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/jabber/chat.c:596
+#: ../libpurple/protocols/silc/silc.c:1561
 #: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:513
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/jabber/chat.c:600
+#: ../libpurple/protocols/silc/silc.c:1565
 #: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "No hay tema establecido"
@@ -4401,9 +4447,9 @@ msgstr "No hay tema establecido"
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 msgid "File Transfer Failed"
 msgstr "FallÃ³ la transferencia de archivos"
 
@@ -4431,7 +4477,7 @@ msgstr "MOTD para %s"
 
 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
 #: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2532
+#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
@@ -4463,10 +4509,10 @@ msgstr "Los apodos de IRC no pueden tene
 #: ../libpurple/protocols/novell/novell.c:2199
 #: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3777
+#: ../libpurple/protocols/sametime/sametime.c:3778
 #: ../libpurple/protocols/simple/simple.c:1915
 #: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:686
 msgid "Connecting"
 msgstr "Conectando"
 
@@ -4489,21 +4535,21 @@ msgstr "No se pudo conectar al servidor"
 msgstr "No se pudo conectar al servidor"
 
 #: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2526
+#: ../libpurple/protocols/myspace/myspace.c:2533
 msgid "Read error"
 msgstr "Error de lectura"
 
 #: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1398
+#: ../libpurple/protocols/silc/chat.c:1401
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Usuarios"
 
 #: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3425
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1408
+#: ../libpurple/protocols/sametime/sametime.c:3426
+#: ../libpurple/protocols/silc/chat.c:1404
+#: ../libpurple/protocols/silc/ops.c:1406
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1517
@@ -4528,14 +4574,14 @@ msgstr "Complemento de protocolo IRC men
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:371
 #: ../libpurple/protocols/msn/msn.c:2357
 #: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6763
+#: ../libpurple/protocols/oscar/oscar.c:6749
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5782
-#: ../libpurple/protocols/silc/ops.c:1264
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/sametime/sametime.c:5783
+#: ../libpurple/protocols/silc/ops.c:1262
+#: ../libpurple/protocols/silc/ops.c:1356
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:2099
@@ -4546,10 +4592,10 @@ msgstr "Servidor"
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
 #: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6766
+#: ../libpurple/protocols/oscar/oscar.c:6752
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5787
-#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/sametime/sametime.c:5788
+#: ../libpurple/protocols/silc/silc.c:2143
 #: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
@@ -4559,28 +4605,8 @@ msgstr "Codificaciones"
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:976
-#: ../libpurple/protocols/oscar/oscar.c:2956
-#: ../libpurple/protocols/oscar/oscar.c:3969
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc/ops.c:1215
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc/silc.c:1148
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
-#: ../libpurple/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:365
+#: ../libpurple/protocols/silc/silc.c:1225
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "Nombre real"
@@ -4593,155 +4619,169 @@ msgstr "Usar SSL"
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Bad mode"
 msgstr "Modo errÃ³neo"
 
+#: ../libpurple/protocols/irc/msgs.c:214
+#, c-format
+msgid "Ban on %s by %s, set %ld seconds ago"
+msgstr "Explusado %s por %s, hace %ld segundos"
+
+#: ../libpurple/protocols/irc/msgs.c:217
+#, c-format
+msgid "Ban on %s"
+msgstr "Prohibir en %s"
+
+#: ../libpurple/protocols/irc/msgs.c:232
+msgid "End of ban list"
+msgstr "Fin de la lista de prohibiciones"
+
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/irc/msgs.c:200
+#: ../libpurple/protocols/irc/msgs.c:246
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ha sido expulsado de %s."
 
-#: ../libpurple/protocols/irc/msgs.c:201
+#: ../libpurple/protocols/irc/msgs.c:247
 msgid "Banned"
 msgstr "Expulsado"
 
-#: ../libpurple/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:264
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "No se puede expulsar a %s: la lista de expulsados estÃ¡ llena"
 
-#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/irc/msgs.c:349
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:304
+#: ../libpurple/protocols/irc/msgs.c:350
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/silc/ops.c:1437
+#: ../libpurple/protocols/irc/msgs.c:351
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/ops.c:1435
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apodo"
 
-#: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1283
+#: ../libpurple/protocols/irc/msgs.c:377
+#: ../libpurple/protocols/silc/ops.c:1281
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../libpurple/protocols/irc/msgs.c:336
+#: ../libpurple/protocols/irc/msgs.c:382
 msgid "Idle for"
 msgstr "Inactivo durante"
 
-#: ../libpurple/protocols/irc/msgs.c:339
+#: ../libpurple/protocols/irc/msgs.c:385
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:389
 msgid "<b>Defining adjective:</b>"
 msgstr "<br><b>Adjetivo que lo define:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:473
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:424
+#: ../libpurple/protocols/irc/msgs.c:475
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ha borrado el tema."
 
-#: ../libpurple/protocols/irc/msgs.c:432
+#: ../libpurple/protocols/irc/msgs.c:483
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:450
+#: ../libpurple/protocols/irc/msgs.c:501
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:451
+#: ../libpurple/protocols/irc/msgs.c:502
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: ../libpurple/protocols/irc/msgs.c:451
+#: ../libpurple/protocols/irc/msgs.c:502
 msgid "The IRC server received a message it did not understand."
 msgstr "El servidor IRC ha recibido un mensaje que no pudo entender."
 
-#: ../libpurple/protocols/irc/msgs.c:472
+#: ../libpurple/protocols/irc/msgs.c:523
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: ../libpurple/protocols/irc/msgs.c:580
+#: ../libpurple/protocols/irc/msgs.c:631
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: ../libpurple/protocols/irc/msgs.c:591
+#: ../libpurple/protocols/irc/msgs.c:642
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:602
+#: ../libpurple/protocols/irc/msgs.c:653
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: ../libpurple/protocols/irc/msgs.c:605
+#: ../libpurple/protocols/irc/msgs.c:656
 msgid "User is not logged in"
 msgstr "El usuario no estÃ¡ conectado"
 
-#: ../libpurple/protocols/irc/msgs.c:610
+#: ../libpurple/protocols/irc/msgs.c:661
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: ../libpurple/protocols/irc/msgs.c:630
+#: ../libpurple/protocols/irc/msgs.c:681
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:686
+#: ../libpurple/protocols/irc/msgs.c:737
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitaciÃ³n."
 
-#: ../libpurple/protocols/irc/msgs.c:687
+#: ../libpurple/protocols/irc/msgs.c:738
 msgid "Invitation only"
 msgstr "SÃ³lo con invitaciÃ³n"
 
-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:854
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:808 ../libpurple/protocols/silc/ops.c:714
+#: ../libpurple/protocols/irc/msgs.c:859 ../libpurple/protocols/silc/ops.c:714
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:831
+#: ../libpurple/protocols/irc/msgs.c:882
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:919 ../libpurple/protocols/irc/msgs.c:920
+#: ../libpurple/protocols/irc/msgs.c:970 ../libpurple/protocols/irc/msgs.c:971
 msgid "Invalid nickname"
 msgstr "Apodo invÃ¡lido"
 
-#: ../libpurple/protocols/irc/msgs.c:921
+#: ../libpurple/protocols/irc/msgs.c:972
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4749,7 +4789,7 @@ msgstr ""
 "El servidor rechazÃ³ el nombre que escogiÃ³ para su cuenta. Es posible que "
 "incluya caracteres invÃ¡lidos."
 
-#: ../libpurple/protocols/irc/msgs.c:926
+#: ../libpurple/protocols/irc/msgs.c:977
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4757,53 +4797,53 @@ msgstr ""
 "El servidor rechazÃ³ el nombre que escogiÃ³ para su cuenta. Es posible que "
 "incluya caracteres invÃ¡lidos."
 
-#: ../libpurple/protocols/irc/msgs.c:965
+#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:965
+#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:986
+#: ../libpurple/protocols/irc/msgs.c:1041
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1028
+#: ../libpurple/protocols/irc/msgs.c:1085
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG invÃ¡lido del servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1030
+#: ../libpurple/protocols/irc/msgs.c:1087
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1121
+#: ../libpurple/protocols/irc/msgs.c:1178
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "No se pudo unir a %s: es necesario registrarse"
 
-#: ../libpurple/protocols/irc/msgs.c:1122
-#: ../libpurple/protocols/silc/ops.c:1108
+#: ../libpurple/protocols/irc/msgs.c:1179
+#: ../libpurple/protocols/silc/ops.c:1106
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1156
+#: ../libpurple/protocols/irc/msgs.c:1213
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal estÃ¡n temporalmente no disponibles."
 
-#: ../libpurple/protocols/irc/msgs.c:1168
+#: ../libpurple/protocols/irc/msgs.c:1225
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acciÃ³n a realizar&gt;: Realiza una acciÃ³n."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4811,11 +4851,11 @@ msgstr ""
 "away [mensaje]:  Fija el mensaje cuando se estÃ¡ ausente, o no utilizar un "
 "mensaje al dejar de estar ausente."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:126
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4823,7 +4863,7 @@ msgstr ""
 "deop &lt;apodo1&gt; [apodo2] ....: Quitarle a alguien el estado de operador "
 "de canal. SÃ³lo un operador de canal puede hacerlo."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -4833,7 +4873,7 @@ msgstr ""
 "hablar en el canal si Ã©ste estÃ¡ moderado (+m). SÃ³lo lo puede hacer un "
 "operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -4841,7 +4881,7 @@ msgstr ""
 "invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal "
 "especificado o al canal actual."
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4849,7 +4889,7 @@ msgstr ""
 "j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o mÃ¡s "
 "canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4857,7 +4897,7 @@ msgstr ""
 "join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o "
 "mÃ¡s canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:132
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -4865,7 +4905,7 @@ msgstr ""
 "kick &lt;apodo&gt; [mensaje]:  Echar a alguien del canal. SÃ³lo lo pueden "
 "hacer los operadores de canal."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -4873,15 +4913,15 @@ msgstr ""
 "list:  Mostrar una lista de las salas de chat disponibles en la red. "
 "<i>Aviso: algunos servidores puede que le desconecten si hace Ã©sto.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:134
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acciÃ³n a realizar&gt;:  Realizar una acciÃ³n."
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4889,7 +4929,7 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;apodo|canal&gt;:  Fija o elimina un modo "
 "de canal o de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:137
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4897,25 +4937,25 @@ msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [canal]:  Obtener la lista de los usuarios que estÃ¡n en el canal."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:139
 #: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Enviar un comando al servidor."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;objetivo&gt;: enviar un aviso a un usuario o a un canal."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4923,7 +4963,7 @@ msgstr ""
 "op &lt;apodo1&gt; [apodo2] ...:  Dar estado de operador de canal a otra "
 "persona. SÃ³lo lo puede hacer un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4931,11 +4971,11 @@ msgstr ""
 "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
 "utilizarlo."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "operserv: Send a command to operserv"
 msgstr "openserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4943,7 +4983,7 @@ msgstr ""
 "part [sala] [mensaje]:  Abandonar el canal actual, o un canal especÃfico, "
 "con el mensaje opcional."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4951,7 +4991,7 @@ msgstr ""
 "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
 "no se especifica un usuario)."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4959,17 +4999,17 @@ msgstr ""
 "query &lt;apodo&gt; &lt;mensaje&gt;:  EnvÃa un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual indicando un mensaje "
 "(opcional)."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crudo al servidor."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:150
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4977,24 +5017,24 @@ msgstr ""
 "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. SÃ³lo puede "
 "hacerlo un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Muestra la hora local en el servidor IRC."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuevo tema]:  Muestra o cambia el tema del canal."
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [apodo]: envÃa una solicitud CTCP VERSION al usuario"
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:155
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5002,38 +5042,38 @@ msgstr ""
 "voice &lt;apodo1&gt; [apodo2] ...:  Dar la posibilidad de hablar en el canal "
 "a alguien. SÃ³lo lo puede hacer un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:156
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
 
-#: ../libpurple/protocols/irc/parse.c:155
+#: ../libpurple/protocols/irc/parse.c:157
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;apodo&gt;:  Obtiene informaciÃ³n de un usuario."
 
-#: ../libpurple/protocols/irc/parse.c:156
+#: ../libpurple/protocols/irc/parse.c:158
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;apodo&gt;:  Obtiene informaciÃ³n de un usuario que se ha "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:523
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:522
+#: ../libpurple/protocols/irc/parse.c:524
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:522
+#: ../libpurple/protocols/irc/parse.c:524
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:634
-#: ../libpurple/protocols/irc/parse.c:641 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:636
+#: ../libpurple/protocols/irc/parse.c:643 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -5060,12 +5100,17 @@ msgstr ""
 msgstr ""
 "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:120
+#: ../libpurple/protocols/jabber/auth.c:60
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
+
+#: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticaciÃ³n en claro sobre un canal no cifrado"
 
-#: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:532
+#: ../libpurple/protocols/jabber/auth.c:328
+#: ../libpurple/protocols/jabber/auth.c:535
+#: ../libpurple/protocols/jabber/auth.c:729
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -5074,147 +5119,139 @@ msgstr ""
 "%s solicita autenticaciÃ³n en claro sobre un canal no cifrado. Â¿Desea "
 "permitir Ã©sto y continuar con el proceso de autenticaciÃ³n?"
 
-#: ../libpurple/protocols/jabber/auth.c:325
-#: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:535
-#: ../libpurple/protocols/jabber/auth.c:726
-#: ../libpurple/protocols/jabber/auth.c:727
+#: ../libpurple/protocols/jabber/auth.c:330
+#: ../libpurple/protocols/jabber/auth.c:331
+#: ../libpurple/protocols/jabber/auth.c:537
+#: ../libpurple/protocols/jabber/auth.c:538
+#: ../libpurple/protocols/jabber/auth.c:731
+#: ../libpurple/protocols/jabber/auth.c:732
 msgid "Plaintext Authentication"
 msgstr "AutenticaciÃ³n en claro"
 
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:659
-#: ../libpurple/protocols/jabber/auth.c:907
-#: ../libpurple/protocols/jabber/auth.c:1058
-#: ../libpurple/protocols/jabber/auth.c:1085
-#: ../libpurple/protocols/jabber/auth.c:1109
+#: ../libpurple/protocols/jabber/auth.c:489
+#: ../libpurple/protocols/jabber/auth.c:662
+#: ../libpurple/protocols/jabber/auth.c:913
+#: ../libpurple/protocols/jabber/auth.c:1064
+#: ../libpurple/protocols/jabber/auth.c:1091
+#: ../libpurple/protocols/jabber/auth.c:1137
 #: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Respuesta invÃ¡lida del servidor."
 
-#: ../libpurple/protocols/jabber/auth.c:548
-#: ../libpurple/protocols/jabber/auth.c:739
+#: ../libpurple/protocols/jabber/auth.c:551
+#: ../libpurple/protocols/jabber/auth.c:745
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un mÃ©todo de autenticaciÃ³n conocido"
 
-#: ../libpurple/protocols/jabber/auth.c:728
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"El servidor solicita autenticaciÃ³n en claro sobre un canal no cifrado. "
-"Â¿Permitir Ã©sto y continuar con el proceso de autenticaciÃ³n?"
-
-#: ../libpurple/protocols/jabber/auth.c:930
-#: ../libpurple/protocols/jabber/auth.c:955
+#: ../libpurple/protocols/jabber/auth.c:936
+#: ../libpurple/protocols/jabber/auth.c:961
 msgid "Invalid challenge from server"
 msgstr "DesafÃo invÃ¡lido del servidor"
 
-#: ../libpurple/protocols/jabber/auth.c:1031
+#: ../libpurple/protocols/jabber/auth.c:1037
 msgid "SASL error"
 msgstr "Error de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1256
-#: ../libpurple/protocols/sametime/sametime.c:4183
-#: ../libpurple/protocols/silc/ops.c:1001
+#: ../libpurple/protocols/jabber/buddy.c:306
+#: ../libpurple/protocols/jabber/buddy.c:1257
+#: ../libpurple/protocols/sametime/sametime.c:4184
+#: ../libpurple/protocols/silc/ops.c:1000
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1268
-#: ../libpurple/protocols/silc/ops.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:307
+#: ../libpurple/protocols/jabber/buddy.c:1269
+#: ../libpurple/protocols/silc/ops.c:1012
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1271
+#: ../libpurple/protocols/jabber/buddy.c:308
+#: ../libpurple/protocols/jabber/buddy.c:1272
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/buddy.c:310
 #: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1319
+#: ../libpurple/protocols/jabber/buddy.c:311
+#: ../libpurple/protocols/jabber/buddy.c:1320
 msgid "Street Address"
 msgstr "Calle"
 
-#: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1316
+#: ../libpurple/protocols/jabber/buddy.c:312
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Extended Address"
 msgstr "DirecciÃ³n extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1322
+#: ../libpurple/protocols/jabber/buddy.c:313
+#: ../libpurple/protocols/jabber/buddy.c:1323
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:314
+#: ../libpurple/protocols/jabber/buddy.c:1326
 msgid "Region"
 msgstr "RegiÃ³n"
 
-#: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1328
+#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/buddy.c:1329
 msgid "Postal Code"
 msgstr "CÃ³digo postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1332
-#: ../libpurple/protocols/silc/silc.c:1158
+#: ../libpurple/protocols/jabber/buddy.c:316
+#: ../libpurple/protocols/jabber/buddy.c:1333
+#: ../libpurple/protocols/silc/silc.c:1231
 #: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "PaÃs"
 
-#: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1343
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:317
+#: ../libpurple/protocols/jabber/buddy.c:1344
+#: ../libpurple/protocols/jabber/buddy.c:1351
 msgid "Telephone"
 msgstr "TelÃ©fono"
 
-#: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1387
+#: ../libpurple/protocols/jabber/buddy.c:319
+#: ../libpurple/protocols/jabber/buddy.c:1388
 msgid "Organization Name"
 msgstr "Nombre de la organizaciÃ³n"
 
-#: ../libpurple/protocols/jabber/buddy.c:325
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:320
+#: ../libpurple/protocols/jabber/buddy.c:1391
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: ../libpurple/protocols/jabber/buddy.c:327
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:322
+#: ../libpurple/protocols/jabber/buddy.c:1400
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:328
-#: ../libpurple/protocols/jabber/buddy.c:1287
+#: ../libpurple/protocols/jabber/buddy.c:323
+#: ../libpurple/protocols/jabber/buddy.c:1288
 #: ../libpurple/protocols/msn/msn.c:1828
 #: ../libpurple/protocols/msnp9/msn.c:1669
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3788
 msgid "Birthday"
 msgstr "CumpleaÃ±os"
 
-#: ../libpurple/protocols/jabber/buddy.c:329
-#: ../libpurple/protocols/jabber/buddy.c:1402
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3345
-#: ../pidgin/gtkplugin.c:568 ../pidgin/gtkprefs.c:688
+#: ../libpurple/protocols/jabber/buddy.c:324
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/chat.c:780
+#: ../libpurple/protocols/jabber/usermood.c:190 ../pidgin/gtkblist.c:3427
+#: ../pidgin/gtkplugin.c:582 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: ../libpurple/protocols/jabber/buddy.c:752
 #: ../libpurple/protocols/jabber/buddy.c:753
+#: ../libpurple/protocols/jabber/buddy.c:754
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard de XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:754
+#: ../libpurple/protocols/jabber/buddy.c:755
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5222,285 +5259,285 @@ msgstr ""
 "Todos los campos siguientes son opcionales. Introduzca sÃ³lo la informaciÃ³n "
 "con la que se sienta cÃ³modo."
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:990
+#: ../libpurple/protocols/jabber/buddy.c:826
+#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:994
+#: ../libpurple/protocols/jabber/buddy.c:830
+#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1006
 msgid "Last Activity"
 msgstr "Ãšltima actividad"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
+#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:1008
 msgid "Service Discovery Info"
 msgstr "InformaciÃ³n de descubrimiento de servicio"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
+#: ../libpurple/protocols/jabber/buddy.c:850
+#: ../libpurple/protocols/jabber/buddy.c:1010
 msgid "Service Discovery Items"
 msgstr "Elementos de descubrimiento de servicio"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:1012
 msgid "Extended Stanza Addressing"
 msgstr "DirecciÃ³n de grupo extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:854
+#: ../libpurple/protocols/jabber/buddy.c:1014
 msgid "Multi-User Chat"
 msgstr "Chat multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1016
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "InformaciÃ³n de presencia extendida en chat multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:858
+#: ../libpurple/protocols/jabber/buddy.c:1018
 msgid "In-Band Bytestreams"
 msgstr "Flujos de bytes en banda"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:1020
 msgid "Ad-Hoc Commands"
 msgstr "Ã“rdenes ad-hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
+#: ../libpurple/protocols/jabber/buddy.c:862
+#: ../libpurple/protocols/jabber/buddy.c:1022
 msgid "PubSub Service"
 msgstr "Servicio PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
+#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:1024
 msgid "SOCKS5 Bytestreams"
 msgstr "Flujos de bytes SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
+#: ../libpurple/protocols/jabber/buddy.c:866
+#: ../libpurple/protocols/jabber/buddy.c:1026
 msgid "Out of Band Data"
 msgstr "Datos fuera de banda"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
+#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:1028
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
+#: ../libpurple/protocols/jabber/buddy.c:870
+#: ../libpurple/protocols/jabber/buddy.c:1030
 msgid "In-Band Registration"
 msgstr "Registro en lÃnea"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
+#: ../libpurple/protocols/jabber/buddy.c:872
+#: ../libpurple/protocols/jabber/buddy.c:1032
 msgid "User Location"
 msgstr "UbicaciÃ³n del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
+#: ../libpurple/protocols/jabber/buddy.c:874
+#: ../libpurple/protocols/jabber/buddy.c:1034
 msgid "User Avatar"
 msgstr "Avatar del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
+#: ../libpurple/protocols/jabber/buddy.c:876
+#: ../libpurple/protocols/jabber/buddy.c:1036
 msgid "Chat State Notifications"
 msgstr "Notificaciones de estado de chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:878
+#: ../libpurple/protocols/jabber/buddy.c:1038
 msgid "Software Version"
 msgstr "VersiÃ³n del programa"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
+#: ../libpurple/protocols/jabber/buddy.c:880
+#: ../libpurple/protocols/jabber/buddy.c:1040
 msgid "Stream Initiation"
 msgstr "Origen del flujo"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
-#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/jabber/buddy.c:882
+#: ../libpurple/protocols/jabber/buddy.c:1042
+#: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "Transferencia de archivo"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:1044
 msgid "User Mood"
 msgstr "Estado de Ã¡nimo del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
+#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1046
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
+#: ../libpurple/protocols/jabber/buddy.c:888
+#: ../libpurple/protocols/jabber/buddy.c:1048
 msgid "Entity Capabilities"
 msgstr "Capacidades de la entidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
+#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:1050
 msgid "Encrypted Session Negotiations"
 msgstr "Negociaciones de sesiones cifradas"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
+#: ../libpurple/protocols/jabber/buddy.c:892
+#: ../libpurple/protocols/jabber/buddy.c:1052
 msgid "User Tune"
 msgstr "MÃºsica del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
+#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:1054
 msgid "Roster Item Exchange"
 msgstr "Intercambio de elementos de la lista"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
+#: ../libpurple/protocols/jabber/buddy.c:896
+#: ../libpurple/protocols/jabber/buddy.c:1056
 msgid "Reachability Address"
 msgstr "DirecciÃ³n alcanzable"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:1058
 msgid "User Profile"
 msgstr "Perfil de usuario"
 
 # JFS: Jingle es un protocolo de transporte, no se traduce
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:900
+#: ../libpurple/protocols/jabber/buddy.c:1060
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:1062
 msgid "Jingle Audio"
 msgstr "Audio Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:904
+#: ../libpurple/protocols/jabber/buddy.c:1064
 msgid "User Nickname"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:1066
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:908
+#: ../libpurple/protocols/jabber/buddy.c:1068
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1070
 msgid "Jingle Raw UDP"
 msgstr "Jingle UDP en crudo"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:912
+#: ../libpurple/protocols/jabber/buddy.c:1072
 msgid "Jingle Video"
 msgstr "VÃdeo Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:914
+#: ../libpurple/protocols/jabber/buddy.c:1074
 msgid "Jingle DTMF"
 msgstr "DTMF Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1075
+#: ../libpurple/protocols/jabber/buddy.c:916
+#: ../libpurple/protocols/jabber/buddy.c:1076
 msgid "Message Receipts"
 msgstr "Recibos de mensajes"
 
-#: ../libpurple/protocols/jabber/buddy.c:917
-#: ../libpurple/protocols/jabber/buddy.c:1077
+#: ../libpurple/protocols/jabber/buddy.c:918
+#: ../libpurple/protocols/jabber/buddy.c:1078
 msgid "Public Key Publishing"
 msgstr "PublicaciÃ³n de la clave pÃºblica"
 
-#: ../libpurple/protocols/jabber/buddy.c:919
-#: ../libpurple/protocols/jabber/buddy.c:1079
+#: ../libpurple/protocols/jabber/buddy.c:920
+#: ../libpurple/protocols/jabber/buddy.c:1080
 msgid "User Chatting"
 msgstr "Chatear con usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:1082
 msgid "User Browsing"
 msgstr "Navegar usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1083
+#: ../libpurple/protocols/jabber/buddy.c:924
+#: ../libpurple/protocols/jabber/buddy.c:1084
 msgid "User Gaming"
 msgstr "Jugar con usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:925
-#: ../libpurple/protocols/jabber/buddy.c:1085
+#: ../libpurple/protocols/jabber/buddy.c:926
+#: ../libpurple/protocols/jabber/buddy.c:1086
 msgid "User Viewing"
 msgstr "Ver usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:927
-#: ../libpurple/protocols/jabber/buddy.c:1087
-#: ../libpurple/protocols/silc/ops.c:1615
-#: ../libpurple/protocols/silc/ops.c:1620
+#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:1088
+#: ../libpurple/protocols/silc/ops.c:1613
+#: ../libpurple/protocols/silc/ops.c:1618
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:929
-#: ../libpurple/protocols/jabber/buddy.c:1089
+#: ../libpurple/protocols/jabber/buddy.c:930
+#: ../libpurple/protocols/jabber/buddy.c:1090
 msgid "Stanza Encryption"
 msgstr "Cifrado de grupo"
 
-#: ../libpurple/protocols/jabber/buddy.c:931
-#: ../libpurple/protocols/jabber/buddy.c:1091
+#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:1092
 msgid "Entity Time"
 msgstr "Tiempo de entidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/buddy.c:1093
+#: ../libpurple/protocols/jabber/buddy.c:934
+#: ../libpurple/protocols/jabber/buddy.c:1094
 msgid "Delayed Delivery"
 msgstr "EnvÃo con demora"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/buddy.c:1095
+#: ../libpurple/protocols/jabber/buddy.c:936
+#: ../libpurple/protocols/jabber/buddy.c:1096
 msgid "Collaborative Data Objects"
 msgstr "Objetods de datos colaborativos"
 
-#: ../libpurple/protocols/jabber/buddy.c:937
-#: ../libpurple/protocols/jabber/buddy.c:1097
+#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:1098
 msgid "File Repository and Sharing"
 msgstr "Repositorio de archivos y comparticiÃ³n"
 
-#: ../libpurple/protocols/jabber/buddy.c:939
-#: ../libpurple/protocols/jabber/buddy.c:1099
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:1100
 msgid "STUN Service Discovery for Jingle"
 msgstr "Servidor de descubrimiento STUN para Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/buddy.c:1101
+#: ../libpurple/protocols/jabber/buddy.c:942
+#: ../libpurple/protocols/jabber/buddy.c:1102
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "NegociaciÃ³n de sesiÃ³n cifrada simplificada"
 
-#: ../libpurple/protocols/jabber/buddy.c:943
-#: ../libpurple/protocols/jabber/buddy.c:1103
+#: ../libpurple/protocols/jabber/buddy.c:944
+#: ../libpurple/protocols/jabber/buddy.c:1104
 msgid "Hop Check"
 msgstr "ComprobaciÃ³n de saltos"
 
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/jabber/buddy.c:1111
-#: ../libpurple/protocols/oscar/oscar.c:2974
+#: ../libpurple/protocols/jabber/buddy.c:952
+#: ../libpurple/protocols/jabber/buddy.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2962
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:964
 #: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1094
+#: ../libpurple/protocols/jabber/si.c:1098
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:966
 #: ../libpurple/protocols/jabber/jabber.c:1610
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1638
@@ -5509,99 +5546,99 @@ msgstr "Prioridad"
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../libpurple/protocols/jabber/buddy.c:1274
-#: ../libpurple/protocols/silc/ops.c:1009
+#: ../libpurple/protocols/jabber/buddy.c:1275
+#: ../libpurple/protocols/silc/ops.c:1008
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1307
+#: ../libpurple/protocols/jabber/buddy.c:1308
 #: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/oscar/oscar.c:3835
-#: ../libpurple/protocols/oscar/oscar.c:3848
+#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/oscar/oscar.c:3840
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1045
+#: ../libpurple/protocols/silc/ops.c:1044
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "DirecciÃ³n"
 
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "P.O. Box"
 msgstr "CÃ³digo postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:1423
+#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1423
+#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1993
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1996
+#: ../libpurple/protocols/jabber/buddy.c:1997
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:2004
+#: ../libpurple/protocols/jabber/buddy.c:2005
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificaciÃ³n de presencia"
 
-#: ../libpurple/protocols/jabber/buddy.c:2011
+#: ../libpurple/protocols/jabber/buddy.c:2012
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorizaciÃ³n"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:2020
+#: ../libpurple/protocols/jabber/buddy.c:2021
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2036
 msgid "Log In"
 msgstr "Conectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2040
 msgid "Log Out"
 msgstr "Desconectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2085
+#: ../libpurple/protocols/jabber/buddy.c:2086
 #: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../libpurple/protocols/jabber/buddy.c:2089
+#: ../libpurple/protocols/jabber/buddy.c:2090
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2091
+#: ../libpurple/protocols/jabber/buddy.c:2092
 #: ../libpurple/protocols/jabber/jabber.c:1665
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5937
-#: ../libpurple/protocols/sametime/sametime.c:3348
+#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/sametime/sametime.c:3349
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2258
+#: ../libpurple/protocols/jabber/buddy.c:2259
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2262
-#: ../libpurple/protocols/jabber/buddy.c:2451
-#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/jabber/buddy.c:2263
+#: ../libpurple/protocols/jabber/buddy.c:2452
+#: ../libpurple/protocols/oscar/oscar.c:3750
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:2294
+#: ../libpurple/protocols/jabber/buddy.c:2295
 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
-#: ../libpurple/protocols/jabber/buddy.c:2379
+#: ../libpurple/protocols/jabber/buddy.c:2380
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5609,70 +5646,70 @@ 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."
 
-#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/jabber/buddy.c:2400
 msgid "Directory Query Failed"
 msgstr "FallÃ³ la consulta al directorio"
 
-#: ../libpurple/protocols/jabber/buddy.c:2400
+#: ../libpurple/protocols/jabber/buddy.c:2401
 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[])
-#: ../libpurple/protocols/jabber/buddy.c:2434
+#: ../libpurple/protocols/jabber/buddy.c:2435
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2441
+#: ../libpurple/protocols/jabber/buddy.c:2442
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Rellene uno o mÃ¡s de los campos mostrados a continuaciÃ³n para buscar a un "
 "usuario XMPP cuyos datos coincidan."
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3761
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3762
 msgid "E-Mail Address"
 msgstr "DirecciÃ³n de correo electrÃ³nico"
 
-#: ../libpurple/protocols/jabber/buddy.c:2470
 #: ../libpurple/protocols/jabber/buddy.c:2471
+#: ../libpurple/protocols/jabber/buddy.c:2472
 msgid "Search for XMPP users"
 msgstr "Buscar un usuario XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2472
+#: ../libpurple/protocols/jabber/buddy.c:2473
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:177
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5666
+#: ../libpurple/protocols/sametime/sametime.c:5667
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2487
+#: ../libpurple/protocols/jabber/buddy.c:2488
 msgid "Invalid Directory"
 msgstr "Directorio invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/buddy.c:2504
+#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:2505
+#: ../libpurple/protocols/jabber/buddy.c:2506
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2508
+#: ../libpurple/protocols/jabber/buddy.c:2509
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5417
+#: ../libpurple/protocols/oscar/oscar.c:5403
 #: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Sala:"
@@ -5685,81 +5722,81 @@ msgstr "_Manipulador:"
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
+#: ../libpurple/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no es un nombre de sala vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/chat.c:224
+#: ../libpurple/protocols/jabber/chat.c:227
 msgid "Invalid Room Name"
 msgstr "Nombre de sala invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/chat.c:229
+#: ../libpurple/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no es un nombre de servidor vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:234
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/chat.c:235
+#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no es un indicador de sala vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Room Handle"
 msgstr "Indicador de sala invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/chat.c:396
+#: ../libpurple/protocols/jabber/chat.c:401
 msgid "Configuration error"
 msgstr "Error de configuraciÃ³n"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
+#: ../libpurple/protocols/jabber/chat.c:410
+#: ../libpurple/protocols/jabber/chat.c:553
 msgid "Unable to configure"
 msgstr "No se pudo configurar"
 
-#: ../libpurple/protocols/jabber/chat.c:420
+#: ../libpurple/protocols/jabber/chat.c:425
 msgid "Room Configuration Error"
 msgstr "Error de configuraciÃ³n de sala"
 
-#: ../libpurple/protocols/jabber/chat.c:421
+#: ../libpurple/protocols/jabber/chat.c:426
 msgid "This room is not capable of being configured"
 msgstr "Esta sala no es capaz de ser configurada"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
+#: ../libpurple/protocols/jabber/chat.c:475
+#: ../libpurple/protocols/jabber/chat.c:544
 msgid "Registration error"
 msgstr "Error de registro"
 
-#: ../libpurple/protocols/jabber/chat.c:627
+#: ../libpurple/protocols/jabber/chat.c:632
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "El cambio de apodo no estÃ¡ soportado en salas de chat no-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1475
+#: ../libpurple/protocols/jabber/chat.c:683
+#: ../libpurple/protocols/jabber/chat.c:694
+#: ../libpurple/protocols/silc/ops.c:1473
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
 
-#: ../libpurple/protocols/jabber/chat.c:737
+#: ../libpurple/protocols/jabber/chat.c:742
 msgid "Invalid Server"
 msgstr "Nombre de servidor no vÃ¡lido"
 
-#: ../libpurple/protocols/jabber/chat.c:781
+#: ../libpurple/protocols/jabber/chat.c:786
 msgid "Enter a Conference Server"
 msgstr "Introducir un servidor de conferencias"
 
-#: ../libpurple/protocols/jabber/chat.c:782
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Select a conference server to query"
 msgstr "Selecciona un servidor de conferencias al que consultar"
 
-#: ../libpurple/protocols/jabber/chat.c:785
+#: ../libpurple/protocols/jabber/chat.c:790
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
@@ -5783,7 +5820,7 @@ msgstr "Error de lectura"
 msgstr "Error de lectura"
 
 #: ../libpurple/protocols/jabber/jabber.c:528
-#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/oscar/flap_connection.c:403
 #: ../libpurple/protocols/yahoo/yahoo.c:2594
 #: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
@@ -5848,8 +5885,8 @@ msgstr "Ya estÃ¡ registrado"
 msgstr "Ya estÃ¡ registrado"
 
 #: ../libpurple/protocols/jabber/jabber.c:1022
-#: ../libpurple/protocols/oscar/oscar.c:3837
-#: ../libpurple/protocols/oscar/oscar.c:3850
+#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3842
 msgid "State"
 msgstr "Estado"
 
@@ -5858,9 +5895,9 @@ msgstr "CÃ³digo postal"
 msgstr "CÃ³digo postal"
 
 #: ../libpurple/protocols/jabber/jabber.c:1030
-#: ../libpurple/protocols/silc/ops.c:1050
-#: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:567
+#: ../libpurple/protocols/silc/ops.c:1049
+#: ../libpurple/protocols/silc/silc.c:988
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:557
@@ -5945,7 +5982,7 @@ msgstr "Reinicializando flujo"
 #: ../libpurple/protocols/jabber/jabber.c:1963
 #: ../libpurple/protocols/jabber/jabber.c:2001
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/oscar/oscar.c:5717
 msgid "Not Authorized"
 msgstr "No autorizado"
 
@@ -5986,9 +6023,9 @@ msgstr "SubscripciÃ³n"
 #: ../libpurple/protocols/jabber/jabber.c:1640
 #: ../libpurple/protocols/jabber/jabber.c:1654
 #: ../libpurple/protocols/jabber/jabber.c:1668
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:181
 #: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1227
+#: ../libpurple/protocols/silc/ops.c:1225
 #: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
@@ -6078,16 +6115,16 @@ msgstr "Por favor, indique su nueva cont
 msgstr "Por favor, indique su nueva contraseÃ±a"
 
 #: ../libpurple/protocols/jabber/jabber.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:6518
-#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/oscar/oscar.c:6504
+#: ../libpurple/protocols/silc/silc.c:1309
 #: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Establecer su informaciÃ³n de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:6529
-#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/oscar/oscar.c:6515
+#: ../libpurple/protocols/silc/silc.c:1305
 #: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Cambiar su contraseÃ±a..."
@@ -6352,19 +6389,19 @@ msgstr ""
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #: ../libpurple/protocols/jabber/jabber.c:2318
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "Buzz"
 msgstr "Codazo"
 
 #: ../libpurple/protocols/jabber/jabber.c:2319
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4164
+#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "Â¡%s le ha dado un codazo!"
 
 #: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/yahoo/yahoo.c:4164
+#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Dando un codazo a %s..."
@@ -6390,8 +6427,8 @@ msgstr "topic [nuevo tema]:  Mostrar o c
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
 #: ../libpurple/protocols/jabber/jabber.c:2380
-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."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;usuario&gt; [razÃ³n]:  Echar a un usuario de la sala."
 
 #: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
@@ -6414,13 +6451,12 @@ msgstr "invite &lt;usuario&gt; [mensaje]
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
 
 #: ../libpurple/protocols/jabber/jabber.c:2404
-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."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;sala&gt; [contraseÃ±a]:  Unirse a una sala en el servidor indicado."
 
 #: ../libpurple/protocols/jabber/jabber.c:2410
-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."
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;usuario&gt; [razÃ³n]:  Echar a un usuario de la sala."
 
 #: ../libpurple/protocols/jabber/jabber.c:2415
 msgid ""
@@ -6434,7 +6470,7 @@ msgstr ""
 "ping &lt;jid&gt;:       Hacer un ping a un usuario, componente o servidor."
 
 #: ../libpurple/protocols/jabber/jabber.c:2426
-#: ../libpurple/protocols/yahoo/yahoo.c:4187
+#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atenciÃ³n"
 
@@ -6470,12 +6506,8 @@ msgstr "Permitir autenticaciÃ³n en claro
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticaciÃ³n en claro sobre canales no cifrados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:229
-msgid "Use GSSAPI (Kerberos v5) for authentication"
-msgstr "Usar GSSAPI (Kerberos v5) en la autenticaciÃ³n"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:235
-#: ../libpurple/protocols/myspace/myspace.c:3468
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3475
 #: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Puerto de conexiÃ³n"
@@ -6483,14 +6515,14 @@ msgstr "Puerto de conexiÃ³n"
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:239
-#: ../libpurple/protocols/myspace/myspace.c:3465
-#: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3472
+#: ../libpurple/protocols/silc/silc.c:2139
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:811
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:244
+#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "Pasarelas de transferencia de archivos"
 
@@ -6532,16 +6564,16 @@ msgstr "Error de tratamiento XML"
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:441
+#: ../libpurple/protocols/jabber/presence.c:453
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../libpurple/protocols/jabber/presence.c:522
-#: ../libpurple/protocols/jabber/presence.c:523
+#: ../libpurple/protocols/jabber/presence.c:534
+#: ../libpurple/protocols/jabber/presence.c:535
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../libpurple/protocols/jabber/presence.c:524
+#: ../libpurple/protocols/jabber/presence.c:536
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6549,78 +6581,78 @@ msgstr ""
 "Va a crear una sala nueva. Â¿Desea configurarla o aceptar los valores por "
 "omisiÃ³n?"
 
-#: ../libpurple/protocols/jabber/presence.c:530
+#: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:531
+#: ../libpurple/protocols/jabber/presence.c:543
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisiÃ³n"
 
-#: ../libpurple/protocols/jabber/presence.c:573
+#: ../libpurple/protocols/jabber/presence.c:585
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:577
+#: ../libpurple/protocols/jabber/presence.c:589
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:1009
+#: ../libpurple/protocols/jabber/si.c:1013
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el archivo a %s, el usuario no soporta transferencias de "
 "archivos"
 
-#: ../libpurple/protocols/jabber/si.c:1010
-#: ../libpurple/protocols/jabber/si.c:1011
-#: ../libpurple/protocols/jabber/si.c:1080
+#: ../libpurple/protocols/jabber/si.c:1014
+#: ../libpurple/protocols/jabber/si.c:1015
+#: ../libpurple/protocols/jabber/si.c:1084
 msgid "File Send Failed"
 msgstr "Fallo en el envÃo del archivo"
 
-#: ../libpurple/protocols/jabber/si.c:1073
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "No se pudo enviar el archivo a %s, JID invÃ¡lido"
 
-#: ../libpurple/protocols/jabber/si.c:1075
+#: ../libpurple/protocols/jabber/si.c:1079
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "No se pudo enviar el archivo a %s, el usuario no estÃ¡ conectado"
 
-#: ../libpurple/protocols/jabber/si.c:1077
+#: ../libpurple/protocols/jabber/si.c:1081
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "No se pudo enviar el archivo a %s, no estÃ¡ suscrito a la presencia del "
 "usuario"
 
-#: ../libpurple/protocols/jabber/si.c:1092
+#: ../libpurple/protocols/jabber/si.c:1096
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Elija el recurso de %s al que quiera enviar un archivo"
 
-#: ../libpurple/protocols/jabber/si.c:1108
+#: ../libpurple/protocols/jabber/si.c:1112
 msgid "Select a Resource"
 msgstr "Seleccione un recurso"
 
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
+#: ../libpurple/protocols/jabber/usermood.c:194
+#: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
 msgstr "Editar estados de Ã¡nimo del usuario"
 
-#: ../libpurple/protocols/jabber/usermood.c:199
+#: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
 msgstr "Escoja un estado de Ã¡nimo de la lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:201
+#: ../libpurple/protocols/jabber/usermood.c:198
 #: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Configurar"
 
-#: ../libpurple/protocols/jabber/usermood.c:209
+#: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
 msgstr "Fijar estado de Ã¡nimo..."
 
@@ -6652,7 +6684,7 @@ msgstr "Seleccione una acciÃ³n"
 msgid "Select an action"
 msgstr "Seleccione una acciÃ³n"
 
-#: ../libpurple/protocols/msn/contact.c:776
+#: ../libpurple/protocols/msn/contact.c:782
 msgid "Unable to retrieve MSN Address Book"
 msgstr "No se pudo obtener el libro de direcciones de MSN"
 
@@ -6714,7 +6746,7 @@ msgstr "Ya estÃ¡ conectado"
 
 #: ../libpurple/protocols/msn/error.c:59
 #: ../libpurple/protocols/msnp9/error.c:59
-msgid "Invalid screen name"
+msgid "Invalid username"
 msgstr "Nombre de usuario no vÃ¡lido"
 
 #: ../libpurple/protocols/msn/error.c:62
@@ -7059,7 +7091,7 @@ msgstr "NÃºmero de telÃ©fono mÃ³vil"
 #: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
 #: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
@@ -7073,19 +7105,19 @@ msgstr "Vuelvo enseguida"
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
 #: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "Busy"
 msgstr "Ocupado"
 
 #: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
 #: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:3842
 msgid "On the Phone"
 msgstr "Al telÃ©fono"
 
 #: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
 #: ../libpurple/protocols/yahoo/yahoo.c:3148
-#: ../libpurple/protocols/yahoo/yahoo.c:3844
+#: ../libpurple/protocols/yahoo/yahoo.c:3848
 msgid "Out to Lunch"
 msgstr "SalÃ a comer"
 
@@ -7167,7 +7199,7 @@ msgstr "General"
 #: ../libpurple/protocols/msn/msn.c:1758
 #: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
@@ -7294,7 +7326,7 @@ msgstr "TelÃ©fono de casa (2)"
 
 #: ../libpurple/protocols/msn/msn.c:1823
 #: ../libpurple/protocols/msnp9/msn.c:1664
-#: ../libpurple/protocols/oscar/oscar.c:3840
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Home Address"
 msgstr "Domicilio"
 
@@ -7332,14 +7364,14 @@ msgstr "Trabajo"
 # Prefiero esto a "TÃtulo laboral" que puede ser ambiguo, jfs
 #: ../libpurple/protocols/msn/msn.c:1847
 #: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/silc/ops.c:1025
+#: ../libpurple/protocols/silc/ops.c:1024
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
 #: ../libpurple/protocols/msn/msn.c:1848
 #: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/oscar/oscar.c:3861
+#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Company"
 msgstr "CompaÃ±Ãa"
 
@@ -7366,7 +7398,7 @@ msgstr "TelÃ©fono del trabajo (2)"
 
 #: ../libpurple/protocols/msn/msn.c:1853
 #: ../libpurple/protocols/msnp9/msn.c:1694
-#: ../libpurple/protocols/oscar/oscar.c:3853
+#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Work Address"
 msgstr "DirecciÃ³n del trabajo"
 
@@ -7418,7 +7450,7 @@ msgstr "Actualizado por Ãºltima vez"
 #: ../libpurple/protocols/msn/msn.c:2005
 #: ../libpurple/protocols/msnp9/msn.c:1846
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/ops.c:1040
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "PÃ¡gina personal"
@@ -7488,12 +7520,12 @@ msgstr "nudge: Avisar a un contacto para
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atenciÃ³n"
 
-#: ../libpurple/protocols/msn/nexus.c:70
+#: ../libpurple/protocols/msn/nexus.c:71
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "AutenticaciÃ³n Windows Live ID: No fue posible conectarse"
 
 #. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:126
+#: ../libpurple/protocols/msn/nexus.c:124
 msgid ""
 "Windows Live ID authentication: cannot find authenticate token in server "
 "response"
@@ -7501,7 +7533,7 @@ msgstr ""
 "AutenticaciÃ³n Windows Live ID: no se encontrÃ³ el token de autenticaciÃ³n en "
 "la respuesta del servidor"
 
-#: ../libpurple/protocols/msn/nexus.c:172
+#: ../libpurple/protocols/msn/nexus.c:171
 msgid "Windows Live ID authentication Failed"
 msgstr "Â¡FallÃ³ la autenticaciÃ³n Windows Live!"
 
@@ -7512,7 +7544,7 @@ msgstr "%s no es un nombre de grupo vÃ¡l
 msgstr "%s no es un nombre de grupo vÃ¡lido."
 
 #: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/notification.c:935
 #: ../libpurple/protocols/msn/session.c:387
 #: ../libpurple/protocols/msnp9/notification.c:184
 #: ../libpurple/protocols/msnp9/notification.c:534
@@ -7526,67 +7558,67 @@ msgstr "%s en %s (%s)"
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:509
+#: ../libpurple/protocols/msn/notification.c:513
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Â¡%s le acaba de dar un codazo!"
 
-#: ../libpurple/protocols/msn/notification.c:836
+#: ../libpurple/protocols/msn/notification.c:840
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Error desconocido (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4480
+#: ../libpurple/protocols/msn/notification.c:841
+#: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "No puede aÃ±adir al usuario"
 
-#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msn/notification.c:901
 #: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "No se pudo aÃ±adir al usuario a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msn/notification.c:905
 #: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "No puede expulsar al usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msn/notification.c:909
 #: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "No se pudo invitar al usuario a %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msn/notification.c:917
 #: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "No se pudo aÃ±adir a %s porque su lista de amigos estÃ¡ llena."
 
-#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msn/notification.c:926
 #: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s no es un nombre de cuenta Â«passportÂ» vÃ¡lida."
 
-#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msn/notification.c:931
 #: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Servicio no disponible temporalmente."
 
-#: ../libpurple/protocols/msn/notification.c:1328
+#: ../libpurple/protocols/msn/notification.c:1336
 #: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "No se pudo cambiar el nombre del grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1383
+#: ../libpurple/protocols/msn/notification.c:1391
 #: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1997
+#: ../libpurple/protocols/msn/notification.c:2008
 #: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
@@ -7634,7 +7666,7 @@ msgstr[1] ""
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:272
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:307
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 #: ../libpurple/protocols/yahoo/yahoochat.c:1425
 #: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
@@ -7672,7 +7704,7 @@ msgstr "Error en el anÃ¡lisis HTTP."
 
 #: ../libpurple/protocols/msn/session.c:358
 #: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicaciÃ³n."
@@ -7710,6 +7742,11 @@ msgstr "NegociaciÃ³n"
 msgid "Handshaking"
 msgstr "NegociaciÃ³n"
 
+#: ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
+msgid "Transferring"
+msgstr "Transfiriendo"
+
 #: ../libpurple/protocols/msn/session.c:406
 #: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
@@ -7746,34 +7783,34 @@ msgstr "SalÃ a comer"
 msgstr "SalÃ a comer"
 
 #: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
+#: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente no se pudo enviar el mensaje porque expirÃ³ la conexiÃ³n:"
 
 #: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
+#: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "No se pudo enviar el mensaje, no estÃ¡ permitido mientras sea invisible:"
 
 #: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
+#: ../libpurple/protocols/msnp9/switchboard.c:423
 msgid "Message could not be sent because the user is offline:"
 msgstr "No se pudo enviar el mensaje porque el usuario no estÃ¡ conectado:"
 
 #: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
+#: ../libpurple/protocols/msnp9/switchboard.c:427
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error en la conexiÃ³n:"
 
 #: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:428
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "No se pudo enviar el mensaje porque estamos enviando demasiado rÃ¡pido:"
 
 #: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:432
+#: ../libpurple/protocols/msnp9/switchboard.c:435
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7783,14 +7820,14 @@ msgstr ""
 "intentarlo en unos minutos."
 
 #: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
+#: ../libpurple/protocols/msnp9/switchboard.c:442
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error con el Â«switchboardÂ»:"
 
 #: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:447
+#: ../libpurple/protocols/msnp9/switchboard.c:450
 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:"
 
@@ -7809,15 +7846,15 @@ msgstr "El usuario %s lo ha quitado de s
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:714
+#: ../libpurple/protocols/msn/userlist.c:713
 #: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo aÃ±adir a \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:717
+#: ../libpurple/protocols/msn/userlist.c:716
 #: ../libpurple/protocols/msnp9/userlist.c:655
-msgid "The screen name specified is invalid."
+msgid "The username specified is invalid."
 msgstr "El nombre de usuario especificado no es vÃ¡lido."
 
 #: ../libpurple/protocols/msnp9/msn.c:546
@@ -7867,7 +7904,7 @@ msgstr "Accediendo"
 msgid "Logging in"
 msgstr "Accediendo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1324
+#: ../libpurple/protocols/myspace/myspace.c:1331
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
@@ -7875,127 +7912,131 @@ msgstr ""
 "segundos)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1367
+#: ../libpurple/protocols/myspace/myspace.c:1374
 msgid "New mail messages"
 msgstr "Mensajes de correo nuevos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1368
+#: ../libpurple/protocols/myspace/myspace.c:1375
 msgid "New blog comments"
 msgstr "Nuevos comentarios de bitÃ¡cora"
 
-#: ../libpurple/protocols/myspace/myspace.c:1369
+#: ../libpurple/protocols/myspace/myspace.c:1376
 msgid "New profile comments"
 msgstr "Nuevos comentarios de perfil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1370
+#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New friend requests!"
 msgstr "Â¡Nuevas solicitudes de amigos!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1371
+#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New picture comments"
 msgstr "Nuevos comentarios de fotos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1401
+#: ../libpurple/protocols/myspace/myspace.c:1408
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1587
+#: ../libpurple/protocols/myspace/myspace.c:1594
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - No se ha configurado un nombre de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:1588
+#: ../libpurple/protocols/myspace/myspace.c:1595
 msgid "You appear to have no MySpace username."
 msgstr "Parece que no tiene un nombre de usuario MySpace."
 
-#: ../libpurple/protocols/myspace/myspace.c:1589
+#: ../libpurple/protocols/myspace/myspace.c:1596
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "Â¿DeserÃa configurar uno ahora? (Aviso: Â¡NO PODRÃ CAMBIARLO!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1613
-#: ../libpurple/protocols/sametime/sametime.c:1547
+#: ../libpurple/protocols/myspace/myspace.c:1620
+#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/myspace/myspace.c:1848
+#: ../libpurple/protocols/myspace/myspace.c:1855
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Error de prÃ³tocolo, cÃ³digo %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1870
+#: ../libpurple/protocols/myspace/myspace.c:1877
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
 "of %d for MySpaceIM. Please shorten your password at http://profileedit."
 "myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
 "again."
-msgstr "%s, su contraseÃ±a es de %d caracteres, esto es mÃ¡s de la longitud mÃ¡xima esperada (%d) para MySpaceIM. Reduzca el tamaÃ±o de su contraseÃ±a en Â«http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePasswordÂ» e intÃ©ntelo de nuevo."
+msgstr ""
+"%s, su contraseÃ±a es de %d caracteres, esto es mÃ¡s de la longitud mÃ¡xima "
+"esperada (%d) para MySpaceIM. Reduzca el tamaÃ±o de su contraseÃ±a en Â«http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePasswordÂ» "
+"e intÃ©ntelo de nuevo."
 
-#: ../libpurple/protocols/myspace/myspace.c:1893
+#: ../libpurple/protocols/myspace/myspace.c:1900
 msgid "MySpaceIM Error"
 msgstr "Error MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:2071
-#: ../libpurple/protocols/myspace/myspace.c:2105
+#: ../libpurple/protocols/myspace/myspace.c:2078
+#: ../libpurple/protocols/myspace/myspace.c:2112
 msgid "Failed to add buddy"
 msgstr "No se pudo aÃ±adir al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2071
+#: ../libpurple/protocols/myspace/myspace.c:2078
 msgid "'addbuddy' command failed."
 msgstr "FallÃ³ la orden 'addbudy'."
 
-#: ../libpurple/protocols/myspace/myspace.c:2105
-#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2112
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "persist command failed"
 msgstr "FallÃ³ la orden 'persist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2210
+#: ../libpurple/protocols/myspace/myspace.c:2217
 #, c-format
 msgid "No such user: %s"
 msgstr "No existe el usuario: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2212
+#: ../libpurple/protocols/myspace/myspace.c:2219
 msgid "User lookup"
 msgstr "BÃºsqueda de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:2331
-#: ../libpurple/protocols/myspace/myspace.c:2350
-#: ../libpurple/protocols/myspace/myspace.c:2372
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2357
+#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "Failed to remove buddy"
 msgstr "No se pudo eliminar al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2338
 msgid "'delbuddy' command failed"
 msgstr "FallÃ³ la orden 'delbuddy'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2372
+#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "blocklist command failed"
 msgstr "FallÃ³ la orden 'blocklist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2486
+#: ../libpurple/protocols/myspace/myspace.c:2493
 msgid "Invalid input condition"
 msgstr "CondiciÃ³n de entrada invÃ¡lida"
 
-#: ../libpurple/protocols/myspace/myspace.c:2541
+#: ../libpurple/protocols/myspace/myspace.c:2548
 msgid "Read buffer full (2)"
 msgstr "Cola de lectura llena (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2584
+#: ../libpurple/protocols/myspace/myspace.c:2591
 msgid "Unparseable message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: ../libpurple/protocols/myspace/myspace.c:2655
+#: ../libpurple/protocols/myspace/myspace.c:2662
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "No se pudo conectar al servidor: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2833
+#: ../libpurple/protocols/myspace/myspace.c:2840
 msgid "IM Friends"
 msgstr "Amigos MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2933
+#: ../libpurple/protocols/myspace/myspace.c:2940
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -8004,59 +8045,59 @@ msgstr ""
 "Se aÃ±adiero o actualizaron %d amigos del servidor (incluyendo a los amigos "
 "que ya estaban en la lista del lado del servidor)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2934
+#: ../libpurple/protocols/myspace/myspace.c:2941
 msgid "Add contacts from server"
 msgstr "AÃ±adir contactos del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:2986
-#: ../libpurple/protocols/myspace/myspace.c:3050
+#: ../libpurple/protocols/myspace/myspace.c:2993
+#: ../libpurple/protocols/myspace/myspace.c:3057
 msgid "Add friends from MySpace.com"
 msgstr "AÃ±adir amigos de MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2987
+#: ../libpurple/protocols/myspace/myspace.c:2994
 msgid "Importing friends failed"
 msgstr "FallÃ³ la carga de los amigos"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3043
+#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Find people..."
 msgstr "Encontrar gente... "
 
-#: ../libpurple/protocols/myspace/myspace.c:3046
+#: ../libpurple/protocols/myspace/myspace.c:3053
 msgid "Change IM name..."
 msgstr "Cambiar mi nombre MI..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3347
+#: ../libpurple/protocols/myspace/myspace.c:3354
 msgid "myim URL handler"
 msgstr "gestor de URL myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3348
+#: ../libpurple/protocols/myspace/myspace.c:3355
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 "No se encontrÃ³ una cuenta de MySpaceIM que pueda utilizarse para abrir esta "
 "URL myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3349
+#: ../libpurple/protocols/myspace/myspace.c:3356
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Activar la cuenta apropiada de MySpaceIM y volver a intentarlo."
 
-#: ../libpurple/protocols/myspace/myspace.c:3472
+#: ../libpurple/protocols/myspace/myspace.c:3479
 msgid "Show display name in status text"
 msgstr "Mostrar el nombre visible en el texto de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3475
+#: ../libpurple/protocols/myspace/myspace.c:3482
 msgid "Show headline in status text"
 msgstr "Mostrar titulares en los textos de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3480
+#: ../libpurple/protocols/myspace/myspace.c:3487
 msgid "Send emoticons"
 msgstr "Enviar emoticonos"
 
-#: ../libpurple/protocols/myspace/myspace.c:3485
+#: ../libpurple/protocols/myspace/myspace.c:3492
 msgid "Screen resolution (dots per inch)"
 msgstr "ResoluciÃ³n de pantalla (puntos por pulgada)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3488
+#: ../libpurple/protocols/myspace/myspace.c:3495
 msgid "Base font size (points)"
 msgstr "TamaÃ±o de tipografÃa base (puntos)"
 
@@ -8067,7 +8108,7 @@ msgstr "Usuario"
 msgstr "Usuario"
 
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3032
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Profile"
 msgstr "Perfil"
 
@@ -8362,12 +8403,12 @@ msgstr "El archivo maestro no estÃ¡ bien
 msgstr "El archivo maestro no estÃ¡ bien configurado"
 
 #: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr "Nombre de cuenta o contraseÃ±a incorrecta"
+msgid "Incorrect username or password"
+msgstr "Nombre de usuario o contraseÃ±a incorrecta"
 
 #: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
-msgstr "No se reconociÃ³ el servidor del usuario que introdujo"
+msgid "Could not recognize the host of the username you entered"
+msgstr "No se reconociÃ³ el servidor del nombre de usuario que introdujo"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
@@ -8386,7 +8427,7 @@ msgstr "AlcanzÃ³ el lÃmite del nÃºmero 
 msgstr "AlcanzÃ³ el lÃmite del nÃºmero de contactos permitidos"
 
 #: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
+msgid "You have entered an incorrect username"
 msgstr "El nombre de usuario que ha introducido no es vÃ¡lido"
 
 #: ../libpurple/protocols/novell/nmuser.c:1941
@@ -8531,7 +8572,7 @@ msgstr "BuzÃ³n de correo"
 msgstr "BuzÃ³n de correo"
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:4178
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -8646,7 +8687,7 @@ msgstr "Nombre de sala de chat invÃ¡lida
 msgid "Invalid chat room name"
 msgstr "Nombre de sala de chat invÃ¡lida"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/oscar/flap_connection.c:396
 #: ../libpurple/protocols/yahoo/yahoo.c:2505
 #: ../libpurple/protocols/yahoo/yahoo.c:2673
 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
@@ -8655,7 +8696,7 @@ msgstr "El servidor ha cerrado la conexi
 msgid "Server closed the connection."
 msgstr "El servidor ha cerrado la conexiÃ³n."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/oscar/flap_connection.c:398
 #: ../libpurple/protocols/yahoo/yahoo.c:2498
 #: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
 #: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
@@ -8668,7 +8709,7 @@ msgstr ""
 "Se perdiÃ³ la conexiÃ³n con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/oscar/flap_connection.c:401
 #: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
 #: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
 #: ../libpurple/proxy.c:1554
@@ -8706,7 +8747,7 @@ msgstr "Complemento de protocolo ICQ"
 msgstr "Complemento de protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4452
+#: ../libpurple/protocols/yahoo/yahoo.c:4456
 #: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "CodificaciÃ³n"
@@ -8870,8 +8911,8 @@ msgstr ""
 "defectuosa.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2444
-#: ../pidgin/gtkutils.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2446
+#: ../pidgin/gtkutils.c:2476
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
@@ -8885,7 +8926,7 @@ msgstr "MI Directo AIM"
 msgstr "MI Directo AIM"
 
 #: ../libpurple/protocols/oscar/oscar.c:652
-#: ../libpurple/protocols/oscar/oscar.c:6139
+#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "Get File"
 msgstr "Recibir archivo"
 
@@ -8958,17 +8999,17 @@ msgstr "CÃ¡mara"
 msgstr "CÃ¡mara"
 
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5895
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5944
+#: ../libpurple/protocols/oscar/oscar.c:5930
 msgid "Not Available"
 msgstr "No disponible"
 
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5916
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -8978,19 +9019,19 @@ msgstr "Capacidad web"
 
 #: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
+#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1089
 msgid "Invisible"
 msgstr "Invisible"
 
 #: ../libpurple/protocols/oscar/oscar.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3754
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
+#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1210
 msgid "IP Address"
 msgstr "DirecciÃ³n IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:846
-#: ../libpurple/protocols/oscar/oscar.c:2959
+#: ../libpurple/protocols/oscar/oscar.c:2947
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
@@ -9035,10 +9076,15 @@ msgid ""
 "Unable to login: Could not sign on as %s because the username is invalid.  "
 "Usernames must be a valid email address, or start with a letter and contain "
 "only letters, numbers and spaces, or contain only numbers."
-msgstr "Incapaz de registrarse: No pudo conectarse como %s porque el nombre de usuario no es vÃ¡lido. Los nombres de usuario deben ser direcciones de correo vÃ¡lidas, o empezar con una letra y sÃ³lo pueden contener letras, nÃºmeros y espacios, o contener sÃ³lo nÃºmeros."
+msgstr ""
+"Incapaz de registrarse: No pudo conectarse como %s porque el nombre de "
+"usuario no es vÃ¡lido. Los nombres de usuario deben ser direcciones de correo "
+"vÃ¡lidas, o empezar con una letra y sÃ³lo pueden contener letras, nÃºmeros y "
+"espacios, o contener sÃ³lo nÃºmeros."
 
 #. Unregistered screen name
 #: ../libpurple/protocols/oscar/oscar.c:1392
+#: ../libpurple/protocols/yahoo/yahoo.c:2127
 msgid "Invalid username."
 msgstr "Nombre de usuario no vÃ¡lido."
 
@@ -9104,10 +9150,10 @@ msgstr "Introduzca el dÃgito de seis nÃ
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:2300
-#: ../libpurple/protocols/oscar/oscar.c:2349
-#: ../libpurple/protocols/oscar/oscar.c:6014
-#: ../libpurple/protocols/oscar/oscar.c:6296 ../libpurple/request.h:1401
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2337
+#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6282 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -9143,31 +9189,31 @@ msgstr "No se pudo inicializar la conexi
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexiÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:2256
+#: ../libpurple/protocols/oscar/oscar.c:2258
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:2287
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorizaciÃ³n:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2299
+#: ../libpurple/protocols/oscar/oscar.c:2288
 msgid "Please authorize me!"
 msgstr "Â¡Por favor, autorÃceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2340
-#: ../libpurple/protocols/oscar/oscar.c:2348
-#: ../libpurple/protocols/oscar/oscar.c:2475
-#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/oscar/oscar.c:2328
+#: ../libpurple/protocols/oscar/oscar.c:2336
+#: ../libpurple/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:5372
 #: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "No se indicÃ³ una razÃ³n."
 
-#: ../libpurple/protocols/oscar/oscar.c:2347
+#: ../libpurple/protocols/oscar/oscar.c:2335
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorizaciÃ³n denegada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:2463
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9178,18 +9224,18 @@ msgstr ""
 "la siguiente razÃ³n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2464
 msgid "ICQ authorization denied."
 msgstr "AutorizaciÃ³n ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2483
+#: ../libpurple/protocols/oscar/oscar.c:2471
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2491
+#: ../libpurple/protocols/oscar/oscar.c:2479
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9202,7 +9248,7 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2499
+#: ../libpurple/protocols/oscar/oscar.c:2487
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9215,7 +9261,7 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2507
+#: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9228,38 +9274,38 @@ msgstr ""
 "El mensaje es:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2528
+#: ../libpurple/protocols/oscar/oscar.c:2516
 #, 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)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2534
+#: ../libpurple/protocols/oscar/oscar.c:2522
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Â¿Desea aÃ±adir este amigo a su lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2539 ../pidgin/gtkroomlist.c:320
+#: ../libpurple/protocols/oscar/oscar.c:2527 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_AÃ±adir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2540
+#: ../libpurple/protocols/oscar/oscar.c:2528
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2664
+#: ../libpurple/protocols/oscar/oscar.c:2652
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2673
+#: ../libpurple/protocols/oscar/oscar.c:2661
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2682
+#: ../libpurple/protocols/oscar/oscar.c:2670
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9269,21 +9315,21 @@ msgstr[1] ""
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rÃ¡pido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2691
+#: ../libpurple/protocols/oscar/oscar.c:2679
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:2688
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:2697
 #, 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."
@@ -9291,47 +9337,47 @@ msgstr[1] "Se perdieron %hu mensajes de 
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2852
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../libpurple/protocols/oscar/oscar.c:2869
-#: ../libpurple/protocols/oscar/oscar.c:2933
+#: ../libpurple/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Unknown reason."
 msgstr "RazÃ³n desconocida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/sametime/sametime.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2933
+#: ../libpurple/protocols/oscar/oscar.c:2921
 #, c-format
 msgid "User information not available: %s"
 msgstr "InformaciÃ³n de usuario de no disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/oscar/oscar.c:2957
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:3004
+#: ../libpurple/protocols/oscar/oscar.c:2992
 msgid "Available Message"
 msgstr "Mensajes disponibles"
 
-#: ../libpurple/protocols/oscar/oscar.c:3108
+#: ../libpurple/protocols/oscar/oscar.c:3096
 msgid "Your AIM connection may be lost."
 msgstr "Su conexiÃ³n AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3296
+#: ../libpurple/protocols/oscar/oscar.c:3284
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9339,7 +9385,7 @@ msgstr ""
 "[No se pudo mostrar un mensaje de este usuario porque contenÃa caracteres "
 "invÃ¡lidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3460
+#: ../libpurple/protocols/oscar/oscar.c:3448
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9348,74 +9394,74 @@ msgstr ""
 "lÃmite en la tasa de envÃo de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3545
+#: ../libpurple/protocols/oscar/oscar.c:3533
 #: ../libpurple/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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "TelÃ©fono mÃ³vil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3798
 msgid "Personal Web Page"
 msgstr "PÃ¡gina web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3822
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "InformaciÃ³n adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3838
-#: ../libpurple/protocols/oscar/oscar.c:3851
+#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3843
 msgid "Zip Code"
 msgstr "CÃ³digo postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3862
+#: ../libpurple/protocols/oscar/oscar.c:3854
 msgid "Division"
 msgstr "SecciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:3863
+#: ../libpurple/protocols/oscar/oscar.c:3855
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3865
+#: ../libpurple/protocols/oscar/oscar.c:3857
 msgid "Web Page"
 msgstr "PÃ¡gina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3868
+#: ../libpurple/protocols/oscar/oscar.c:3860
 msgid "Work Information"
 msgstr "InformaciÃ³n de trabajo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3916
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3964
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "El siguiente nombre de usuario estÃ¡ asociado a %s"
 msgstr[1] "Los nombres de usuarios siguientes estÃ¡n asociados a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No se encontraron resultados para la direcciÃ³n de correo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "DeberÃa recibir un mensaje solicitando confirmaciÃ³n de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4010
 msgid "Account Confirmation Requested"
 msgstr "ConfirmaciÃ³n de cuenta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:4051
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
@@ -9424,12 +9470,14 @@ msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4053
+#: ../libpurple/protocols/oscar/oscar.c:4045
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr "Error 0x%04x: No se puede dar formato al nombre de usuario porque no es vÃ¡lido."
+msgstr ""
+"Error 0x%04x: No se puede dar formato al nombre de usuario porque no es "
+"vÃ¡lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4055
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
@@ -9438,7 +9486,7 @@ msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4057
+#: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9447,7 +9495,7 @@ msgstr ""
 "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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4059
+#: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9456,7 +9504,7 @@ msgstr ""
 "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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4061
+#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9465,36 +9513,36 @@ msgstr ""
 "Error 0x%04x: No se puede cambiar la direcciÃ³n de correo electrÃ³nico porque "
 "la direcciÃ³n dada es invÃ¡lida."
 
-#: ../libpurple/protocols/oscar/oscar.c:4063
+#: ../libpurple/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4065
+#: ../libpurple/protocols/oscar/oscar.c:4057
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la informaciÃ³n de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4071
+#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La direcciÃ³n de correo electrÃ³nico para %s es %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4073
+#: ../libpurple/protocols/oscar/oscar.c:4065
 msgid "Account Info"
 msgstr "InformaciÃ³n de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4259
+#: ../libpurple/protocols/oscar/oscar.c:4251
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4530
+#: ../libpurple/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4531
+#: ../libpurple/protocols/oscar/oscar.c:4523
 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 "
@@ -9504,7 +9552,7 @@ msgstr ""
 "conexiÃ³n se haya completado.  Su perfil quedarÃ¡ sin cambiar, intÃ©ntelo "
 "nuevamente cuando ya estÃ© conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:4537
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9517,11 +9565,11 @@ msgstr[1] ""
 msgstr[1] ""
 "Se ha excedido el tamaÃ±o mÃ¡ximo de perfil de %d bytes. Se ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4550
+#: ../libpurple/protocols/oscar/oscar.c:4542
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4594
+#: ../libpurple/protocols/oscar/oscar.c:4586
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9536,11 +9584,11 @@ msgstr[1] ""
 "Se excediÃ³ el lÃmite de %d bytes de longitud en el mensaje de ausencia. Se "
 "ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4599
+#: ../libpurple/protocols/oscar/oscar.c:4591
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../libpurple/protocols/oscar/oscar.c:4672
+#: ../libpurple/protocols/oscar/oscar.c:4664
 #, c-format
 msgid ""
 "Could not add the buddy %s because the username is invalid.  Usernames must "
@@ -9551,17 +9599,17 @@ msgstr ""
 "nombres de usuario deben ser direcciones de correo vÃ¡lidas o empezar con una "
 "letra y contener sÃ³lo letras, nÃºmeros y espacios, o contener sÃ³lo nÃºmeros."
 
-#: ../libpurple/protocols/oscar/oscar.c:4674
-#: ../libpurple/protocols/oscar/oscar.c:5155
-#: ../libpurple/protocols/oscar/oscar.c:5170
+#: ../libpurple/protocols/oscar/oscar.c:4666
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5156
 msgid "Unable To Add"
 msgstr "No se pudo aÃ±adir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4793
+#: ../libpurple/protocols/oscar/oscar.c:4785
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4794
+#: ../libpurple/protocols/oscar/oscar.c:4786
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -9570,15 +9618,15 @@ msgstr ""
 "perdido la lista de amigos, seguramente volverÃ¡ a estar disponible en unos "
 "minutos."
 
-#: ../libpurple/protocols/oscar/oscar.c:4996
-#: ../libpurple/protocols/oscar/oscar.c:4998
-#: ../libpurple/protocols/oscar/oscar.c:5237
-#: ../libpurple/protocols/oscar/oscar.c:5238
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:4982
+#: ../libpurple/protocols/oscar/oscar.c:4984
+#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5229
 msgid "Orphans"
 msgstr "HuÃ©rfanos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5139
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9587,42 +9635,40 @@ msgstr ""
 "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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5153
-#: ../libpurple/protocols/oscar/oscar.c:5168
+#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5154
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5167
+#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "No se pudo aÃ±adir al amigo %s por motivos desconocidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5301
+#: ../libpurple/protocols/oscar/oscar.c:5287
 #, c-format
 msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"El usuario %s le ha dado a usted permiso para aÃ±adirle a su lista de "
-"amigos.  Â¿Desea hacerlo?"
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr "El usuario %s le ha dado a usted permiso para aÃ±adirle a su lista de amigos. Â¿Desea aÃ±adirle?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5309
+#: ../libpurple/protocols/oscar/oscar.c:5295
 msgid "Authorization Given"
 msgstr "AutorizaciÃ³n otorgada"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5382
+#: ../libpurple/protocols/oscar/oscar.c:5368
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5383
+#: ../libpurple/protocols/oscar/oscar.c:5369
 msgid "Authorization Granted"
 msgstr "AutorizaciÃ³n aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/oscar/oscar.c:5372
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9633,48 +9679,48 @@ msgstr ""
 "la siguiente razÃ³n:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5387
+#: ../libpurple/protocols/oscar/oscar.c:5373
 msgid "Authorization Denied"
 msgstr "AutorizaciÃ³n denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5423
+#: ../libpurple/protocols/oscar/oscar.c:5409
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5536
+#: ../libpurple/protocols/oscar/oscar.c:5522
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5698
-#: ../libpurple/protocols/oscar/oscar.c:5703
+#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "Away Message"
 msgstr "Mensajes de ausencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5703
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5903
+#: ../libpurple/protocols/oscar/oscar.c:5889
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de mÃºsica de iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:6011
+#: ../libpurple/protocols/oscar/oscar.c:5997
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:6012
+#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6045
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6049
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9682,67 +9728,67 @@ msgstr ""
 "Puede considerarse como un riesgo a su privacidad  ya que hacer Ã©sto revela "
 "su direcciÃ³n IP. Â¿Quiere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6069
+#: ../libpurple/protocols/oscar/oscar.c:6055
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onectar"
 
 # TBD - comprobar si esto afecta al botÃ³n en pantalla
-#: ../libpurple/protocols/oscar/oscar.c:6104
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6096
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6118
+#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:6131
+#: ../libpurple/protocols/oscar/oscar.c:6117
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6153
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Re-request Authorization"
 msgstr "Solicitar autorizaciÃ³n otra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid "Require authorization"
 msgstr "Solicitar autorizaciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6201
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidad web (Â¡si activa esto harÃ¡ que recibe SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6220
+#: ../libpurple/protocols/oscar/oscar.c:6206
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6240
+#: ../libpurple/protocols/oscar/oscar.c:6226
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es invÃ¡lido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6241
+#: ../libpurple/protocols/oscar/oscar.c:6227
 msgid "Username 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:6294
+#: ../libpurple/protocols/oscar/oscar.c:6280
 msgid "Change Address To:"
 msgstr "Cambiar direcciÃ³n a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6326
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no estÃ¡ esperando autorizaciÃ³n</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorizaciÃ³n de los siguientes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6330
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9750,66 +9796,66 @@ msgstr ""
 "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.Â»"
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrÃ³nico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6348
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la direcciÃ³n correo electrÃ³nico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6363
+#: ../libpurple/protocols/oscar/oscar.c:6349
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:6366
+#: ../libpurple/protocols/oscar/oscar.c:6352
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6524
+#: ../libpurple/protocols/oscar/oscar.c:6510
 msgid "Set User Info (web)..."
 msgstr "Establecer su informaciÃ³n de usuario (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6535
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Change Password (web)"
 msgstr "Cambiar su contraseÃ±a (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6539
+#: ../libpurple/protocols/oscar/oscar.c:6525
 msgid "Configure IM Forwarding (web)"
 msgstr "Configurar reenvÃo de MI (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6549
+#: ../libpurple/protocols/oscar/oscar.c:6535
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6556
+#: ../libpurple/protocols/oscar/oscar.c:6542
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6560
+#: ../libpurple/protocols/oscar/oscar.c:6546
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6564
+#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar la direcciÃ³n de correo registrada actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6571
+#: ../libpurple/protocols/oscar/oscar.c:6557
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorizaciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/oscar/oscar.c:6563
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un amigo por correo electrÃ³nico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6582
+#: ../libpurple/protocols/oscar/oscar.c:6568
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a travÃ©s de su informaciÃ³n"
 
-#: ../libpurple/protocols/oscar/oscar.c:6770
+#: ../libpurple/protocols/oscar/oscar.c:6756
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -10309,7 +10355,7 @@ msgstr "No pudo conectarse"
 #: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
 #: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "No se pudo conectar."
@@ -10498,66 +10544,66 @@ msgstr "ConexiÃ³n cerrada (escribiendo)"
 msgid "Connection closed (writing)"
 msgstr "ConexiÃ³n cerrada (escribiendo)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>TÃtulo de grupo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1294
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Identificador de grupo Â«NotesÂ»:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1296
+#: ../libpurple/protocols/sametime/sametime.c:1297
 #, c-format
 msgid "Info for Group %s"
 msgstr "InformaciÃ³n sobre el grupo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1298
+#: ../libpurple/protocols/sametime/sametime.c:1299
 msgid "Notes Address Book Information"
 msgstr "InformaciÃ³n de la libreta de direcciones Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1330
+#: ../libpurple/protocols/sametime/sametime.c:1331
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo a la conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1340
+#: ../libpurple/protocols/sametime/sametime.c:1341
 msgid "Get Notes Address Book Info"
 msgstr "Obtener la informaciÃ³n de la libreta de direcciones Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1507
+#: ../libpurple/protocols/sametime/sametime.c:1508
 msgid "Sending Handshake"
 msgstr "Enviando negociaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1512
+#: ../libpurple/protocols/sametime/sametime.c:1513
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptaciÃ³n del saludo inicial"
 
-#: ../libpurple/protocols/sametime/sametime.c:1517
+#: ../libpurple/protocols/sametime/sametime.c:1518
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se aceptÃ³ el saludo inicial. Enviando la identificaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1522
+#: ../libpurple/protocols/sametime/sametime.c:1523
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptaciÃ³n de la identificaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1527
+#: ../libpurple/protocols/sametime/sametime.c:1528
 msgid "Login Redirected"
 msgstr "IdentificaciÃ³n redirigida"
 
-#: ../libpurple/protocols/sametime/sametime.c:1533
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Forcing Login"
 msgstr "Forzando la identificaciÃ³n"
 
-#: ../libpurple/protocols/sametime/sametime.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Login Acknowledged"
 msgstr "IdentificaciÃ³n aceptada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1542
+#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Starting Services"
 msgstr "Arrancando servicios"
 
-#: ../libpurple/protocols/sametime/sametime.c:1679
+#: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
@@ -10565,69 +10611,69 @@ msgstr ""
 "Un administrador de Â«SametimeÂ» ha enviado el siguiente anuncio en el "
 "servidor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1684
+#: ../libpurple/protocols/sametime/sametime.c:1685
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador Â«SametimeÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1737
+#: ../libpurple/protocols/sametime/sametime.c:1738
 msgid "Connection reset"
 msgstr "ConexiÃ³n rehusada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1749
+#: ../libpurple/protocols/sametime/sametime.c:1750
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Error al leer del socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1774
-#: ../libpurple/protocols/sametime/sametime.c:3781
+#: ../libpurple/protocols/sametime/sametime.c:1775
+#: ../libpurple/protocols/sametime/sametime.c:3782
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:1815
+#: ../libpurple/protocols/sametime/sametime.c:1816
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1989
+#: ../libpurple/protocols/sametime/sametime.c:1990
 msgid "Conference Closed"
 msgstr "Conferencia cerrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2454
+#: ../libpurple/protocols/sametime/sametime.c:2455
 msgid "Unable to send message: "
 msgstr "No se pudo enviar el mensaje:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3010
+#: ../libpurple/protocols/sametime/sametime.c:3011
 msgid "Place Closed"
 msgstr "Lugar cerrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3280
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Microphone"
 msgstr "MicrÃ³fono"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
+#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
+#: ../libpurple/protocols/sametime/sametime.c:3283
 msgid "Video Camera"
 msgstr "VÃdeo cÃ¡mara"
 
-#: ../libpurple/protocols/sametime/sametime.c:3320
-#: ../libpurple/protocols/sametime/sametime.c:4200
+#: ../libpurple/protocols/sametime/sametime.c:3321
+#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "Supports"
 msgstr "Soporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3325
-#: ../libpurple/protocols/sametime/sametime.c:4174
+#: ../libpurple/protocols/sametime/sametime.c:3326
+#: ../libpurple/protocols/sametime/sametime.c:4175
 msgid "External User"
 msgstr "Usuario externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3431
+#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
+#: ../libpurple/protocols/sametime/sametime.c:3433
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10636,27 +10682,27 @@ msgstr ""
 "Por favor ingrese tema para la nueva conferencia, y un mensaje de invitaciÃ³n "
 "que se enviarÃ¡ a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3436
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
 msgstr "Nueva conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3438
+#: ../libpurple/protocols/sametime/sametime.c:3439
 msgid "Create"
 msgstr "Crear"
 
-#: ../libpurple/protocols/sametime/sametime.c:3503
+#: ../libpurple/protocols/sametime/sametime.c:3504
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3509
+#: ../libpurple/protocols/sametime/sametime.c:3510
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3517
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3517
+#: ../libpurple/protocols/sametime/sametime.c:3518
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10667,27 +10713,27 @@ msgstr ""
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario tambiÃ©n."
 
-#: ../libpurple/protocols/sametime/sametime.c:3522
+#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
 msgstr "Invitar a conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3618
+#: ../libpurple/protocols/sametime/sametime.c:3619
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637 ../pidgin/gtkconv.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:3638 ../pidgin/gtkconv.c:4524
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3665
+#: ../libpurple/protocols/sametime/sametime.c:3666
 msgid "No Sametime Community Server specified"
 msgstr "No se ha especificado el servidor de comunidad Â«SametimeÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:3691
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10696,42 +10742,42 @@ msgstr ""
 "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."
 
-#: ../libpurple/protocols/sametime/sametime.c:3695
+#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "Meanwhile Connection Setup"
 msgstr "ConfiguraciÃ³n de la conexiÃ³n Â«MeanwhileÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3696
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad Â«SametimeÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3698
+#: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4190
+#: ../libpurple/protocols/sametime/sametime.c:4191
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4192
+#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
 msgstr "Ãšltimo cliente conocido:"
 
-#: ../libpurple/protocols/sametime/sametime.c:4356
-#: ../libpurple/protocols/sametime/sametime.c:5561
+#: ../libpurple/protocols/sametime/sametime.c:4357
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4359
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:4360
+#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4383
+#: ../libpurple/protocols/sametime/sametime.c:4384
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4384
+#: ../libpurple/protocols/sametime/sametime.c:4385
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10741,15 +10787,15 @@ msgstr ""
 "usuarios. Por favor seleccione el usuario de la lista mostrada para aÃ±adirlo "
 "a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4389
+#: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4473
+#: ../libpurple/protocols/sametime/sametime.c:4474
 msgid "Unable to add user: user not found"
 msgstr "No se pudo aÃ±adir al usuario: el usuario no se ha encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4475
+#: ../libpurple/protocols/sametime/sametime.c:4476
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10758,7 +10804,7 @@ msgstr ""
 "El identificador Â«%sÂ» no coincide con ningÃºn usuario en la comunidad "
 "Â«SametimeÂ». Se ha eliminado esta entrada de la lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5066
+#: ../libpurple/protocols/sametime/sametime.c:5067
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10767,65 +10813,65 @@ msgstr ""
 "Error al leer el archivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5201
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5207
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"
 
 # Usar empotrable? (jfs)
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5211
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5213
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5270
+#: ../libpurple/protocols/sametime/sametime.c:5271
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar la lista Â«SametimeÂ» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista Â«SametimeÂ» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5364
+#: ../libpurple/protocols/sametime/sametime.c:5365
 msgid "Unable to add group: group exists"
 msgstr "No se pudo aÃ±adir el grupo: el grupo ya existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5365
+#: ../libpurple/protocols/sametime/sametime.c:5366
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:5368
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:5369
+#: ../libpurple/protocols/sametime/sametime.c:5499
 msgid "Unable to add group"
 msgstr "No se pudo aÃ±adir el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5428
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Notes Address Book group results"
 msgstr ""
 "Resultados de las notas de los grupos de la libreta de direcciones Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5445
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10836,15 +10882,15 @@ msgstr ""
 "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."
 
-#: ../libpurple/protocols/sametime/sametime.c:5449
+#: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group not found"
 msgstr "No se pudo aÃ±adir el grupo: no se ha encontrado el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5494
+#: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10853,11 +10899,11 @@ msgstr ""
 "El identificador Â«%sÂ» no coincide con ninguno de los grupos de la libreta de "
 "direcciones Â«NotesÂ» en su comunidad Â«SametimeÂ»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5535
+#: ../libpurple/protocols/sametime/sametime.c:5536
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos Â«NotesÂ»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5536
+#: ../libpurple/protocols/sametime/sametime.c:5537
 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."
@@ -10866,12 +10912,12 @@ msgstr ""
 "campo a continuaciÃ³n para aÃ±adir al grupo y a sus miembros en su lista de "
 "amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5585
+#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la bÃºsqueda '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
+#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10882,30 +10928,30 @@ msgstr ""
 "a continuaciÃ³n. Puede aÃ±adir estos usuarios a su lista de amigos o enviarles "
 "mensajes con los botones de acciones mostrados abajo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5593 ../pidgin/gtknotify.c:770
+#: ../libpurple/protocols/sametime/sametime.c:5594 ../pidgin/gtknotify.c:794
 msgid "Search Results"
 msgstr "Resultados de la bÃºsqueda"
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5619
 msgid "No matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5620
 #, 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Â»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "No Matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5660
+#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid "Search for a user"
 msgstr "Buscar un usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5661
+#: ../libpurple/protocols/sametime/sametime.c:5662
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10913,32 +10959,32 @@ msgstr ""
 "Introduzca el nombre o identificador parcial en el campo mostrado a "
 "continuaciÃ³n para buscar usuarios coincidentes en su comunidad Â«SametimeÂ»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5664
+#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "User Search"
 msgstr "BÃºsqueda de usuarios"
 
-#: ../libpurple/protocols/sametime/sametime.c:5677
+#: ../libpurple/protocols/sametime/sametime.c:5678
 msgid "Import Sametime List..."
 msgstr "Importar la lista Â«SametimeÂ»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5681
+#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Export Sametime List..."
 msgstr "Exportar la lista Â«SametimeÂ»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5685
+#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Add Notes Address Book Group..."
 msgstr "AÃ±adir a la libreta de direcciones de grupos Â«NotesÂ»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5689
+#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "User Search..."
 msgstr "BÃºsqueda de los usuarios..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5795
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexiÃ³n (ignorar redirecciones del servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5805
+#: ../libpurple/protocols/sametime/sametime.c:5806
 msgid "Hide client identity"
 msgstr "Ocultar identidad de cliente"
 
@@ -11069,8 +11115,8 @@ msgstr "Establecer contraseÃ±a MI"
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1518
-#: ../libpurple/protocols/silc/ops.c:1529
+#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1527
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -11079,8 +11125,8 @@ msgstr "Obtener clave pÃºblica"
 msgstr "Obtener clave pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1530
+#: ../libpurple/protocols/silc/ops.c:1517
+#: ../libpurple/protocols/silc/ops.c:1528
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -11096,7 +11142,7 @@ msgstr "Mostrar clave pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:623
 #: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/buddy.c:636
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
@@ -11104,11 +11150,11 @@ msgstr "No se pudo cargar la clave pÃºbl
 msgstr "No se pudo cargar la clave pÃºblica"
 
 #: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1068
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1305
-#: ../libpurple/protocols/silc/ops.c:1306
-#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc/ops.c:1066
+#: ../libpurple/protocols/silc/ops.c:1181
+#: ../libpurple/protocols/silc/ops.c:1303
+#: ../libpurple/protocols/silc/ops.c:1304
+#: ../libpurple/protocols/silc/ops.c:1322
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -11119,8 +11165,8 @@ msgstr "InformaciÃ³n de usuario"
 msgstr "InformaciÃ³n de usuario"
 
 #: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1184
-#: ../libpurple/protocols/silc/ops.c:1325
+#: ../libpurple/protocols/silc/ops.c:1182
+#: ../libpurple/protocols/silc/ops.c:1323
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -11223,8 +11269,8 @@ msgstr "Robot"
 msgstr "Robot"
 
 #: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:525
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/util.c:522
 #: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:515
@@ -11232,8 +11278,8 @@ msgstr "Feliz"
 msgstr "Feliz"
 
 #: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:527
+#: ../libpurple/protocols/silc/silc.c:961
+#: ../libpurple/protocols/silc/util.c:524
 #: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:517
@@ -11241,8 +11287,8 @@ msgstr "Triste"
 msgstr "Triste"
 
 #: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:529
+#: ../libpurple/protocols/silc/silc.c:963
+#: ../libpurple/protocols/silc/util.c:526
 #: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:519
@@ -11250,8 +11296,8 @@ msgstr "Furioso"
 msgstr "Furioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:531
+#: ../libpurple/protocols/silc/silc.c:965
+#: ../libpurple/protocols/silc/util.c:528
 #: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:666
 #: ../libpurple/protocols/silc10/util.c:521
@@ -11259,8 +11305,8 @@ msgstr "Celoso"
 msgstr "Celoso"
 
 #: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:533
+#: ../libpurple/protocols/silc/silc.c:967
+#: ../libpurple/protocols/silc/util.c:530
 #: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:523
@@ -11268,8 +11314,8 @@ msgstr "Avergonzado"
 msgstr "Avergonzado"
 
 #: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:535
+#: ../libpurple/protocols/silc/silc.c:969
+#: ../libpurple/protocols/silc/util.c:532
 #: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:525
@@ -11277,15 +11323,15 @@ msgstr "Invencible"
 msgstr "Invencible"
 
 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:537
+#: ../libpurple/protocols/silc/util.c:534
 #: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Enamorado"
 
 #: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:539
+#: ../libpurple/protocols/silc/silc.c:973
+#: ../libpurple/protocols/silc/util.c:536
 #: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:529
@@ -11293,8 +11339,8 @@ msgstr "Dormido"
 msgstr "Dormido"
 
 #: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:541
+#: ../libpurple/protocols/silc/silc.c:975
+#: ../libpurple/protocols/silc/util.c:538
 #: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:676
 #: ../libpurple/protocols/silc10/util.c:531
@@ -11302,8 +11348,8 @@ msgstr "Aburrido"
 msgstr "Aburrido"
 
 #: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:543
+#: ../libpurple/protocols/silc/silc.c:977
+#: ../libpurple/protocols/silc/util.c:540
 #: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:678
 #: ../libpurple/protocols/silc10/util.c:533
@@ -11311,8 +11357,8 @@ msgstr "Excitado"
 msgstr "Excitado"
 
 #: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:545
+#: ../libpurple/protocols/silc/silc.c:979
+#: ../libpurple/protocols/silc/util.c:542
 #: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:680
 #: ../libpurple/protocols/silc10/util.c:535
@@ -11320,35 +11366,35 @@ msgstr "Ansioso"
 msgstr "Ansioso"
 
 #: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1222
+#: ../libpurple/protocols/silc/ops.c:1220
 #: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
 #: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1237
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
 #: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1242
 #: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
 #: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1247
 #: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
 #: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1254
+#: ../libpurple/protocols/silc/ops.c:1252
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:728
@@ -11357,7 +11403,7 @@ msgstr "Zona horaria"
 msgstr "Zona horaria"
 
 #: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1259
+#: ../libpurple/protocols/silc/ops.c:1257
 #: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
@@ -11384,14 +11430,14 @@ msgstr "Obtener clave pÃºblica..."
 msgstr "Obtener clave pÃºblica..."
 
 #: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1627
+#: ../libpurple/protocols/silc/ops.c:1625
 #: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Matar usuario"
 
 #: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc/chat.c:1000
 #: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
@@ -11409,7 +11455,7 @@ msgstr "No existe el canal %s en la red"
 msgstr "No existe el canal %s en la red"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
+#: ../libpurple/protocols/silc/chat.c:176
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -11474,28 +11520,28 @@ msgstr "<br><b>Huella Babble del fundado
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Huella Babble del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:238
+#: ../libpurple/protocols/silc/chat.c:237
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "AÃ±adir clave pÃºblica del canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
+#: ../libpurple/protocols/silc/chat.c:305
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave pÃºblica..."
 
-#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "ContraseÃ±a del canal"
 
-#: ../libpurple/protocols/silc/chat.c:432
+#: ../libpurple/protocols/silc/chat.c:431
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de claves pÃºblicas del canal"
 
-#: ../libpurple/protocols/silc/chat.c:437
+#: ../libpurple/protocols/silc/chat.c:436
 #: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
@@ -11510,11 +11556,11 @@ msgstr ""
 "conectarse los usuarios que estÃ©n en la lista de claves pÃºblicas si se "
 "utilizan claves pÃºblicas para el acceso."
 
+#: ../libpurple/protocols/silc/chat.c:445
 #: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
 #: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:934
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11523,28 +11569,28 @@ msgstr "AutenticaciÃ³n de canal"
 msgid "Channel Authentication"
 msgstr "AutenticaciÃ³n de canal"
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:484
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "AÃ±adir / Quitar"
 
-#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1163
+#: ../libpurple/protocols/silc/chat.c:604
+#: ../libpurple/protocols/silc/ops.c:1830
+#: ../libpurple/protocols/silc/silc.c:1236
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
 #: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "ContraseÃ±a"
 
-#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
@@ -11552,116 +11598,116 @@ msgstr ""
 "Por favor, indique el nombre del grupo de canales privados %s y una "
 "contraseÃ±a."
 
-#: ../libpurple/protocols/silc/chat.c:618
+#: ../libpurple/protocols/silc/chat.c:617
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "AÃ±adir grupo de canales privados"
 
-#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/chat.c:749
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "LÃmite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:747
+#: ../libpurple/protocols/silc/chat.c:750
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el lÃmite "
 "de usuarios."
 
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:914
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../libpurple/protocols/silc/chat.c:916
+#: ../libpurple/protocols/silc/chat.c:919
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: ../libpurple/protocols/silc/chat.c:924
+#: ../libpurple/protocols/silc/chat.c:927
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "AÃ±adir grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:937
+#: ../libpurple/protocols/silc/chat.c:940
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../libpurple/protocols/silc/chat.c:942
+#: ../libpurple/protocols/silc/chat.c:945
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Fijar permanente"
 
-#: ../libpurple/protocols/silc/chat.c:950
+#: ../libpurple/protocols/silc/chat.c:953
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Establecer lÃmite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:956
+#: ../libpurple/protocols/silc/chat.c:959
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: ../libpurple/protocols/silc/chat.c:961
+#: ../libpurple/protocols/silc/chat.c:964
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: ../libpurple/protocols/silc/chat.c:968
+#: ../libpurple/protocols/silc/chat.c:971
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:973
+#: ../libpurple/protocols/silc/chat.c:976
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:980
+#: ../libpurple/protocols/silc/chat.c:983
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:985
+#: ../libpurple/protocols/silc/chat.c:988
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1046
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1051
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1049
+#: ../libpurple/protocols/silc/chat.c:1052
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1360
+#: ../libpurple/protocols/silc/chat.c:1248
+#: ../libpurple/protocols/silc/silc.c:1433
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Orden de llamada"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1361
+#: ../libpurple/protocols/silc/chat.c:1248
+#: ../libpurple/protocols/silc/silc.c:1434
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: ../libpurple/protocols/silc/chat.c:1246
-#: ../libpurple/protocols/silc/silc.c:1362
+#: ../libpurple/protocols/silc/chat.c:1249
+#: ../libpurple/protocols/silc/silc.c:1435
 #: ../libpurple/protocols/silc10/chat.c:1300
 #: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
@@ -11807,153 +11853,153 @@ msgstr "Desconectado por el servidor"
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"
 
-#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc/ops.c:997
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "InformaciÃ³n personal"
 
-#: ../libpurple/protocols/silc/ops.c:1021
+#: ../libpurple/protocols/silc/ops.c:1020
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "CumpleaÃ±os"
 
-#: ../libpurple/protocols/silc/ops.c:1029
+#: ../libpurple/protocols/silc/ops.c:1028
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../libpurple/protocols/silc/ops.c:1033
-#: ../libpurple/protocols/silc/silc.c:1156
+#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/silc.c:1229
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "OrganizaciÃ³n"
 
-#: ../libpurple/protocols/silc/ops.c:1037
+#: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidad"
 
-#: ../libpurple/protocols/silc/ops.c:1061
+#: ../libpurple/protocols/silc/ops.c:1060
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1108
+#: ../libpurple/protocols/silc/ops.c:1106
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/silc/ops.c:1142
+#: ../libpurple/protocols/silc/ops.c:1140
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vd. es fundador del canal en <I>%s</I>."
 
-#: ../libpurple/protocols/silc/ops.c:1146
+#: ../libpurple/protocols/silc/ops.c:1144
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "El fundador del canal en <I>%s</I> es <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1205
-#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/ops.c:1203
+#: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "Nombre real"
 
-#: ../libpurple/protocols/silc/ops.c:1233
+#: ../libpurple/protocols/silc/ops.c:1231
 #: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1367
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Huella digital de la clave pÃºblica"
 
-#: ../libpurple/protocols/silc/ops.c:1296
-#: ../libpurple/protocols/silc/ops.c:1370
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1368
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Huella babble de la clave pÃºblica"
 
-#: ../libpurple/protocols/silc/ops.c:1309
+#: ../libpurple/protocols/silc/ops.c:1307
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_MÃ¡s..."
 
-#: ../libpurple/protocols/silc/ops.c:1388
-#: ../libpurple/protocols/silc/silc.c:1220
+#: ../libpurple/protocols/silc/ops.c:1386
+#: ../libpurple/protocols/silc/silc.c:1293
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1388
+#: ../libpurple/protocols/silc/ops.c:1386
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: ../libpurple/protocols/silc/ops.c:1408
+#: ../libpurple/protocols/silc/ops.c:1406
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: ../libpurple/protocols/silc/ops.c:1437
+#: ../libpurple/protocols/silc/ops.c:1435
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/silc/ops.c:1486
+#: ../libpurple/protocols/silc/ops.c:1484
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1486
+#: ../libpurple/protocols/silc/ops.c:1484
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "No se pudo obtener la lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1487
+#: ../libpurple/protocols/silc/ops.c:1485
 msgid "Network is empty"
 msgstr "La red estÃ¡ vacÃa"
 
-#: ../libpurple/protocols/silc/ops.c:1531
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "No se ha recibido una clave pÃºblica"
 
-#: ../libpurple/protocols/silc/ops.c:1543
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1541
+#: ../libpurple/protocols/silc/ops.c:1554
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "InformaciÃ³n del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1544
+#: ../libpurple/protocols/silc/ops.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la informaciÃ³n del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1567
+#: ../libpurple/protocols/silc/ops.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "EstadÃsticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1568
+#: ../libpurple/protocols/silc/ops.c:1566
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estadÃsticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1575
+#: ../libpurple/protocols/silc/ops.c:1573
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11989,54 +12035,54 @@ msgstr ""
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1607
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "EstadÃsticas de red"
 
-#: ../libpurple/protocols/silc/ops.c:1615
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "FallÃ³ el ping"
 
-#: ../libpurple/protocols/silc/ops.c:1620
+#: ../libpurple/protocols/silc/ops.c:1618
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Se recibiÃ³ una respuesta al ping del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1628
+#: ../libpurple/protocols/silc/ops.c:1626
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1667
+#: ../libpurple/protocols/silc/ops.c:1665
 msgid "WATCH"
 msgstr "AÃ‘ADIR"
 
-#: ../libpurple/protocols/silc/ops.c:1667
+#: ../libpurple/protocols/silc/ops.c:1665
 msgid "Cannot watch user"
 msgstr "No se puede aÃ±adir al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1743
-#: ../libpurple/protocols/silc/ops.c:1794
-#: ../libpurple/protocols/silc/silc.c:385
+#: ../libpurple/protocols/silc/ops.c:1741
+#: ../libpurple/protocols/silc/ops.c:1792
+#: ../libpurple/protocols/silc/silc.c:394
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Reanudando la sesiÃ³n"
 
-#: ../libpurple/protocols/silc/ops.c:1745
+#: ../libpurple/protocols/silc/ops.c:1743
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Autenticando la conexiÃ³n"
 
-#: ../libpurple/protocols/silc/ops.c:1796
+#: ../libpurple/protocols/silc/ops.c:1794
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pÃºblica del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1833
+#: ../libpurple/protocols/silc/ops.c:1831
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Se necesita una contraseÃ±a"
@@ -12111,58 +12157,60 @@ msgstr "FallÃ³ la conexiÃ³n"
 msgid "Connection failed"
 msgstr "FallÃ³ la conexiÃ³n"
 
-#: ../libpurple/protocols/silc/silc.c:388
+#: ../libpurple/protocols/silc/silc.c:397
 #: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Conectando con el servidor SILC"
+#: ../libpurple/protocols/silc/silc.c:449
+#: ../libpurple/protocols/silc10/silc.c:361
+msgid "Unable to create connection"
+msgstr "No se pudo crear la conexiÃ³n"
 
-#: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc/silc.c:492
+#: ../libpurple/protocols/silc/silc.c:508
+#: ../libpurple/protocols/silc/silc.c:537
 #: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "No se pudo cargar la clave pÃºblica SILC"
 
-#: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:361
-msgid "Unable to create connection"
-msgstr "No se pudo crear la conexiÃ³n"
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:522
+#: ../libpurple/protocols/silc10/silc.c:329
+msgid "Connecting to SILC Server"
+msgstr "Conectando con el servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:499
+#: ../libpurple/protocols/silc/silc.c:568
 #: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: ../libpurple/protocols/silc/silc.c:550
+#: ../libpurple/protocols/silc/silc.c:619
 #: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc/silc.c:632
 #: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Error al cargar el par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:882
+#: ../libpurple/protocols/silc/silc.c:955
 #: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "Su estado de Ã¡nimo actual"
 
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1795
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:898
+#: ../libpurple/protocols/silc/silc.c:971
 #: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/silc.c:909
+#: ../libpurple/protocols/silc/silc.c:982
 #: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
@@ -12171,62 +12219,62 @@ msgstr ""
 "\n"
 "Sus mÃ©todos de contacto preferidos"
 
-#: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:571
+#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:691
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:573
+#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:921
+#: ../libpurple/protocols/silc/silc.c:994
 #: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/silc/silc.c:999
 #: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/silc/silc.c:1006
 #: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Servicios en lÃnea"
 
-#: ../libpurple/protocols/silc/silc.c:936
+#: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten quÃ© servicios estÃ¡ utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten quÃ© ordenador estÃ¡ utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1022
 #: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:955
+#: ../libpurple/protocols/silc/silc.c:1028
 msgid "Timezone (UTC)"
 msgstr "Zona horaria (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/silc.c:960
+#: ../libpurple/protocols/silc/silc.c:1032
+#: ../libpurple/protocols/silc/silc.c:1033
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en lÃnea"
 
-#: ../libpurple/protocols/silc/silc.c:961
+#: ../libpurple/protocols/silc/silc.c:1034
 #: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -12237,31 +12285,31 @@ msgstr ""
 "lÃnea asÃ como su informaciÃ³n personal. Por favor, rellene la informaciÃ³n "
 "que desea que otros usuarios vean de vd."
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/silc.c:1629
+#: ../libpurple/protocols/silc/silc.c:1075
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc/silc.c:1702
 #: ../libpurple/protocols/silc10/silc.c:778
 #: ../libpurple/protocols/silc10/silc.c:784
 #: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Mensaje del dÃa"
 
-#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1075
 #: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del dÃa"
 
-#: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1076
+#: ../libpurple/protocols/silc/silc.c:1697
 #: ../libpurple/protocols/silc10/silc.c:779
 #: ../libpurple/protocols/silc10/silc.c:1416
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1171
-#: ../libpurple/protocols/silc/silc.c:1172
+#: ../libpurple/protocols/silc/silc.c:1127
+#: ../libpurple/protocols/silc/silc.c:1173
+#: ../libpurple/protocols/silc/silc.c:1244
+#: ../libpurple/protocols/silc/silc.c:1245
 #: ../libpurple/protocols/silc10/silc.c:830
 #: ../libpurple/protocols/silc10/silc.c:874
 #: ../libpurple/protocols/silc10/silc.c:945
@@ -12269,184 +12317,184 @@ msgstr "Crear nuevo par de claves SILC"
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1127
 #: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Las contraseÃ±as no coinciden."
 
-#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "FallÃ³ la generaciÃ³n de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1139
+#: ../libpurple/protocols/silc/silc.c:1212
 #: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Longitud de clave"
 
-#: ../libpurple/protocols/silc/silc.c:1141
+#: ../libpurple/protocols/silc/silc.c:1214
 #: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Fichero de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:1143
+#: ../libpurple/protocols/silc/silc.c:1216
 #: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1166
+#: ../libpurple/protocols/silc/silc.c:1239
 #: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "ContraseÃ±a (escribir de nuevo)"
 
-#: ../libpurple/protocols/silc/silc.c:1173
+#: ../libpurple/protocols/silc/silc.c:1246
 #: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc/silc.c:1289
 #: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Estado en lÃnea"
 
-#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc/silc.c:1297
 #: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del dÃa"
 
-#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc/silc.c:1301
 #: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc/silc.c:1393
 #: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "El usuario <I>%s</I> no estÃ¡ en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1573
 #: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc/silc.c:1654
 #: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc/silc.c:1756
 #: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1761
 #: ../libpurple/protocols/silc10/silc.c:1480
 #, 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.
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1763
 #: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no se han definido modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1776
 #: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "No se pudieron fijar los modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc/silc.c:1806
 #: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Orden desconocida: %s, (puede ser un error del cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc/silc.c:1869
 #: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc/silc.c:1873
 #: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc/silc.c:1877
 #: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuevo tema&gt;]:  Ver o cambiar el tema"
 
-#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc/silc.c:1882
 #: ../libpurple/protocols/silc10/silc.c:1601
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc/silc.c:1886
 #: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1890
 #: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar informaciÃ³n del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:1894
 #: ../libpurple/protocols/silc10/silc.c:1613
 #: ../libpurple/protocols/zephyr/zephyr.c:2700
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc/silc.c:1898
 #: ../libpurple/protocols/silc10/silc.c:1617
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc/silc.c:1902
 #: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar el mensaje del dÃa del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc/silc.c:1906
 #: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesiÃ³n"
 
-#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc/silc.c:1910
 #: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual opcionalmente indicando un "
 "mensaje"
 
-#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;orden&gt;:  Ejecutar una orden cualquiera del cliente SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc/silc.c:1920
 #: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|%lt;razÃ³n%gt;]:  Matar un alias"
 
-#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc/silc.c:1924
 #: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc/silc.c:1928
 #: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar informaciÃ³n del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1932
 #: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
@@ -12455,7 +12503,7 @@ msgstr ""
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1936
 #: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
@@ -12464,17 +12512,17 @@ msgstr ""
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1940
 #: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos_usuario&gt;:  Establecer sus modos en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc/silc.c:1944
 #: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
 
-#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc/silc.c:1948
 #: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
@@ -12483,46 +12531,46 @@ msgstr ""
 "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"
 
-#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc/silc.c:1952
 #: ../libpurple/protocols/silc10/silc.c:1671
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1956
 #: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1960
 #: ../libpurple/protocols/silc10/silc.c:1679
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:1964
 #: ../libpurple/protocols/silc10/silc.c:1683
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1968
 #: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadÃsticas del servidor y de la red"
 
-#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc/silc.c:1972
 #: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que estÃ¡ conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1977
 #: ../libpurple/protocols/silc10/silc.c:1696
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc/silc.c:1981
 #: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
@@ -12540,68 +12588,68 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc/silc.c:2092
 #: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc/silc.c:2094
 #: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
+#: ../libpurple/protocols/silc/silc.c:2135
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2150
 msgid "Network"
 msgstr "Red"
 
-#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc/silc.c:2146
 #: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Fichero de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc/silc.c:2150
 #: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc/silc.c:2160
 #: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc/silc.c:2170
 #: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
 #
-#: ../libpurple/protocols/silc/silc.c:2091
+#: ../libpurple/protocols/silc/silc.c:2173
 msgid "Use Perfect Forward Secrecy"
 msgstr "Utilizar Â«Confidencialidad directa perfectaÂ»"
 
-#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc/silc.c:2177
 #: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "AutenticaciÃ³n de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc/silc.c:2180
 #: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc/silc.c:2183
 #: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensajes a la pizarra"
 
-#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc/silc.c:2186
 #: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra automÃ¡ticamente"
 
-#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc/silc.c:2189
 #: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Firmar digitalmente todos los mensajes instantÃ¡neos"
@@ -12621,60 +12669,60 @@ msgstr "No se pudo crear el par de clave
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:363
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:365
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Correo electrÃ³nico:     %s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:369
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:371
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "OrganizaciÃ³n: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:373
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "PaÃs: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: ../libpurple/protocols/silc/util.c:376
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:378
+#: ../libpurple/protocols/silc/util.c:377
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "VersiÃ³n: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:379
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12686,7 +12734,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:381
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12696,34 +12744,34 @@ msgstr ""
 "Huella babble de la clave pÃºblica:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc/util.c:383
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "InformaciÃ³n de clave pÃºblica"
 
-#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/silc/util.c:575
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Ordenador"
 
-#: ../libpurple/protocols/silc/util.c:598
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:600
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminal"
@@ -12834,7 +12882,7 @@ msgstr "No se pudo resolver el nombre de
 msgstr "No se pudo resolver el nombre de sistema"
 
 #: ../libpurple/protocols/simple/simple.c:1893
-msgid "SIP screen names may not contain whitespaces or @ symbols"
+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 @"
 
@@ -12987,8 +13035,8 @@ msgstr "Fallo desconocido: %s."
 msgstr "Fallo desconocido: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-msgid "Incorrect screen name or password."
-msgstr "Nombre de cuenta o contraseÃ±a incorrecta."
+msgid "Incorrect username or password."
+msgstr "Nombre de usuario o contraseÃ±a incorrecta."
 
 #: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
@@ -13037,7 +13085,7 @@ msgstr "La contraseÃ±a se ha cambiado co
 msgid "Password Change Successful"
 msgstr "La contraseÃ±a se ha cambiado con Ã©xito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6764
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6847
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -13168,10 +13216,6 @@ msgstr "Â¿Ignorar amigo?"
 msgid "Ignore buddy?"
 msgstr "Â¿Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2127
-msgid "Invalid screen name."
-msgstr "Nombre de usuario no vÃ¡lido"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
@@ -13233,27 +13277,27 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/protocols/yahoo/yahoo.c:3829
+#: ../libpurple/protocols/yahoo/yahoo.c:3833
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3140
-#: ../libpurple/protocols/yahoo/yahoo.c:3832
+#: ../libpurple/protocols/yahoo/yahoo.c:3836
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3835
+#: ../libpurple/protocols/yahoo/yahoo.c:3839
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3146
-#: ../libpurple/protocols/yahoo/yahoo.c:3841
+#: ../libpurple/protocols/yahoo/yahoo.c:3845
 msgid "On Vacation"
 msgstr "De vacaciones"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3150
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
@@ -13300,35 +13344,35 @@ msgstr "Comenzar una sesiÃ³n de Doodle"
 msgid "Start Doodling"
 msgstr "Comenzar una sesiÃ³n de Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3557
+#: ../libpurple/protocols/yahoo/yahoo.c:3561
 msgid "Activate which ID?"
 msgstr "Â¿QuÃ© ID quiere activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3568
+#: ../libpurple/protocols/yahoo/yahoo.c:3572
 msgid "Join whom in chat?"
 msgstr "Â¿Con quiÃ©n quiere juntarse en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3580
+#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3584
+#: ../libpurple/protocols/yahoo/yahoo.c:3588
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3589
+#: ../libpurple/protocols/yahoo/yahoo.c:3593
 msgid "Open Inbox"
 msgstr "Abrir bandeja de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4178
+#: ../libpurple/protocols/yahoo/yahoo.c:4182
 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4183
+#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4191
+#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesiÃ³n Doodle"
 
@@ -13342,56 +13386,56 @@ msgstr "doodle: Solicitar al usuario el 
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
-#: ../libpurple/protocols/yahoo/yahoo.c:4402
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4425
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Japan"
 msgstr "Yahoo JapÃ³n"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4428
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4431
+#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonÃ©s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4434
+#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4437
+#: ../libpurple/protocols/yahoo/yahoo.c:4441
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4440
+#: ../libpurple/protocols/yahoo/yahoo.c:4444
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonÃ©s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4443
+#: ../libpurple/protocols/yahoo/yahoo.c:4447
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4446
+#: ../libpurple/protocols/yahoo/yahoo.c:4450
 msgid "Chat room locale"
 msgstr "LocalizaciÃ³n de la sala de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4449
+#: ../libpurple/protocols/yahoo/yahoo.c:4453
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4457
+#: ../libpurple/protocols/yahoo/yahoo.c:4461
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4460
+#: ../libpurple/protocols/yahoo/yahoo.c:4464
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4463
+#: ../libpurple/protocols/yahoo/yahoo.c:4467
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
@@ -13405,15 +13449,15 @@ msgstr "Enviar peticiÃ³n Doodle."
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1111
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1515
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1410
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s se ofrece a enviarle un conjunto de %s archivos.\n"
+msgstr "%s se ofrece a enviarle un conjunto de %d archivos.\n"
 
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
@@ -13872,59 +13916,59 @@ msgstr "Error SSL desconocido"
 msgid "Unknown SSL error"
 msgstr "Error SSL desconocido"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Desactivado"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1083
+#: ../libpurple/status.c:157 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1088
 msgid "Do not disturb"
 msgstr "No molestar"
 
-#: ../libpurple/status.c:159
+#: ../libpurple/status.c:160
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
 # El latinoamÃ©rica se prefiere 'Celular', creo, jfs
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr "MÃ³vil"
 
-#: ../libpurple/status.c:161
+#: ../libpurple/status.c:162
 msgid "Listening to music"
 msgstr "Escuchando mÃºsica"
 
-#: ../libpurple/status.c:610
+#: ../libpurple/status.c:611
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "el estado de %s (%s) cambiÃ³ de %s a %s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:622
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) es ahora %s"
 
-#: ../libpurple/status.c:627
+#: ../libpurple/status.c:628
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ya no estÃ¡ %s"
 
-#: ../libpurple/status.c:1242
+#: ../libpurple/status.c:1243
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora estÃ¡ inactivo"
 
-#: ../libpurple/status.c:1262
+#: ../libpurple/status.c:1263
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora estÃ¡ activo"
 
-#: ../libpurple/status.c:1328
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ahora estÃ¡ inactivo"
 
-#: ../libpurple/status.c:1330
+#: ../libpurple/status.c:1331
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ahora estÃ¡ activo"
@@ -14032,37 +14076,33 @@ msgstr "No se pudo conectar a %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
 
-#: ../libpurple/util.c:4697
+#: ../libpurple/util.c:4696
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4703
+#: ../libpurple/util.c:4702
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
 #: ../libpurple/win32/libc_interface.c:322
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Otro programa en su ordenador ha interrumpido la conexiÃ³n."
 
 #. 10054
 #: ../libpurple/win32/libc_interface.c:325
-#, c-format
 msgid "Remote host closed connection."
 msgstr "El servidor remoto ha cerrado la conexiÃ³n."
 
 #. 10060
 #: ../libpurple/win32/libc_interface.c:328
-#, c-format
 msgid "Connection timed out."
 msgstr "ExpirÃ³ la conexiÃ³n."
 
 #. 10061
 #: ../libpurple/win32/libc_interface.c:331
-#, c-format
 msgid "Connection refused."
 msgstr "ConexiÃ³n rechazada."
 
@@ -14095,63 +14135,63 @@ msgstr "Pro_tocolo:"
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:411
-msgid "Screen _name:"
-msgstr "_Nombre de usuario:"
+#: ../pidgin/gtkaccount.c:411 ../pidgin/gtkaccount.c:1039
+msgid "_Username:"
+msgstr "Nombre de _usuario:"
 
 #: ../pidgin/gtkaccount.c:501
-msgid "_Local alias:"
-msgstr "Apodo _local:"
-
-#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "Recordar _contraseÃ±a"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:563
+#: ../pidgin/gtkaccount.c:555
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: ../pidgin/gtkaccount.c:576
+#: ../pidgin/gtkaccount.c:568
+msgid "_Local alias:"
+msgstr "Apodo _local:"
+
+#: ../pidgin/gtkaccount.c:572
 msgid "New _mail notifications"
 msgstr "Notificaciones de _correo nuevo"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:581
+#: ../pidgin/gtkaccount.c:577
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizar este _icono de amigo para esta cuenta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:703
+#: ../pidgin/gtkaccount.c:705
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#: ../pidgin/gtkaccount.c:908
+#: ../pidgin/gtkaccount.c:910
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuraciÃ³n del proxy de GNOME"
 
-#: ../pidgin/gtkaccount.c:909
+#: ../pidgin/gtkaccount.c:911
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuraciÃ³n global del proxy"
 
-#: ../pidgin/gtkaccount.c:915
+#: ../pidgin/gtkaccount.c:917
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkaccount.c:921
+#: ../pidgin/gtkaccount.c:923
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:927
+#: ../pidgin/gtkaccount.c:929
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:933
+#: ../pidgin/gtkaccount.c:935
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
+#: ../pidgin/gtkaccount.c:941 ../pidgin/gtkprefs.c:1340
 msgid "Use Environmental Settings"
 msgstr "Usar configuraciÃ³n del entorno"
 
@@ -14160,73 +14200,69 @@ msgstr "Usar configuraciÃ³n del entorno"
 #. 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.
-#: ../pidgin/gtkaccount.c:978
+#: ../pidgin/gtkaccount.c:980
 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.
-#: ../pidgin/gtkaccount.c:981
+#: ../pidgin/gtkaccount.c:983
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareÃ¡ndose"
 
-#: ../pidgin/gtkaccount.c:1002
+#: ../pidgin/gtkaccount.c:1004
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1334
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
+#: ../pidgin/gtkaccount.c:1027 ../pidgin/gtkprefs.c:1355
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:1373
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../pidgin/gtkaccount.c:1037
-msgid "_Username:"
-msgstr "Nombre de _usuario:"
-
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
+#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1410
 msgid "Pa_ssword:"
 msgstr "_ContraseÃ±a:"
 
-#: ../pidgin/gtkaccount.c:1169
+#: ../pidgin/gtkaccount.c:1171
 msgid "Unable to save new account"
 msgstr "No se pudo guardar la nueva cuenta"
 
-#: ../pidgin/gtkaccount.c:1170
+#: ../pidgin/gtkaccount.c:1172
 msgid "An account already exists with the specified criteria."
 msgstr "Ya existe una cuenta con los criterios especificados."
 
-#: ../pidgin/gtkaccount.c:1447
+#: ../pidgin/gtkaccount.c:1449
 msgid "Add Account"
 msgstr "AÃ±adir cuenta"
 
-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1466
 msgid "_Basic"
 msgstr "_BÃ¡sica"
 
-#: ../pidgin/gtkaccount.c:1471
+#: ../pidgin/gtkaccount.c:1473
 msgid "Create this new account on the server"
 msgstr "Crear esta nueva cuenta en el servidor"
 
-#: ../pidgin/gtkaccount.c:1485
+#: ../pidgin/gtkaccount.c:1487
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:643
+#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtkplugin.c:753
 #: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../pidgin/gtkaccount.c:1934
+#: ../pidgin/gtkaccount.c:1936
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2137
+#: ../pidgin/gtkaccount.c:2139
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14264,117 +14300,125 @@ msgstr ""
 "amigos y utilizarÃ¡n sÃ³lo una ventana de conversaciÃ³n. Puede separarlos mÃ¡s "
 "adelante seleccionando Â«ExpandirÂ» del menÃº contextual de contactos."
 
-#: ../pidgin/gtkblist.c:964 ../pidgin/gtkblist.c:6711
+#: ../pidgin/gtkblist.c:683
+msgid "Please update the necessary fields."
+msgstr "Por favor, actualice los campos necesarios."
+
+#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkblist.c:6794
 msgid "Room _List"
 msgstr "_Lista de salas"
 
-#: ../pidgin/gtkblist.c:984
+#: ../pidgin/gtkblist.c:1058
 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"
 
-#: ../pidgin/gtkblist.c:996 ../pidgin/gtkblist.c:6746
+#: ../pidgin/gtkblist.c:1070 ../pidgin/gtkblist.c:6829
 #: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../pidgin/gtkblist.c:1274 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkprivacy.c:549
 #: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1274
+#: ../pidgin/gtkblist.c:1349
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1317
+#: ../pidgin/gtkblist.c:1392
 msgid "Move to"
 msgstr "Mover a"
 
-#: ../pidgin/gtkblist.c:1357
+#: ../pidgin/gtkblist.c:1432
 msgid "Get _Info"
 msgstr "Obtener _informaciÃ³n"
 
-#: ../pidgin/gtkblist.c:1360 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1435 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1366
+#: ../pidgin/gtkblist.c:1441
 msgid "_Send File..."
 msgstr "_Enviar archivo..."
 
-#: ../pidgin/gtkblist.c:1373
+#: ../pidgin/gtkblist.c:1448
 msgid "Add Buddy _Pounce..."
 msgstr "AÃ±adir _aviso de amigo..."
 
-#: ../pidgin/gtkblist.c:1378 ../pidgin/gtkblist.c:1382
-#: ../pidgin/gtkblist.c:1502 ../pidgin/gtkblist.c:1525
+#: ../pidgin/gtkblist.c:1453 ../pidgin/gtkblist.c:1457
+#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1602
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
+#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Hide when offline"
 msgstr "Ocultar cuando se estÃ© desconectado"
 
-#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
+#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Show when offline"
 msgstr "Mostrar cuando se estÃ© desconectado"
 
-#: ../pidgin/gtkblist.c:1402 ../pidgin/gtkblist.c:1411
-#: ../pidgin/gtkblist.c:1510 ../pidgin/gtkblist.c:1531
+#: ../pidgin/gtkblist.c:1477 ../pidgin/gtkblist.c:1486
+#: ../pidgin/gtkblist.c:1587 ../pidgin/gtkblist.c:1608
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../pidgin/gtkblist.c:1405 ../pidgin/gtkblist.c:1413
-#: ../pidgin/gtkblist.c:1512 ../pidgin/gtkblist.c:1533
+#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkblist.c:1488
+#: ../pidgin/gtkblist.c:1589 ../pidgin/gtkblist.c:1610
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../pidgin/gtkblist.c:1463
+#: ../pidgin/gtkblist.c:1538
 msgid "Add _Buddy..."
 msgstr "AÃ±adir _amigo..."
 
-#: ../pidgin/gtkblist.c:1466
+#: ../pidgin/gtkblist.c:1541
 msgid "Add C_hat..."
 msgstr "AÃ±adir c_hat..."
 
-#: ../pidgin/gtkblist.c:1469
+#: ../pidgin/gtkblist.c:1544
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkblist.c:1471
+#: ../pidgin/gtkblist.c:1546
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkroomlist.c:318
 #: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1498
+#: ../pidgin/gtkblist.c:1573
 msgid "Auto-Join"
 msgstr "Conectarse automÃ¡ticamente"
 
-#: ../pidgin/gtkblist.c:1500
+#: ../pidgin/gtkblist.c:1575
 msgid "Persistent"
 msgstr "Persistente"
 
-#: ../pidgin/gtkblist.c:1538 ../pidgin/gtkblist.c:1561
+#: ../pidgin/gtkblist.c:1585
+msgid "_Edit Settings..."
+msgstr "_Editar configuraciÃ³n..."
+
+#: ../pidgin/gtkblist.c:1615 ../pidgin/gtkblist.c:1638
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1566
+#: ../pidgin/gtkblist.c:1643
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1817 ../pidgin/gtkblist.c:1829
-#: ../pidgin/gtkblist.c:5410 ../pidgin/gtkblist.c:5423
+#: ../pidgin/gtkblist.c:1894 ../pidgin/gtkblist.c:1906
+#: ../pidgin/gtkblist.c:5493 ../pidgin/gtkblist.c:5506
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../pidgin/gtkblist.c:2289 ../pidgin/gtkconv.c:4807
+#: ../pidgin/gtkblist.c:2366 ../pidgin/gtkconv.c:4926
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -14383,234 +14427,243 @@ msgstr "No estÃ¡ conectado con ninguna c
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2640
+#: ../pidgin/gtkblist.c:2717
 msgid "Unknown node type"
 msgstr "Tipo de nodo desconocido"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:3153
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:3154
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantÃ¡neo nuevo..."
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:3155
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3156
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _informaciÃ³n del usuario..."
 
-#: ../pidgin/gtkblist.c:3080
+#: ../pidgin/gtkblist.c:3157
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3159
 msgid "/Buddies/Sh_ow"
 msgstr "/Amigos/M_ostrar"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3160
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desc_onectados"
 
-#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3161
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos _vacÃos"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3162
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Amigos/Mostrar/_Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:3086
+#: ../pidgin/gtkblist.c:3163
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Amigos/Mostrar/_Tiempo de inactividad"
 
-#: ../pidgin/gtkblist.c:3087
+#: ../pidgin/gtkblist.c:3164
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de _protocolo"
 
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:3165
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"
 
-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3167
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_AÃ±adir un amigo..."
 
-#: ../pidgin/gtkblist.c:3091
+#: ../pidgin/gtkblist.c:3168
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/AÃ±adir un _chat..."
 
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3169
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/AÃ±adir _grupo..."
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3171
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3174
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: ../pidgin/gtkblist.c:3098 ../pidgin/gtkblist.c:7431
+#: ../pidgin/gtkblist.c:3175 ../pidgin/gtkblist.c:7514
 msgid "/Accounts/Manage"
 msgstr "/Cuentas/Gestionar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3178
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: ../pidgin/gtkblist.c:3102
+#: ../pidgin/gtkblist.c:3179
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3180
 msgid "/Tools/_Certificates"
 msgstr "/Herramientas/_Certificados"
 
-#: ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3181
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:3182
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3183
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../pidgin/gtkblist.c:3108
+#: ../pidgin/gtkblist.c:3185
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3186
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3187
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/_Registro del sistema"
 
-#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3189
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3191
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3192
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _lÃnea"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3193
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuraciÃ³n"
 
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3195 ../pidgin/gtkblist.c:3197
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:3151
+#: ../pidgin/gtkblist.c:3228
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Cuenta:</b> %s"
 
-#: ../pidgin/gtkblist.c:3171
+#: ../pidgin/gtkblist.c:3247
 #, c-format
 msgid ""
 "\n"
+"<b>Occupants:</b> %d"
+msgstr "\n<b>Ocupantes:</b> %d"
+
+#: ../pidgin/gtkblist.c:3252
+#, c-format
+msgid ""
+"\n"
 "<b>Topic:</b> %s"
-msgstr "\n<b>Tema:</b> %s"
+msgstr ""
+"\n"
+"<b>Tema:</b> %s"
 
-#: ../pidgin/gtkblist.c:3171
+#: ../pidgin/gtkblist.c:3252
 msgid "(no topic set)"
 msgstr "(no hay tema establecido)"
 
-#: ../pidgin/gtkblist.c:3249
+#: ../pidgin/gtkblist.c:3331
 msgid "Buddy Alias"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkblist.c:3278
+#: ../pidgin/gtkblist.c:3360
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3324
+#: ../pidgin/gtkblist.c:3406
 msgid "Last Seen"
 msgstr "Visto por Ãºltima vez"
 
-#: ../pidgin/gtkblist.c:3345
+#: ../pidgin/gtkblist.c:3427
 msgid "Spooky"
 msgstr "Asustadizo"
 
-#: ../pidgin/gtkblist.c:3347
+#: ../pidgin/gtkblist.c:3429
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3349
+#: ../pidgin/gtkblist.c:3431
 msgid "Rockin'"
 msgstr "Rock'n'roleando"
 
-#: ../pidgin/gtkblist.c:3380
+#: ../pidgin/gtkblist.c:3462
 msgid "Total Buddies"
 msgstr "Amigos en total"
 
-#: ../pidgin/gtkblist.c:3742
+#: ../pidgin/gtkblist.c:3824
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3744
+#: ../pidgin/gtkblist.c:3826
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3746
+#: ../pidgin/gtkblist.c:3828
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3900
+#: ../pidgin/gtkblist.c:3982
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantÃ¡neo..."
 
-#: ../pidgin/gtkblist.c:3901 ../pidgin/gtkblist.c:3934
+#: ../pidgin/gtkblist.c:3983 ../pidgin/gtkblist.c:4016
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../pidgin/gtkblist.c:3902
+#: ../pidgin/gtkblist.c:3984
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener informaciÃ³n del usuario..."
 
-#: ../pidgin/gtkblist.c:3903
+#: ../pidgin/gtkblist.c:3985
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/AÃ±adir un amigo..."
 
-#: ../pidgin/gtkblist.c:3904 ../pidgin/gtkblist.c:3937
+#: ../pidgin/gtkblist.c:3986 ../pidgin/gtkblist.c:4019
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/AÃ±adir un chat..."
 
-#: ../pidgin/gtkblist.c:3905
+#: ../pidgin/gtkblist.c:3987
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/AÃ±adir un grupo..."
 
-#: ../pidgin/gtkblist.c:3940
+#: ../pidgin/gtkblist.c:4022
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../pidgin/gtkblist.c:3943
+#: ../pidgin/gtkblist.c:4025
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:4075 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4157 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14618,41 +14671,41 @@ msgstr[1] "%d mensajes sin leer de %s\n"
 msgstr[0] "%d mensaje sin leer de %s\n"
 msgstr[1] "%d mensajes sin leer de %s\n"
 
-#: ../pidgin/gtkblist.c:4238
+#: ../pidgin/gtkblist.c:4320
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:4241
+#: ../pidgin/gtkblist.c:4323
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:4242
+#: ../pidgin/gtkblist.c:4324
 msgid "By log size"
 msgstr "Por tamaÃ±o de registro"
 
-#: ../pidgin/gtkblist.c:4579
+#: ../pidgin/gtkblist.c:4662
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../pidgin/gtkblist.c:4581
+#: ../pidgin/gtkblist.c:4664
 #, c-format
 msgid "%s disabled"
 msgstr "%s deshabilitado"
 
-#: ../pidgin/gtkblist.c:4585
+#: ../pidgin/gtkblist.c:4668
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../pidgin/gtkblist.c:4585 ../pidgin/gtkblist.c:4704
+#: ../pidgin/gtkblist.c:4668 ../pidgin/gtkblist.c:4787
 msgid "Re-enable"
 msgstr "Reactivar"
 
-#: ../pidgin/gtkblist.c:4702
+#: ../pidgin/gtkblist.c:4785
 msgid "Welcome back!"
 msgstr "Â¡Bienvenido!"
 
-#: ../pidgin/gtkblist.c:4738
+#: ../pidgin/gtkblist.c:4821
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14662,24 +14715,24 @@ msgstr[1] ""
 msgstr[1] ""
 "se deshabilitaron %d cuentas porque se ha conectado desde otra ubicaciÃ³n."
 
-#: ../pidgin/gtkblist.c:5017
+#: ../pidgin/gtkblist.c:5100
 msgid "<b>Username:</b>"
 msgstr "<b>Nombre de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:5024
+#: ../pidgin/gtkblist.c:5107
 msgid "<b>Password:</b>"
 msgstr "<b>ContraseÃ±a:</b>"
 
-#: ../pidgin/gtkblist.c:5035
+#: ../pidgin/gtkblist.c:5118
 msgid "_Login"
 msgstr "_Entrada"
 
-#: ../pidgin/gtkblist.c:5119
+#: ../pidgin/gtkblist.c:5202
 msgid "/Accounts"
 msgstr "/Cuentas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5133
+#: ../pidgin/gtkblist.c:5216
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14697,47 +14750,47 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5404
+#: ../pidgin/gtkblist.c:5487
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desconectados"
 
-#: ../pidgin/gtkblist.c:5407
+#: ../pidgin/gtkblist.c:5490
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos vacÃos"
 
-#: ../pidgin/gtkblist.c:5413
+#: ../pidgin/gtkblist.c:5496
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Amigos/Mostrar/Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:5416
+#: ../pidgin/gtkblist.c:5499
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Amigos/Mostrar/Tiempos de inactividad"
 
-#: ../pidgin/gtkblist.c:5419
+#: ../pidgin/gtkblist.c:5502
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de protocolo"
 
-#: ../pidgin/gtkblist.c:6372
+#: ../pidgin/gtkblist.c:6455
 msgid "Add a buddy.\n"
 msgstr "AÃ±adir un amigo.\n"
 
-#: ../pidgin/gtkblist.c:6387
-msgid "Buddy's _screen name:"
+#: ../pidgin/gtkblist.c:6470
+msgid "Buddy's _username:"
 msgstr "Nombre de _usuario del amigo:"
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6492
 msgid "(Optional) A_lias:"
 msgstr "(Opcional) A_podo:"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6510
 msgid "Add buddy to _group:"
 msgstr "AÃ±adir el amigo a un _grupo:"
 
-#: ../pidgin/gtkblist.c:6676
+#: ../pidgin/gtkblist.c:6759
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no estÃ¡ soportado en las habitaciones de chats."
 
-#: ../pidgin/gtkblist.c:6692
+#: ../pidgin/gtkblist.c:6775
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14745,7 +14798,7 @@ msgstr ""
 "No estÃ¡ conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../pidgin/gtkblist.c:6736
+#: ../pidgin/gtkblist.c:6819
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14753,51 +14806,51 @@ msgstr ""
 "Introduzca el apodo, y la informaciÃ³n que crea conveniente del chat que "
 "desearÃa aÃ±adir en la lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:6759
+#: ../pidgin/gtkblist.c:6842
 msgid "A_lias:"
 msgstr "_Apodo:"
 
-#: ../pidgin/gtkblist.c:6766
+#: ../pidgin/gtkblist.c:6849
 msgid "Auto_join when account becomes online."
 msgstr "Reconec_tarse cuando la cuenta se pone en lÃnea."
 
-#: ../pidgin/gtkblist.c:6767
+#: ../pidgin/gtkblist.c:6850
 msgid "_Hide chat when the window is closed."
 msgstr "_Ocultar el chat cuando se cierra la ventana."
 
-#: ../pidgin/gtkblist.c:6793
+#: ../pidgin/gtkblist.c:6876
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a aÃ±adir."
 
-#: ../pidgin/gtkblist.c:7451
+#: ../pidgin/gtkblist.c:7534
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Cuentas/"
 
-#: ../pidgin/gtkblist.c:7475
+#: ../pidgin/gtkblist.c:7558
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../pidgin/gtkblist.c:7488 ../pidgin/gtkconv.c:3128
+#: ../pidgin/gtkblist.c:7571 ../pidgin/gtkconv.c:3220
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: ../pidgin/gtkblist.c:7496
+#: ../pidgin/gtkblist.c:7579
 msgid "_Disable"
 msgstr "_Deshabilitar"
 
-#: ../pidgin/gtkblist.c:7508
+#: ../pidgin/gtkblist.c:7591
 msgid "Enable Account"
 msgstr "Habilitar cuenta"
 
-#: ../pidgin/gtkblist.c:7514
+#: ../pidgin/gtkblist.c:7597
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Cuentas/Activar cuenta"
 
-#: ../pidgin/gtkblist.c:7563
+#: ../pidgin/gtkblist.c:7646
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../pidgin/gtkblist.c:7633
+#: ../pidgin/gtkblist.c:7716
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -14806,26 +14859,26 @@ msgstr "Servidores SSL"
 msgid "SSL Servers"
 msgstr "Servidores SSL"
 
-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:487
 msgid "Unknown command."
 msgstr "Orden desconocida."
 
-#: ../pidgin/gtkconv.c:749 ../pidgin/gtkconv.c:775
+#: ../pidgin/gtkconv.c:771 ../pidgin/gtkconv.c:798
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
 
-#: ../pidgin/gtkconv.c:769
+#: ../pidgin/gtkconv.c:792
 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."
 
-#: ../pidgin/gtkconv.c:822
+#: ../pidgin/gtkconv.c:846
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:852
+#: ../pidgin/gtkconv.c:876
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14833,183 +14886,187 @@ msgstr ""
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitaciÃ³n opcional."
 
-#: ../pidgin/gtkconv.c:873
+#: ../pidgin/gtkconv.c:897
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:884 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtkconv.c:910 ../pidgin/gtksavedstatuses.c:1166
 #: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../pidgin/gtkconv.c:948
+#: ../pidgin/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:986
+#: ../pidgin/gtkconv.c:1011
 msgid "Save Conversation"
 msgstr "Guardar conversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:1132 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
+#: ../pidgin/gtkconv.c:1157 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1158 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1183 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "TÃ©rmino a _buscar:"
 
-#: ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkconv.c:1684
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1687
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1682
+#: ../pidgin/gtkconv.c:1707
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../pidgin/gtkconv.c:1705
+#: ../pidgin/gtkconv.c:1730
 msgid "Last said"
 msgstr "Dicho la Ãºltima vez"
 
-#: ../pidgin/gtkconv.c:2660
+#: ../pidgin/gtkconv.c:2715
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../pidgin/gtkconv.c:2711
+#: ../pidgin/gtkconv.c:2793
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2851
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2856
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2859
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2863
 msgid "Set Custom Icon..."
 msgstr "Configurar icono personalizado..."
 
-#: ../pidgin/gtkconv.c:2788
+#: ../pidgin/gtkconv.c:2867
+msgid "Change Size"
+msgstr "Cambiar tamaÃ±o"
+
+#: ../pidgin/gtkconv.c:2880
 msgid "Remove Custom Icon"
 msgstr "Eliminar icono personalizado"
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:3005
 msgid "Show All"
 msgstr "Mostrar todo"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3024
 msgid "/_Conversation"
 msgstr "/_ConversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3026
 msgid "/Conversation/New Instant _Message..."
 msgstr "/ConversaciÃ³n/Mensaje _instantÃ¡neo nuevo..."
 
-#: ../pidgin/gtkconv.c:2939
+#: ../pidgin/gtkconv.c:3031
 msgid "/Conversation/_Find..."
 msgstr "/ConversaciÃ³n/_Buscar..."
 
-#: ../pidgin/gtkconv.c:2941
+#: ../pidgin/gtkconv.c:3033
 msgid "/Conversation/View _Log"
 msgstr "/ConversaciÃ³n/Ver _historial"
 
-#: ../pidgin/gtkconv.c:2942
+#: ../pidgin/gtkconv.c:3034
 msgid "/Conversation/_Save As..."
 msgstr "/ConversaciÃ³n/_Guardar como..."
 
-#: ../pidgin/gtkconv.c:2944
+#: ../pidgin/gtkconv.c:3036
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/ConversaciÃ³n/Limpia_r deslizable"
 
-#: ../pidgin/gtkconv.c:2948
+#: ../pidgin/gtkconv.c:3040
 msgid "/Conversation/Se_nd File..."
 msgstr "/ConversaciÃ³n/_Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:2949
+#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/ConversaciÃ³n/AÃ±adir _aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:2951
+#: ../pidgin/gtkconv.c:3043
 msgid "/Conversation/_Get Info"
 msgstr "/ConversaciÃ³n/_Obtener informaciÃ³n"
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:3045
 msgid "/Conversation/In_vite..."
 msgstr "/ConversaciÃ³n/In_vitar..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:3047
 msgid "/Conversation/M_ore"
 msgstr "/ConversaciÃ³n/_MÃ¡s"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:3051
 msgid "/Conversation/Al_ias..."
 msgstr "/ConversaciÃ³n/A_podo..."
 
-#: ../pidgin/gtkconv.c:2961
+#: ../pidgin/gtkconv.c:3053
 msgid "/Conversation/_Block..."
 msgstr "/ConversaciÃ³n/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2963
+#: ../pidgin/gtkconv.c:3055
 msgid "/Conversation/_Unblock..."
 msgstr "/ConversaciÃ³n/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2965
+#: ../pidgin/gtkconv.c:3057
 msgid "/Conversation/_Add..."
 msgstr "/ConversaciÃ³n/_AÃ±adir..."
 
-#: ../pidgin/gtkconv.c:2967
+#: ../pidgin/gtkconv.c:3059
 msgid "/Conversation/_Remove..."
 msgstr "/ConversaciÃ³n/Elimina_r..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/ConversaciÃ³n/Insertar en_lace..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:3066
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/ConversaciÃ³n/Insertar imag_en..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3072
 msgid "/Conversation/_Close"
 msgstr "/ConversaciÃ³n/_Cerrar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3076
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:3077
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:2986
+#: ../pidgin/gtkconv.c:3078
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:2988
+#: ../pidgin/gtkconv.c:3080
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../pidgin/gtkconv.c:2989
+#: ../pidgin/gtkconv.c:3081
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3116
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/More"
 msgstr "/ConversaciÃ³n/MÃ¡s"
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3264
 msgid "/Options"
 msgstr "/Opciones"
 
@@ -15018,175 +15075,177 @@ msgstr "/Opciones"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3207 ../pidgin/gtkconv.c:3239
+#: ../pidgin/gtkconv.c:3299 ../pidgin/gtkconv.c:3331
 msgid "/Conversation"
 msgstr "/ConversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:3247
+#: ../pidgin/gtkconv.c:3339
 msgid "/Conversation/View Log"
 msgstr "/ConversaciÃ³n/Ver registro"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3345
 msgid "/Conversation/Send File..."
 msgstr "/ConversaciÃ³n/Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3349
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/ConversaciÃ³n/AÃ±adir aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3263
+#: ../pidgin/gtkconv.c:3355
 msgid "/Conversation/Get Info"
 msgstr "/ConversaciÃ³n/Obtener informaciÃ³n"
 
-#: ../pidgin/gtkconv.c:3267
+#: ../pidgin/gtkconv.c:3359
 msgid "/Conversation/Invite..."
 msgstr "/ConversaciÃ³n/Invitar..."
 
-#: ../pidgin/gtkconv.c:3273
+#: ../pidgin/gtkconv.c:3365
 msgid "/Conversation/Alias..."
 msgstr "/ConversaciÃ³n/Apodo..."
 
-#: ../pidgin/gtkconv.c:3277
+#: ../pidgin/gtkconv.c:3369
 msgid "/Conversation/Block..."
 msgstr "/ConversaciÃ³n/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3373
 msgid "/Conversation/Unblock..."
 msgstr "/ConversaciÃ³n/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3377
 msgid "/Conversation/Add..."
 msgstr "/ConversaciÃ³n/AÃ±adir..."
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3381
 msgid "/Conversation/Remove..."
 msgstr "/ConversaciÃ³n/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3295
+#: ../pidgin/gtkconv.c:3387
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: ../pidgin/gtkconv.c:3299
+#: ../pidgin/gtkconv.c:3391
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: ../pidgin/gtkconv.c:3305
+#: ../pidgin/gtkconv.c:3397
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3308
+#: ../pidgin/gtkconv.c:3400
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3321
+#: ../pidgin/gtkconv.c:3413
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../pidgin/gtkconv.c:3324
+#: ../pidgin/gtkconv.c:3416
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3402
+#: ../pidgin/gtkconv.c:3494
 msgid "User is typing..."
 msgstr "El usuario estÃ¡ escribiendo..."
 
-#: ../pidgin/gtkconv.c:3472
+#: ../pidgin/gtkconv.c:3568
 #, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "\n%s ha dejado de escribir"
+msgstr ""
+"\n"
+"%s ha dejado de escribir"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3638 ../pidgin/gtkconv.c:8309
+#: ../pidgin/gtkconv.c:3748 ../pidgin/gtkconv.c:8472
 msgid "S_end To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4350
+#: ../pidgin/gtkconv.c:4431 ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4486
+#: ../pidgin/gtkconv.c:4590
 msgid "0 people in room"
 msgstr "0 personas en la conversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:5784 ../pidgin/gtkconv.c:5905
+#: ../pidgin/gtkconv.c:5932 ../pidgin/gtkconv.c:6053
 #, 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"
 
-#: ../pidgin/gtkconv.c:6535 ../pidgin/gtkstatusbox.c:679
+#: ../pidgin/gtkconv.c:6687 ../pidgin/gtkstatusbox.c:684
 msgid "Typing"
 msgstr "Tecleando"
 
-#: ../pidgin/gtkconv.c:6539
+#: ../pidgin/gtkconv.c:6691
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkconv.c:6542
+#: ../pidgin/gtkconv.c:6694
 msgid "Nick Said"
 msgstr "Apodo dijo"
 
-#: ../pidgin/gtkconv.c:6545 ../pidgin/gtkdocklet.c:686
+#: ../pidgin/gtkconv.c:6697 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: ../pidgin/gtkconv.c:6551
+#: ../pidgin/gtkconv.c:6703
 msgid "New Event"
 msgstr "Nuevo acontecimiento"
 
-#: ../pidgin/gtkconv.c:7781
+#: ../pidgin/gtkconv.c:7944
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: limpia todos los histÃ³ricos de las ventanas de conversaciÃ³n."
 
-#: ../pidgin/gtkconv.c:7985
+#: ../pidgin/gtkconv.c:8148
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../pidgin/gtkconv.c:8017
+#: ../pidgin/gtkconv.c:8180
 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?"
 
-#: ../pidgin/gtkconv.c:8650
+#: ../pidgin/gtkconv.c:8813
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"
 
-#: ../pidgin/gtkconv.c:8656
+#: ../pidgin/gtkconv.c:8819
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"
 
-#: ../pidgin/gtkconv.c:8664
+#: ../pidgin/gtkconv.c:8827
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"
 
-#: ../pidgin/gtkconv.c:8670
+#: ../pidgin/gtkconv.c:8833
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"
 
-#: ../pidgin/gtkconv.c:9184
+#: ../pidgin/gtkconv.c:9355
 msgid "Close conversation"
 msgstr "Cerrar conversaciÃ³n"
 
-#: ../pidgin/gtkconv.c:9788
+#: ../pidgin/gtkconv.c:9959
 msgid "Last created window"
 msgstr "Ãšltima ventana creada"
 
-#: ../pidgin/gtkconv.c:9790
+#: ../pidgin/gtkconv.c:9961
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../pidgin/gtkconv.c:9792 ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkconv.c:9963 ../pidgin/gtkprefs.c:1576
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../pidgin/gtkconv.c:9794
+#: ../pidgin/gtkconv.c:9965
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9796
+#: ../pidgin/gtkconv.c:9967
 msgid "By account"
 msgstr "Por cuenta"
 
@@ -15250,7 +15309,7 @@ msgstr "Error fatal"
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:120
 msgid "lead developer"
 msgstr "desarrollador principal"
 
@@ -15275,7 +15334,7 @@ msgstr "soporte/QA"
 msgid "support/QA"
 msgstr "soporte/QA"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:115
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"
 
@@ -15283,341 +15342,342 @@ msgstr "Contribuyente senior/QA"
 msgid "Senior Contributor/QA"
 msgstr "Contribuyente senior/QA"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "win32 port"
 msgstr "adaptaciÃ³n a win32"
 
-#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:112 ../pidgin/gtkdialogs.c:113
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:114
 msgid "libfaim maintainer"
 msgstr "mantenedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseÃ±ador de controladores [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:118
 msgid "XMPP developer"
 msgstr "desarrollador XMPP"
 
-#: ../pidgin/gtkdialogs.c:118
+#: ../pidgin/gtkdialogs.c:119
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:135
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:231
 msgid "Arabic"
 msgstr "Ãrabe"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 msgid "Belarusian Latin"
 msgstr "LatÃn bieloruso"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:232
 msgid "Bulgarian"
 msgstr "BÃºlgaro"
 
-#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Bengali"
 msgstr "BengalÃ"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Catalan"
 msgstr "CatalÃ¡n"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147
 msgid "Valencian-Catalan"
 msgstr "Valenciano-CatalÃ¡n"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "Czech"
 msgstr "Checo"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
 msgid "Danish"
 msgstr "DanÃ©s"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:237
 msgid "German"
 msgstr "AlemÃ¡n"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:155
 msgid "Dzongkha"
 msgstr "ButanÃ"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Greek"
 msgstr "Griego"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
 msgid "Australian English"
 msgstr "InglÃ©s australiano"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "Canadian English"
 msgstr "InglÃ©s canadiense"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "British English"
 msgstr "InglÃ©s britÃ¡nico"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:161
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Spanish"
 msgstr "EspaÃ±ol"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Euskera(Basque)"
 msgstr "Eusquera(Vasco)"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "Finnish"
 msgstr "FinlandÃ©s"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "French"
 msgstr "FrancÃ©s"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:248
 msgid "Galician"
 msgstr "Gallego"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:174
 msgid "Gujarati Language Team"
 msgstr "Grupo de traducciÃ³n al Gujarati"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:249
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Hindi"
 msgstr "HindÃº"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:250
 msgid "Hungarian"
 msgstr "HÃºngaro"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
 msgid "Japanese"
 msgstr "JaponÃ©s"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:255
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductores al georgiano de Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada Translation team"
 msgstr "Grupo de traducciÃ³n al kannada"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:186
 msgid "Kurdish"
 msgstr "Kurdo"
 
-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
 msgid "Lao"
 msgstr "Laosiano"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:260
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:259
-#: ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "BokmÃ¥l Norwegian"
 msgstr "Noruego BokmÃ¥l"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
 msgid "Nepali"
 msgstr "NepalÃ©s"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Dutch, Flemish"
 msgstr "DanÃ©s, Flamenco"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Norwegian Nynorsk"
 msgstr "Noruego Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
 msgid "Punjabi"
 msgstr "PunjabÃ"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:263
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese"
 msgstr "PortuguÃ©s"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
 msgid "Portuguese-Brazil"
 msgstr "PortuguÃ©s brasileÃ±o"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Pashto"
 msgstr "Afgano"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:262
-#: ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
-#: ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:268
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:269
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:208
 msgid "Albanian"
 msgstr "AlbanÃ©s"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:268 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:270 ../pidgin/gtkdialogs.c:271
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
-#: ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:273
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:274
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Urdu"
 msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:218
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:218
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:275
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:222
 msgid "Hong Kong Chinese"
 msgstr "Chino de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:276
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Amharic"
 msgstr "AmhÃ¡rico"
 
-#: ../pidgin/gtkdialogs.c:359
+#: ../pidgin/gtkdialogs.c:361
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:395
+#: ../pidgin/gtkdialogs.c:397
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15641,102 +15701,94 @@ msgstr ""
 "completa de personas que han contribuido. Este programa se distribuye sin "
 "ninguna garantÃa.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:415
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin en irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
+#: ../pidgin/gtkdialogs.c:420
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../pidgin/gtkdialogs.c:433
+#: ../pidgin/gtkdialogs.c:435
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:448
+#: ../pidgin/gtkdialogs.c:450
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:465
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"
 
-#: ../pidgin/gtkdialogs.c:478
+#: ../pidgin/gtkdialogs.c:480
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:493
+#: ../pidgin/gtkdialogs.c:495
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../pidgin/gtkdialogs.c:513
+#: ../pidgin/gtkdialogs.c:515
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../pidgin/gtkdialogs.c:531
+#: ../pidgin/gtkdialogs.c:533
 msgid "Debugging Information"
 msgstr "InformaciÃ³n de depuraciÃ³n"
 
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:886
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:888
+#: ../pidgin/gtkdialogs.c:969
 msgid "_Name"
 msgstr "_Nombre"
 
-#: ../pidgin/gtkdialogs.c:752 ../pidgin/gtkdialogs.c:891
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:974
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: ../pidgin/gtkdialogs.c:899
+#: ../pidgin/gtkdialogs.c:901
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../pidgin/gtkdialogs.c:901
+#: ../pidgin/gtkdialogs.c:903
 msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+"Please enter the username or alias of the person whose info you would like "
+"to view."
 msgstr ""
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver informaciÃ³n."
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:993
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../pidgin/gtkdialogs.c:993
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
-"ver informaciÃ³n de registro."
-
-#: ../pidgin/gtkdialogs.c:1013
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../pidgin/gtkdialogs.c:1036
+#: ../pidgin/gtkdialogs.c:1038
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:1038
+#: ../pidgin/gtkdialogs.c:1040
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../pidgin/gtkdialogs.c:1060
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15751,15 +15803,15 @@ msgstr[1] ""
 "EstÃ¡ a punto de borrar los contactos que contiene a %s y a otros %d amigos "
 "de su lista de amigos. Â¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1109
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1112
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1141
+#: ../pidgin/gtkdialogs.c:1143
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15768,15 +15820,15 @@ msgstr ""
 "EstÃ¡ a punto de fusionar el grupo llamado %s con el grupo llamado %s. Â¿Desea "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1150
 msgid "Merge Groups"
 msgstr "Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1153
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1203
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15785,29 +15837,29 @@ msgstr ""
 "EstÃ¡ a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. Â¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1206
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1209
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1240
+#: ../pidgin/gtkdialogs.c:1242
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1243
+#: ../pidgin/gtkdialogs.c:1245
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1248
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1267
+#: ../pidgin/gtkdialogs.c:1269
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15815,11 +15867,11 @@ msgstr ""
 msgstr ""
 "EstÃ¡ a punto de eliminar el chat %s de su lista de amigos. Â¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1270
+#: ../pidgin/gtkdialogs.c:1272
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkdialogs.c:1275
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
@@ -15938,75 +15990,101 @@ msgstr "_Continuar"
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:820
+#: ../pidgin/gtkimhtml.c:842
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../pidgin/gtkimhtml.c:837 ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"
 
-#: ../pidgin/gtkimhtml.c:1395
+#: ../pidgin/gtkimhtml.c:867
+msgid "Disable _smileys in selected text"
+msgstr "Deshabilitar los emoticono_s en el texto seleccionado"
+
+#: ../pidgin/gtkimhtml.c:1430
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/gtkimhtml.c:1396
+#: ../pidgin/gtkimhtml.c:1431
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../pidgin/gtkimhtml.c:1399
+#: ../pidgin/gtkimhtml.c:1434
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../pidgin/gtkimhtml.c:1400
+#: ../pidgin/gtkimhtml.c:1435
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratÃ³n estÃ© encima."
 
-#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:52
+#: ../pidgin/gtkimhtml.c:1438 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Enviar color en mensajes con nombre"
 
-#: ../pidgin/gtkimhtml.c:1404
+#: ../pidgin/gtkimhtml.c:1439
 msgid "Color to draw the name of a message you sent."
 msgstr "Color para dibujar el nombre en un mensaje que envÃe."
 
-#: ../pidgin/gtkimhtml.c:1407 ../pidgin/plugins/pidginrc.c:53
+#: ../pidgin/gtkimhtml.c:1442 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Color en mensajes recibidos con nombre"
 
-#: ../pidgin/gtkimhtml.c:1408
+#: ../pidgin/gtkimhtml.c:1443
 msgid "Color to draw the name of a message you received."
 msgstr "Color para dibujar el nombre de un mensaje que reciba."
 
-#: ../pidgin/gtkimhtml.c:1411
+#: ../pidgin/gtkimhtml.c:1446
 msgid "\"Attention\" Name Color"
 msgstr "Color en nombre Â«atenciÃ³nÂ»"
 
-#: ../pidgin/gtkimhtml.c:1412
+#: ../pidgin/gtkimhtml.c:1447
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "Color con el que dibujar el nombre de un mensaje que haya recibido y que contenga su nombre."
+msgstr ""
+"Color con el que dibujar el nombre de un mensaje que haya recibido y que "
+"contenga su nombre."
 
-#: ../pidgin/gtkimhtml.c:1415 ../pidgin/plugins/pidginrc.c:55
+#: ../pidgin/gtkimhtml.c:1450 ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr "Color para mensajes de acciones con nombre"
 
-#: ../pidgin/gtkimhtml.c:1416
+#: ../pidgin/gtkimhtml.c:1451
 msgid "Color to draw the name of an action message."
 msgstr "Color con el que dibujar el nombre de un mensaje de acciÃ³n."
 
-#: ../pidgin/gtkimhtml.c:1636
+#: ../pidgin/gtkimhtml.c:1460
+msgid "Typing notification color"
+msgstr "Color de notificaciÃ³n de tecleo"
+
+#: ../pidgin/gtkimhtml.c:1461
+msgid "The color to use for the typing notification font"
+msgstr "Color a utilizar para la tipografÃa de notificaciÃ³n de tecleo"
+
+#: ../pidgin/gtkimhtml.c:1464
+msgid "Typing notification font"
+msgstr "TipografÃa de notificaciÃ³n de tecleo"
+
+#: ../pidgin/gtkimhtml.c:1465
+msgid "The font to use for the typing notification"
+msgstr "TipografÃa a utilizar para la notificaciÃ³n de tecleo"
+
+#: ../pidgin/gtkimhtml.c:1468 ../pidgin/gtkimhtml.c:1469
+msgid "Enable typing notification"
+msgstr "Activar la notificaciÃ³n de tecleo"
+
+#: ../pidgin/gtkimhtml.c:1688
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar direcciÃ³n de correo electrÃ³nico"
 
-#: ../pidgin/gtkimhtml.c:1648
+#: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../pidgin/gtkimhtml.c:1658
+#: ../pidgin/gtkimhtml.c:1710
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../pidgin/gtkimhtml.c:3421
+#: ../pidgin/gtkimhtml.c:3482
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16016,7 +16094,7 @@ msgstr ""
 "\n"
 "Tomando PNG por omisiÃ³n."
 
-#: ../pidgin/gtkimhtml.c:3424
+#: ../pidgin/gtkimhtml.c:3485
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16026,7 +16104,7 @@ msgstr ""
 "\n"
 "Tomando PNG por omisiÃ³n."
 
-#: ../pidgin/gtkimhtml.c:3453
+#: ../pidgin/gtkimhtml.c:3514
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16038,7 +16116,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3456
+#: ../pidgin/gtkimhtml.c:3517
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16049,11 +16127,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
+#: ../pidgin/gtkimhtml.c:3598 ../pidgin/gtkimhtml.c:3610
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../pidgin/gtkimhtml.c:3577
+#: ../pidgin/gtkimhtml.c:3638
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
@@ -16089,11 +16167,11 @@ msgstr "Introduzca el URL del enlace que
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1264
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -16110,127 +16188,127 @@ msgstr "Â¡SonrÃa!"
 msgid "Smile!"
 msgstr "Â¡SonrÃa!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:764
+#: ../pidgin/gtkimhtmltoolbar.c:763
 msgid "This theme has no available smileys."
 msgstr "Este tema no tiene emoticonos disponibles."
 
-#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
+#: ../pidgin/gtkimhtmltoolbar.c:847 ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Font"
 msgstr "_TipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1056
+#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Group Items"
 msgstr "Elementos de grupo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1056
+#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Ungroup Items"
 msgstr "Desagrupar items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1092
 msgid "Strikethrough"
 msgstr "Tachado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Increase Font Size"
 msgstr "Incrementa tamaÃ±o de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Decrease Font Size"
 msgstr "Reducir tamaÃ±o de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Font Face"
 msgstr "Estilo de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Foreground Color"
 msgstr "Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Reset Formatting"
 msgstr "Limpiar formato"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1105
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert IM Image"
 msgstr "Insertar imagen MI"
 
 # No estoy muy seguro de usar emoticono, quizÃ¡s Â«smileyÂ» serÃa mÃ¡s apropiado
-#: ../pidgin/gtkimhtmltoolbar.c:1106
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<b>_Bold</b>"
 msgstr "<b> Negrita</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<u>_Underline</u>"
 msgstr "<u>S_ubrayado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Tachado</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size=\"larger\">MÃ¡s _grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>MÃ¡s _pequeÃ±o</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "_Font face"
 msgstr "_Estilo de tipografÃa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Foreground _color"
 msgstr "_Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1196
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Bac_kground color"
 msgstr "Color del _fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1273
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1279
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1285
+#: ../pidgin/gtkimhtmltoolbar.c:1284
 msgid "_Horizontal rule"
 msgstr "Regla _horizontal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1307
+#: ../pidgin/gtkimhtmltoolbar.c:1306
 msgid "_Smile!"
 msgstr "Â¡_SonrÃa!"
 
@@ -16292,12 +16370,12 @@ msgstr "_Acceder a la carpeta de registr
 msgid "_Browse logs folder"
 msgstr "_Acceder a la carpeta de registros"
 
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Intente `%s -h' para mÃ¡s informaciÃ³n.\n"
 
-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:389
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16317,18 +16395,21 @@ msgstr ""
 "%s %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"
 "  -m, --multiple       no asegurarse de que hay sÃ³lo una instancia\n"
 "  -n, --nologin        no conectarse de forma automÃ¡tica\n"
-"  -l, --login[=NOMBRE] conectarse de forma automÃ¡tica (el argumento opcional NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automÃ¡tica (el argumento opcional "
+"NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas.\n"
 "                       Si no se indica se activarÃ¡ sÃ³lo la primera cuenta).\n"
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
 "  -v, --version        mostrar la versiÃ³n actual y salir\n"
 
-#: ../pidgin/gtkmain.c:401
+#: ../pidgin/gtkmain.c:402
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16347,18 +16428,21 @@ msgstr ""
 "%s %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"
 "  -m, --multiple       no asegurarse de que hay sÃ³lo una instancia\n"
 "  -n, --nologin        no conectarse de forma automÃ¡tica\n"
-"  -l, --login[=NOMBRE] conectarse de forma automÃ¡tica (el argumento opcional NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automÃ¡tica (el argumento opcional "
+"NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas.\n"
 "                       Si no se indica se activarÃ¡ sÃ³lo la primera cuenta).\n"
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
 "  -v, --version        mostrar la versiÃ³n actual y salir\n"
 
-#: ../pidgin/gtkmain.c:531
+#: ../pidgin/gtkmain.c:532
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16399,71 +16483,71 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:725 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:726 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:354
+#: ../pidgin/gtknotify.c:360
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
-#: ../pidgin/gtknotify.c:408
+#: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Â¡Tiene correo!</span>"
 
-#: ../pidgin/gtknotify.c:551
+#: ../pidgin/gtknotify.c:570
 #, 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."
 
-#: ../pidgin/gtknotify.c:575
+#: ../pidgin/gtknotify.c:599
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>Tiene %d nuevo correo.</b>"
 msgstr[1] "<b>Tiene %d nuevos correos.</b>"
 
-#: ../pidgin/gtknotify.c:1008
+#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador Â«%sÂ» no es vÃ¡lida."
 
-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1047
+#: ../pidgin/gtknotify.c:1060 ../pidgin/gtknotify.c:1197
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
+#: ../pidgin/gtknotify.c:1045 ../pidgin/gtknotify.c:1058
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar Â«%sÂ»: %s"
 
-#: ../pidgin/gtknotify.c:1173
+#: ../pidgin/gtknotify.c:1198
 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."
 
-#: ../pidgin/gtkplugin.c:270
+#: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
 
-#: ../pidgin/gtkplugin.c:289
+#: ../pidgin/gtkplugin.c:297
 msgid "Multiple plugins will be unloaded."
 msgstr "Se desactivarÃ¡n mÃºltiples complementos."
 
-#: ../pidgin/gtkplugin.c:293
+#: ../pidgin/gtkplugin.c:301
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../pidgin/gtkplugin.c:313
+#: ../pidgin/gtkplugin.c:318
 msgid "Could not unload plugin"
 msgstr "No se pudo descargar el complemente"
 
-#: ../pidgin/gtkplugin.c:314
+#: ../pidgin/gtkplugin.c:319
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -16471,37 +16555,36 @@ msgstr ""
 "No se pudo descargar el complemento, se deshabilitarÃ¡ la prÃ³xima vez que "
 "arranque el programa."
 
-#: ../pidgin/gtkplugin.c:422
+#: ../pidgin/gtkplugin.c:454
 #, c-format
 msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
-"<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
-"<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"
-
-#: ../pidgin/gtkplugin.c:432
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\\n\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\\n\n"
 "Compruebe el sitio web del complemento para obtener una actualizaciÃ³n.</span>"
 
-#: ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkplugin.c:583
 msgid "Author"
 msgstr "Autor"
 
-#: ../pidgin/gtkplugin.c:610
+#: ../pidgin/gtkplugin.c:661
+msgid "<b>Written by:</b>"
+msgstr "<b>Escrito por:</b>"
+
+#: ../pidgin/gtkplugin.c:685
+msgid "<b>Web site:</b>"
+msgstr "<b>Sitio web:</b>"
+
+#: ../pidgin/gtkplugin.c:694
+msgid "<b>Filename:</b>"
+msgstr "<b>Nombre del fichero:</b>"
+
+#: ../pidgin/gtkplugin.c:720
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
 
-#: ../pidgin/gtkplugin.c:677
+#: ../pidgin/gtkplugin.c:788
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"
 
@@ -16624,132 +16707,144 @@ msgstr "Icono"
 msgid "Icon"
 msgstr "Icono"
 
-#: ../pidgin/gtkprefs.c:843
+#: ../pidgin/gtkprefs.c:894
+msgid "Keyboard Shortcuts"
+msgstr "Atajos de teclado"
+
+#: ../pidgin/gtkprefs.c:914
+msgid "Cl_ose conversations with the Escape key"
+msgstr "C_errrar las conversaciones con la tecla Esc"
+
+#: ../pidgin/gtkprefs.c:943
 msgid "System Tray Icon"
 msgstr "Icono del Ã¡rea de notificaciÃ³n del sistema"
 
-#: ../pidgin/gtkprefs.c:844
+#: ../pidgin/gtkprefs.c:944
 msgid "_Show system tray icon:"
 msgstr "_Mostrar icono del Ã¡rea de notificaciÃ³n del sistema:"
 
-#: ../pidgin/gtkprefs.c:847
+#: ../pidgin/gtkprefs.c:947
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
 
-#: ../pidgin/gtkprefs.c:853
+#: ../pidgin/gtkprefs.c:953
 msgid "Conversation Window Hiding"
 msgstr "Ocultar ventana de conversaciÃ³n"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:954
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
 
-#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:957 ../pidgin/gtkprefs.c:2075
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:965
 msgid "Tabs"
 msgstr "Solapas"
 
-#: ../pidgin/gtkprefs.c:867
+#: ../pidgin/gtkprefs.c:967
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas con _solapas"
 
-#: ../pidgin/gtkprefs.c:881
+#: ../pidgin/gtkprefs.c:981
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botones de _cierre en las solapas"
 
-#: ../pidgin/gtkprefs.c:884
+#: ../pidgin/gtkprefs.c:984
 msgid "_Placement:"
 msgstr "_ColocaciÃ³n:"
 
-#: ../pidgin/gtkprefs.c:886
+#: ../pidgin/gtkprefs.c:986
 msgid "Top"
 msgstr "Arriba"
 
-#: ../pidgin/gtkprefs.c:887
+#: ../pidgin/gtkprefs.c:987
 msgid "Bottom"
 msgstr "Abajo"
 
-#: ../pidgin/gtkprefs.c:888
+#: ../pidgin/gtkprefs.c:988
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../pidgin/gtkprefs.c:889
+#: ../pidgin/gtkprefs.c:989
 msgid "Right"
 msgstr "Derecha"
 
-#: ../pidgin/gtkprefs.c:891
+#: ../pidgin/gtkprefs.c:991
 msgid "Left Vertical"
 msgstr "Vertical a la izquierda"
 
-#: ../pidgin/gtkprefs.c:892
+#: ../pidgin/gtkprefs.c:992
 msgid "Right Vertical"
 msgstr "Vertical a la derecha"
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:999
 msgid "N_ew conversations:"
 msgstr "_Nuevas conversaciones:"
 
-#: ../pidgin/gtkprefs.c:944
+#: ../pidgin/gtkprefs.c:1048
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
-#: ../pidgin/gtkprefs.c:946
+#: ../pidgin/gtkprefs.c:1050
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Cerrar MIs inmediatamente cuando se cierra la pestaÃ±a"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1053
 msgid "Show _detailed information"
 msgstr "Mostrar informaciÃ³n _detallada"
 
-#: ../pidgin/gtkprefs.c:951
+#: ../pidgin/gtkprefs.c:1055
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: ../pidgin/gtkprefs.c:958
+#: ../pidgin/gtkprefs.c:1062
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les estÃ© escribiendo"
 
-#: ../pidgin/gtkprefs.c:961
+#: ../pidgin/gtkprefs.c:1065
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografÃa"
 
-#: ../pidgin/gtkprefs.c:965
+#: ../pidgin/gtkprefs.c:1069
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"
 
-#: ../pidgin/gtkprefs.c:968
+#: ../pidgin/gtkprefs.c:1072
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"
 
-#: ../pidgin/gtkprefs.c:970
+#: ../pidgin/gtkprefs.c:1074
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar las nuevas ventana de conversaciÃ³n"
 
-#: ../pidgin/gtkprefs.c:974
+#: ../pidgin/gtkprefs.c:1078
+msgid "Minimum input area height in lines:"
+msgstr "Altura mÃnima del Ã¡rea de entrada en lÃneas:"
+
+#: ../pidgin/gtkprefs.c:1084
 msgid "Font"
 msgstr "TipografÃa"
 
-#: ../pidgin/gtkprefs.c:976
+#: ../pidgin/gtkprefs.c:1086
 msgid "Use document font from _theme"
 msgstr "Utilizar la tipografÃa de documento del _tema"
 
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1088
 msgid "Use font from _theme"
 msgstr "Utilizar la tipografÃa del _tema"
 
-#: ../pidgin/gtkprefs.c:984
+#: ../pidgin/gtkprefs.c:1094
 msgid "Conversation _font:"
 msgstr "TipografÃa para las conversaciones:"
 
-#: ../pidgin/gtkprefs.c:991
+#: ../pidgin/gtkprefs.c:1101
 msgid "Default Formatting"
 msgstr "Formato por omisiÃ³n"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1120
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16757,63 +16852,63 @@ msgstr ""
 "AsÃ se verÃ¡ el texto de los mensajes que envÃe cuando utilice protocolos que "
 "soportan el formateo."
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1180
 msgid "Cannot start proxy configuration program."
 msgstr "No se pudo iniciar el programa de configuraciÃ³n de proxy."
 
-#: ../pidgin/gtkprefs.c:1082
+#: ../pidgin/gtkprefs.c:1192
 msgid "Cannot start browser configuration program."
 msgstr "No se pudo iniciar el programa de configuraciÃ³n del navegador."
 
-#: ../pidgin/gtkprefs.c:1102
+#: ../pidgin/gtkprefs.c:1212
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1224
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1118
+#: ../pidgin/gtkprefs.c:1228
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la direcciÃ³n IP"
 
-#: ../pidgin/gtkprefs.c:1127
+#: ../pidgin/gtkprefs.c:1237
 msgid "Public _IP:"
 msgstr "_IP pÃºblica:"
 
-#: ../pidgin/gtkprefs.c:1158
+#: ../pidgin/gtkprefs.c:1268
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../pidgin/gtkprefs.c:1161
+#: ../pidgin/gtkprefs.c:1271
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activar reenvÃo de puertos automÃ¡tico"
 
-#: ../pidgin/gtkprefs.c:1164
+#: ../pidgin/gtkprefs.c:1274
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escucharÃ¡"
 
-#: ../pidgin/gtkprefs.c:1167
+#: ../pidgin/gtkprefs.c:1277
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1174
+#: ../pidgin/gtkprefs.c:1284
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1292
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy y navegador"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1300
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>No se encontrÃ³ el programa de configuraciÃ³n del proxy.</b>"
 
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1308
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>No se encontrÃ³ el programa de configuraciÃ³n del navegador.</b>"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1313
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16821,99 +16916,99 @@ msgstr ""
 "Puede configurar las preferencias del proxy y del navegador\n"
 "en las preferencias de GNOME."
 
-#: ../pidgin/gtkprefs.c:1210
+#: ../pidgin/gtkprefs.c:1320
 msgid "Configure _Proxy"
 msgstr "Configurar _proxy"
 
-#: ../pidgin/gtkprefs.c:1215
+#: ../pidgin/gtkprefs.c:1325
 msgid "Configure _Browser"
 msgstr "Configurar _navegador"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkprefs.c:1336
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkprefs.c:1282
+#: ../pidgin/gtkprefs.c:1392
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1370
+#: ../pidgin/gtkprefs.c:1480
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1371
+#: ../pidgin/gtkprefs.c:1481
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1372
+#: ../pidgin/gtkprefs.c:1482
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1373
+#: ../pidgin/gtkprefs.c:1483
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1374
+#: ../pidgin/gtkprefs.c:1484
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1375
+#: ../pidgin/gtkprefs.c:1485
 msgid "Desktop Default"
 msgstr "Valores por omisiÃ³n del escritorio"
 
-#: ../pidgin/gtkprefs.c:1376
+#: ../pidgin/gtkprefs.c:1486
 msgid "GNOME Default"
 msgstr "Valores por omisiÃ³n de Gnome"
 
-#: ../pidgin/gtkprefs.c:1377
+#: ../pidgin/gtkprefs.c:1487
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1378
+#: ../pidgin/gtkprefs.c:1488
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1379
+#: ../pidgin/gtkprefs.c:1489
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1380
+#: ../pidgin/gtkprefs.c:1490
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1389
+#: ../pidgin/gtkprefs.c:1499
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1450
+#: ../pidgin/gtkprefs.c:1560
 msgid "Browser Selection"
 msgstr "SelecciÃ³n de navegador"
 
-#: ../pidgin/gtkprefs.c:1454
+#: ../pidgin/gtkprefs.c:1564
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1462
+#: ../pidgin/gtkprefs.c:1572
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../pidgin/gtkprefs.c:1464
+#: ../pidgin/gtkprefs.c:1574
 msgid "Browser default"
 msgstr "Navegador por omisiÃ³n"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1575
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1577
 msgid "New tab"
 msgstr "Nueva solapa"
 
-#: ../pidgin/gtkprefs.c:1484
+#: ../pidgin/gtkprefs.c:1594
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16922,63 +17017,63 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkprefs.c:1620
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../pidgin/gtkprefs.c:1515
+#: ../pidgin/gtkprefs.c:1625
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantÃ¡neos"
 
-#: ../pidgin/gtkprefs.c:1517
+#: ../pidgin/gtkprefs.c:1627
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../pidgin/gtkprefs.c:1519
+#: ../pidgin/gtkprefs.c:1629
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../pidgin/gtkprefs.c:1669
+#: ../pidgin/gtkprefs.c:1779
 msgid "Sound Selection"
 msgstr "SelecciÃ³n de sonido"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1789
 msgid "Quietest"
 msgstr "El mÃ¡s silencioso"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1791
 msgid "Quieter"
 msgstr "MÃ¡s silencioso"
 
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1793
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1797
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1689
+#: ../pidgin/gtkprefs.c:1799
 msgid "Louder"
 msgstr "MÃ¡s ruidoso"
 
-#: ../pidgin/gtkprefs.c:1691
+#: ../pidgin/gtkprefs.c:1801
 msgid "Loudest"
 msgstr "El mÃ¡s ruidoso"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Method:"
 msgstr "_MÃ©todo:"
 
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1866
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1873
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../pidgin/gtkprefs.c:1776
+#: ../pidgin/gtkprefs.c:1886
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16987,81 +17082,81 @@ msgstr ""
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../pidgin/gtkprefs.c:1785
+#: ../pidgin/gtkprefs.c:1895
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversaciÃ³n obtiene el _foco"
 
-#: ../pidgin/gtkprefs.c:1787
+#: ../pidgin/gtkprefs.c:1897
 msgid "Enable sounds:"
 msgstr "Habilitar sonidos:"
 
-#: ../pidgin/gtkprefs.c:1804
+#: ../pidgin/gtkprefs.c:1914
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: ../pidgin/gtkprefs.c:1871
+#: ../pidgin/gtkprefs.c:1981
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2063
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratÃ³n"
 
-#: ../pidgin/gtkprefs.c:1962
+#: ../pidgin/gtkprefs.c:2072
 msgid "_Auto-reply:"
 msgstr "Respuesta _automÃ¡tica:"
 
-#: ../pidgin/gtkprefs.c:1966
+#: ../pidgin/gtkprefs.c:2076
 msgid "When both away and idle"
 msgstr "Cuando estÃ¡ ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1972
+#: ../pidgin/gtkprefs.c:2082
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:1974
+#: ../pidgin/gtkprefs.c:2084
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando estÃ© _inactivo"
 
-#: ../pidgin/gtkprefs.c:1978
+#: ../pidgin/gtkprefs.c:2088
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"
 
-#: ../pidgin/gtkprefs.c:1985
+#: ../pidgin/gtkprefs.c:2095
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1998
+#: ../pidgin/gtkprefs.c:2108
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../pidgin/gtkprefs.c:2000
+#: ../pidgin/gtkprefs.c:2110
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi Ãºltima _salida al empezar"
 
-#: ../pidgin/gtkprefs.c:2007
+#: ../pidgin/gtkprefs.c:2117
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2146
 msgid "Interface"
 msgstr "Interfaz"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2148
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2155
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2049
+#: ../pidgin/gtkprefs.c:2159
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
@@ -17156,23 +17251,23 @@ msgstr "Aplicar"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1503
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Â¿Quiere sobreescribirlo?"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"
 
-#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."
 
@@ -17226,37 +17321,41 @@ msgstr "Estado de %s"
 msgid "Status for %s"
 msgstr "Estado de %s"
 
-#: ../pidgin/gtkstatusbox.c:683
+#: ../pidgin/gtkstatusbox.c:688
 msgid "Waiting for network connection"
 msgstr "Esperando la conexiÃ³n a la red"
 
-#: ../pidgin/gtkstatusbox.c:1096
+#: ../pidgin/gtkstatusbox.c:1101
 msgid "New status..."
 msgstr "Nuevo estado..."
 
-#: ../pidgin/gtkstatusbox.c:1097
+#: ../pidgin/gtkstatusbox.c:1102
 msgid "Saved statuses..."
 msgstr "Estados guardados..."
 
-#: ../pidgin/gtkutils.c:683
+#: ../pidgin/gtkstatusbox.c:1737
+msgid "Status Selector"
+msgstr "Selector de estado"
+
+#: ../pidgin/gtkutils.c:685
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1475
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Se ha producido el siguiente error al cargar %s: %s"
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
+#: ../pidgin/gtkutils.c:1455 ../pidgin/gtkutils.c:1477
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../pidgin/gtkutils.c:1549
+#: ../pidgin/gtkutils.c:1551
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1552
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -17265,12 +17364,12 @@ msgstr ""
 "%s no puede transferir una carpeta. TendrÃ¡ que enviar los archivos que "
 "contiene individualmente."
 
-#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
-#: ../pidgin/gtkutils.c:1603
+#: ../pidgin/gtkutils.c:1586 ../pidgin/gtkutils.c:1598
+#: ../pidgin/gtkutils.c:1605
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: ../pidgin/gtkutils.c:1585
+#: ../pidgin/gtkutils.c:1587
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -17278,23 +17377,23 @@ msgstr ""
 "Puede enviar esta imagen como una transferencia de archivo, introducirla en "
 "el mensaje, o usarla como icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1613
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
+#: ../pidgin/gtkutils.c:1594 ../pidgin/gtkutils.c:1614
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
+#: ../pidgin/gtkutils.c:1595 ../pidgin/gtkutils.c:1614
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"
 
-#: ../pidgin/gtkutils.c:1597
+#: ../pidgin/gtkutils.c:1599
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Â¿Desea establecerla como el icono de amigo para este usuario?"
 
-#: ../pidgin/gtkutils.c:1604
+#: ../pidgin/gtkutils.c:1606
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -17302,7 +17401,7 @@ msgstr ""
 "Puede enviar esta imagen como una transferencia de archivo, o usarla como "
 "icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1605
+#: ../pidgin/gtkutils.c:1607
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17315,11 +17414,11 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1664
+#: ../pidgin/gtkutils.c:1666
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: ../pidgin/gtkutils.c:1664
+#: ../pidgin/gtkutils.c:1666
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -17327,7 +17426,7 @@ msgstr ""
 "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Ã."
 
-#: ../pidgin/gtkutils.c:2402
+#: ../pidgin/gtkutils.c:2404
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17338,27 +17437,27 @@ msgstr ""
 "<b>TamaÃ±o de archivo:</b> %s\n"
 "<b>TamaÃ±o de imagen:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2704
+#: ../pidgin/gtkutils.c:2706
 #, 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"
 
-#: ../pidgin/gtkutils.c:2706
+#: ../pidgin/gtkutils.c:2708
 msgid "Icon Error"
 msgstr "Error en icono"
 
-#: ../pidgin/gtkutils.c:2707
+#: ../pidgin/gtkutils.c:2709
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"
 
-#: ../pidgin/gtkutils.c:2807
+#: ../pidgin/gtkutils.c:2809
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo Â«%sÂ»: %s"
 
-#: ../pidgin/gtkutils.c:2856
+#: ../pidgin/gtkutils.c:2858
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17464,13 +17563,8 @@ msgstr "Complemento de predicciÃ³n de di
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:897
-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."
+msgid "Displays statistical information about your buddies' availability"
+msgstr "Muestra informaciÃ³n estadÃstica de la disponibilidad de sus amigos"
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -17676,20 +17770,17 @@ msgid ""
 #. *  description
 #: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" â€¢ Drag down and then to the right to close a conversation.\n"
+" â€¢ Drag up and then to the left to switch to the previous conversation.\n"
+" â€¢ Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "AÃ±ade soporte de gestos del ratÃ³n en las ventanas de conversaciÃ³n.\n"
-"Arrastre con el botÃ³n central del ratÃ³n para realizar las siguientes "
-"acciones:\n"
-"\n"
-"Abajo y despuÃ©s a la derecha para cerrar una ventana de conversaciÃ³n.\n"
-"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."
+"Arrastre con el botÃ³n central del ratÃ³n para realizar las siguientes acciones:\n"
+" â€¢ Abajo y despuÃ©s a la derecha para cerrar una ventana de conversaciÃ³n.\n"
+" â€¢ 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."
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
@@ -17795,9 +17886,8 @@ msgstr "Introduzca la informaciÃ³n de la
 msgstr "Introduzca la informaciÃ³n de la persona a continuaciÃ³n."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-"Introduzca el nombre de usuario de su amigo y el tipo de cuenta mÃ¡s abajo."
+msgid "Please enter the buddy's username and account type below."
+msgstr "Introduzca a continuaciÃ³n el nombre de usuario de su amigo y el tipo de cuenta."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
@@ -17850,7 +17940,7 @@ msgstr ""
 "\n"
 "<b>Nota de amigo:</b> %s"
 
-#: ../pidgin/plugins/history.c:195
+#: ../pidgin/plugins/history.c:201
 msgid "History"
 msgstr "HistÃ³rico"
 
@@ -17897,15 +17987,19 @@ msgstr ""
 msgstr ""
 "Dibuja una lÃnea para indicar que hay nuevos mensajes en una conversaciÃ³n."
 
-#: ../pidgin/plugins/markerline.c:246
+#: ../pidgin/plugins/markerline.c:240
+msgid "Jump to markerline"
+msgstr "Saltar al subrayado"
+
+#: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "Dibujar lÃnea de marcador en "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "Ventanas de M_I"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "Ventanas de _chat"
 
@@ -17973,74 +18067,79 @@ msgstr ""
 "tiempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
+#: ../pidgin/plugins/notify.c:689
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
+#: ../pidgin/plugins/notify.c:708
+msgid "\t_Only when someone says your username"
 msgstr "\t_SÃ³lo si alguien menciona su nombre de usuario"
 
-#: ../pidgin/plugins/notify.c:707
+#: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
 msgstr "Ventanas _enfocadas"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
+#: ../pidgin/plugins/notify.c:726
 msgid "Notification Methods"
 msgstr "MÃ©todos de notificaciÃ³n"
 
-#: ../pidgin/plugins/notify.c:722
+#: ../pidgin/plugins/notify.c:733
 msgid "Prepend _string into window title:"
 msgstr "Prefijar la _cadena en el tÃtulo de la ventana:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
+#: ../pidgin/plugins/notify.c:752
 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
-#: ../pidgin/plugins/notify.c:750
+#: ../pidgin/plugins/notify.c:761
 msgid "Insert count of new message into _X property"
 msgstr "Insertar el nÃºmero de mensajes nuevos en la propiedad _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
+#: ../pidgin/plugins/notify.c:769
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista Â«_URGENTEÂ» del gestor de ventanas"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
+#: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
 msgstr "_Subir la ventana de conversaciÃ³n"
 
+#. Present conversation method button
+#: ../pidgin/plugins/notify.c:786
+msgid "_Present conversation window"
+msgstr "_Mostrar la ventana de conversaciÃ³n"
+
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
+#: ../pidgin/plugins/notify.c:794
 msgid "Notification Removal"
 msgstr "EliminaciÃ³n de la notificaciÃ³n"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
+#: ../pidgin/plugins/notify.c:799
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cuando la ventana de la conversaciÃ³n obtiene el _foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
+#: ../pidgin/plugins/notify.c:806
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversaciÃ³n _recibe una pulsaciÃ³n"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
+#: ../pidgin/plugins/notify.c:814
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _escriba en la ventana de la conversaciÃ³n"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
+#: ../pidgin/plugins/notify.c:822
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cuando se envÃe un _mensaje"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
+#: ../pidgin/plugins/notify.c:831
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar al cambiar de _solapa de conversaciÃ³n"
 
@@ -18050,7 +18149,7 @@ msgstr "Eliminar al cambiar de _solapa d
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:905
+#: ../pidgin/plugins/notify.c:924
 msgid "Message Notification"
 msgstr "NotificaciÃ³n de mensajes"
 
@@ -18058,7 +18157,7 @@ msgstr "NotificaciÃ³n de mensajes"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:908 ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:927 ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -18263,6 +18362,31 @@ msgstr ""
 "Comprueba periÃ³dicamente si hay nuevas versiones disponibles y notifica al "
 "usuario mostrÃ¡ndole el registro de cambios."
 
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/sendbutton.c:138
+msgid "Send Button"
+msgstr "BotÃ³n Â«enviarÂ»"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/sendbutton.c:140
+msgid "Conversation Window Send Button."
+msgstr "BotÃ³n Â«enviarÂ» de la ventana de conversaciÃ³n."
+
+#. *< summary
+#: ../pidgin/plugins/sendbutton.c:141
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr "AÃ±ade un botÃ³n Â«EnviarÂ» al Ã¡rea de entrada de datos de la ventana de conversaciÃ³n. Ãštil para cuando no hay un teclado fÃsico disponible."
+
 #: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "CorrecciÃ³n duplicada"
@@ -18600,6 +18724,51 @@ msgstr "Este complemento es Ãºtil para d
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es Ãºtil para depurar clientes o servidores XMPP."
 
+#~ msgid "Screen name:"
+#~ msgstr "Nombre de usuario:"
+
+#~ msgid "Screen Name"
+#~ msgstr "Nombre de usuario"
+
+#~ msgid "Someone says your screen name in chat"
+#~ msgstr "Alguien dice su nombre de usuario en el chat"
+
+#~ msgid ""
+#~ "This server requires plaintext authentication over an unencrypted "
+#~ "connection.  Allow this and continue authentication?"
+#~ msgstr ""
+#~ "El servidor solicita autenticaciÃ³n en claro sobre un canal no cifrado. "
+#~ "Â¿Permitir Ã©sto y continuar con el proceso de autenticaciÃ³n?"
+
+#~ msgid "Use GSSAPI (Kerberos v5) for authentication"
+#~ msgstr "Usar GSSAPI (Kerberos v5) en la autenticaciÃ³n"
+
+#~ msgid "Invalid screen name"
+#~ msgstr "Nombre de usuario no vÃ¡lido"
+
+#~ msgid "Invalid screen name."
+#~ msgstr "Nombre de usuario no vÃ¡lido"
+
+#~ msgid "Screen _name:"
+#~ msgstr "_Nombre de usuario:"
+
+#~ msgid ""
+#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
+#~ msgstr ""
+#~ "%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
+#~ "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"
+
+#~ 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."
+
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "SÃ³lo avisar cuando mi estado es Â«no disponibleÂ»"
 
@@ -19024,9 +19193,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Jabber Account"
 #~ msgstr "Cuenta Jabber"
 
-#~ msgid "Cannot join %s:"
-#~ msgstr "No se puede unir a %s:"
-
 #~ msgid "Server couldn't authenticate you without a password"
 #~ msgstr "El servidor no pudo autenticarle sin una contraseÃ±a"
 
@@ -19284,9 +19450,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ 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"
 
@@ -19363,9 +19526,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Change Your QQ Face"
 #~ msgstr "Cambiaar tu cara QQ"
 
-#~ msgid "Change Face"
-#~ msgstr "Cambiar cara"
-
 #~ msgid "Update"
 #~ msgstr "Actualizar"
 
@@ -19846,9 +20006,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ " Intente habilitar servidores proxy para las transferencias de ficheros "
 #~ "en Herramientas->Preferencias->AIM/ICQ."
 
-#~ msgid "(pending)"
-#~ msgstr "(Pendiente)"
-
 #~ msgid "Show Privacy Options..."
 #~ msgstr "Mostrar opciones de privacidad..."
 
@@ -20583,9 +20740,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Message Text"
 #~ msgstr "Texto de los mensajes"
 
-#~ msgid "Shortcuts"
-#~ msgstr "Atajos"
-
 #~ msgid "Please create an account."
 #~ msgstr "Por favor, cree una cuenta."
 
@@ -21086,9 +21240,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Buddy Icons"
 #~ msgstr "Iconos de amigos"
 
-#~ msgid "Typing Notification"
-#~ msgstr "NotificaciÃ³n de tecleo"
-
 #~ msgid "Co_lorize screen names"
 #~ msgstr "Co_lorear nombres de usuarios"
 
@@ -21945,9 +22096,6 @@ msgstr "Este complemento es Ãºtil para d
 #~ msgid "Gaim - Save Image"
 #~ msgstr "Gaim - Guardar Imagen"
 
-#~ msgid "Received: '%s'\n"
-#~ msgstr "Recibido: '%s'\n"
-
 #~ msgid "Auto-Login"
 #~ msgstr "Auto conectarse"
 
