Mercurial > pidgin.yaz

--- a/po/ChangeLog	Sat Mar 29 16:03:16 2008 +0000
+++ b/po/ChangeLog	Sat Mar 29 19:02:13 2008 +0000
@@ -13,6 +13,7 @@
 	* Hebrew translation updated (Shalom Craimer)
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Russian translation updated (Dmitry Beloglazov)
+	* Spanish translation updated (Javier Fernández-Sanguino)
 	* Swedish translation updated (Peter Hjalmarsson)

 version 2.4.0
--- a/po/es.po	Sat Mar 29 16:03:16 2008 +0000
+++ b/po/es.po	Sat Mar 29 19:02:13 2008 +0000
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-03 03:21-0500\n"
-"PO-Revision-Date: 2007-12-05 03:18+0100\n"
+"POT-Creation-Date: 2008-03-27 03:24-0400\n"
+"PO-Revision-Date: 2008-03-29 13:48+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@
 "  -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:730
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:737
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -108,18 +108,18 @@
 "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:334
-#: ../finch/gntblist.c:467 ../finch/gntblist.c:480 ../finch/gntplugin.c:189
-#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../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:2032
+#: ../libpurple/protocols/jabber/buddy.c:2079
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1594
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
+#: ../libpurple/protocols/silc/ops.c:1475
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
@@ -148,8 +148,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Posiblemente se olvido de ejecutar 'make install'.)"

-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4533
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4588
 msgid "Modify Account"
 msgstr "Modificar cuenta"

@@ -162,7 +162,7 @@
 msgstr "Protocolo:"

 #: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Screen name:"
 msgstr "Nombre de usuario:"

@@ -176,37 +176,40 @@

 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:378 ../finch/gntblist.c:455
-#: ../finch/gntblist.c:490 ../finch/gntblist.c:836 ../finch/gntblist.c:1038
-#: ../finch/gntblist.c:1134 ../finch/gntblist.c:2271 ../finch/gntblist.c:2334
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1105
-#: ../libpurple/account.c:1394 ../libpurple/account.c:1429
-#: ../libpurple/conversation.c:1215 ../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:728
-#: ../libpurple/protocols/jabber/buddy.c:2426
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../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
-#: ../libpurple/protocols/jabber/jabber.c:1026
-#: ../libpurple/protocols/jabber/jabber.c:1035
-#: ../libpurple/protocols/jabber/jabber.c:1739
+#: ../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/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/jabber/xdata.c:403
+#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:373 ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:335
+#: ../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/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -214,23 +217,23 @@
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
+#: ../libpurple/protocols/qq/group_opt.c:120
+#: ../libpurple/protocols/qq/group_opt.c:375
+#: ../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/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:1820
+#: ../libpurple/protocols/silc/ops.c:1835
 #: ../libpurple/protocols/silc/silc.c:966
 #: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -238,41 +241,41 @@
 #: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6736
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:780
-#: ../pidgin/gtkdialogs.c:919 ../pidgin/gtkdialogs.c:1011
-#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1055
-#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1125
-#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1222
-#: ../pidgin/gtkdialogs.c:1261 ../pidgin/gtkdialogs.c:1288
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:272 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../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
+#: ../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
 msgid "Cancel"
 msgstr "Cancelar"

 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:278
+#: ../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
 msgid "Save"
 msgstr "Guardar"

-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
@@ -282,127 +285,146 @@
 msgstr "Borrar cuenta"

 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
+#: ../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:1912 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
+#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "Borrar"

-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2168 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2471 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Cuentas"

-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puede (desh)habilitar cuentas de la lista a continuación."

 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:377
-#: ../finch/gntblist.c:455 ../finch/gntblist.c:490 ../finch/gntblist.c:2426
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../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/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:2500
-#: ../pidgin/gtkblist.c:6735 ../pidgin/gtkconv.c:1666
-#: ../pidgin/gtkrequest.c:276
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
+#: ../pidgin/gtkblist.c:6795 ../pidgin/gtkconv.c:1696
+#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Añadir"

 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
+#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Modificar"

-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
 #, 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:884 ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "¿Desea añadir el amigo a su lista?"

-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
 #, 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:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
-#: ../pidgin/gtkaccount.c:2586
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
+#: ../pidgin/gtkaccount.c:2488
 msgid "Authorize buddy?"
 msgstr "¿Autorizar al amigo?"

-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "Autorizar"

-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
+#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "Denegar"

-#: ../finch/gntblist.c:323
+#: ../finch/gntblist.c:265
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"En línea: %d\n"
+"Total: %d"
+
+#: ../finch/gntblist.c:274
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Cuenta: %s (%s)"
+
+#: ../finch/gntblist.c:286
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Visto por última vez: hace %s"
+
+#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "(por omisión)"
+
+#: ../finch/gntblist.c:563
 msgid "You must provide a screename for the buddy."
 msgstr "Debe dar un nombre de usuario para el amigo."

-#: ../finch/gntblist.c:325
+#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "Debe indicar un grupo."

-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "Debe seleccionar una cuenta."

-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "La cuenta seleccionada no está conectada."

-#: ../finch/gntblist.c:334
+#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "Error al añadir al amigo"

-#: ../finch/gntblist.c:359 ../libpurple/protocols/oscar/oscar.c:2893
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
+#: ../finch/gntblist.c:601 ../pidgin/gtkaccount.c:1914
+#: ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "Nombre de usuario"

-#: ../finch/gntblist.c:362 ../finch/gntblist.c:444 ../finch/gntblist.c:1283
-#: ../libpurple/protocols/msn/msn.c:1551
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1030
-#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1076
-#: ../pidgin/gtkrequest.c:279
-msgid "Alias"
-msgstr "Apodo"
-
-#: ../finch/gntblist.c:365 ../finch/gntblist.c:447
-msgid "Group"
-msgstr "Grupo"
-
-#: ../finch/gntblist.c:369 ../finch/gntblist.c:435 ../finch/gntblist.c:1338
-#: ../finch/gntblist.c:2257 ../finch/gntblist.c:2321 ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3247
-#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1280
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:604
+msgid "Alias (optional)"
+msgstr "Apodo (opcional)"
+
+#: ../finch/gntblist.c:607
+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
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3237 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Cuenta"

-#: ../finch/gntblist.c:375 ../finch/gntblist.c:885
+#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -411,298 +433,306 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3353 ../pidgin/gtkblist.c:6224
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6344
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "Añadir amigo"

-#: ../finch/gntblist.c:375
+#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "Introduzca la información del amigo."

-#: ../finch/gntblist.c:404 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Chats"

 #. Extract their Name and put it in
-#: ../finch/gntblist.c:441 ../finch/gntblist.c:2252
-#: ../libpurple/protocols/jabber/jabber.c:954
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:599
-#: ../pidgin/gtkroomlist.c:931
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2580 ../finch/gntblist.c:2636
+#: ../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
+#: ../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:450 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../libpurple/protocols/silc/chat.c:610
+#: ../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
+#: ../pidgin/gtkrequest.c:280
+msgid "Alias"
+msgstr "Apodo"
+
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2839
+msgid "Group"
+msgstr "Grupo"
+
+#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "Conectarse automáticamente"

-#: ../finch/gntblist.c:453 ../finch/gntblist.c:887 ../pidgin/gtkblist.c:6620
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6709
 msgid "Add Chat"
 msgstr "Añadir chat"

-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:697
 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:467 ../finch/gntblist.c:480
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "Error al añadir al grupo"

-#: ../finch/gntblist.c:468
+#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a añadir."

-#: ../finch/gntblist.c:481
+#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"

-#: ../finch/gntblist.c:488 ../finch/gntblist.c:889
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6732
+#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtkblist.c:6792
 msgid "Add Group"
 msgstr "Añadir grupo"

-#: ../finch/gntblist.c:488
+#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"

-#: ../finch/gntblist.c:835
+#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr "Editar chat"

-#: ../finch/gntblist.c:835
+#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."

-#: ../finch/gntblist.c:836 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"

-#: ../finch/gntblist.c:861
+#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "Editar configuración"

-#: ../finch/gntblist.c:897 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Información"

-#: ../finch/gntblist.c:897 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 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:937 ../finch/gntconv.c:535
+#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
 #: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"

-#: ../finch/gntblist.c:941
+#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "Añadir aviso de amigo"

 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:948 ../finch/gntconv.c:547
+#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
 #: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1614
+#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1644
 msgid "Send File"
 msgstr "Enviar archivo"

-#: ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1210 ../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
 msgid "View Log"
 msgstr "Ver registro"

-#: ../finch/gntblist.c:1033
+#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"

-#: ../finch/gntblist.c:1035 ../finch/gntblist.c:1283
+#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "Renombrar"

-#: ../finch/gntblist.c:1035
+#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "Fijar el apodo"

-#: ../finch/gntblist.c:1036
+#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vacía para resetear el nombre."

-#: ../finch/gntblist.c:1112
+#: ../finch/gntblist.c:1415
 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:1120
+#: ../finch/gntblist.c:1423
 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:1125
+#: ../finch/gntblist.c:1428
 #, 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:1128
+#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"

-#: ../finch/gntblist.c:1133 ../finch/gntblist.c:1285 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1663 ../pidgin/gtkrequest.c:277
-#: ../pidgin/gtkstatusbox.c:264
+#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1693 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "Quitar"

 #. Buddy List
-#: ../finch/gntblist.c:1259 ../finch/gntblist.c:2479 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2927 ../pidgin/gtkblist.c:4961
+#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2880 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5083
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"

-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr "Lugares marcados"

-#: ../finch/gntblist.c:1295
+#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr "Cambiar marca"

 #. General
-#: ../finch/gntblist.c:1331 ../libpurple/protocols/gg/gg.c:638
+#: ../finch/gntblist.c:1641 ../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:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2409
-#: ../libpurple/protocols/jabber/jabber.c:965
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1594
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
+#: ../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/jabber.c:1002
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msnp9/msn.c:1421
+#: ../libpurple/protocols/msnp9/msn.c:1598
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1201
+#: ../libpurple/protocols/silc/ops.c:1339
 #: ../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:1066 ../pidgin/gtkblist.c:3271
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3261
 msgid "Nickname"
 msgstr "Apodo"

 #. Idle stuff
-#: ../finch/gntblist.c:1353 ../finch/gntprefs.c:261
+#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
 #: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../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:2842
-#: ../libpurple/protocols/oscar/oscar.c:2917
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3299
-#: ../pidgin/gtkblist.c:3705 ../pidgin/gtkprefs.c:2026
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2980
+#: ../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
 msgid "Idle"
 msgstr "Está inactivo"

 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../finch/gntblist.c:1367
+#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr "En el móvil"

-#: ../finch/gntblist.c:1448
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"En línea: %d\n"
-"Total: %d"
-
-#: ../finch/gntblist.c:1457
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Cuenta: %s (%s)"
-
-#: ../finch/gntblist.c:1469
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Visto por última vez: hace %s"
-
-#: ../finch/gntblist.c:1738 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1978 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nuevo..."

-#: ../finch/gntblist.c:1745 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1985 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Guardado..."

-#: ../finch/gntblist.c:2136 ../finch/gntplugin.c:345 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:548
+#: ../finch/gntblist.c:2439 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:605
 msgid "Plugins"
 msgstr "Complementos"

-#: ../finch/gntblist.c:2265 ../pidgin/gtkdialogs.c:774
-msgid "New Instant Message"
-msgstr "Mensaje instantáneo nuevo"
-
-#: ../finch/gntblist.c:2267 ../pidgin/gtkdialogs.c:776
-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:2593 ../finch/gntblist.c:2598
+msgid "Block/Unblock"
+msgstr "Bloquear/Desbloquear"
+
+#: ../finch/gntblist.c:2594 ../libpurple/protocols/gg/gg.c:1665
+msgid "Block"
+msgstr "Bloquear"
+
+#: ../finch/gntblist.c:2595 ../libpurple/protocols/gg/gg.c:1661
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: ../finch/gntblist.c:2600
+msgid ""
+"Please enter the screen name 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."

 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2270 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../finch/plugins/gnthistory.c:180
-#: ../libpurple/account.c:1104 ../libpurple/account.c:1393
-#: ../libpurple/protocols/gg/gg.c:507 ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1738
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6118
+#: ../finch/gntblist.c:2603 ../finch/gntblist.c:2654 ../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/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1786
+#: ../libpurple/protocols/jabber/xdata.c:402
+#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
+#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:300
+#: ../libpurple/protocols/msnp9/msn.c:317
+#: ../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/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:1293
-#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1834
 #: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -710,87 +740,118 @@
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
-#: ../libpurple/protocols/yahoo/yahoo.c:3518 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:779 ../pidgin/gtkdialogs.c:918
-#: ../pidgin/gtkdialogs.c:1010 ../pidgin/gtkrequest.c:271
+#: ../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
 msgid "OK"
 msgstr "Aceptar"

-#: ../finch/gntblist.c:2317
+#: ../finch/gntblist.c:2649 ../pidgin/gtkdialogs.c:760
+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:2702
 msgid "Channel"
 msgstr "Canal"

-#: ../finch/gntblist.c:2329 ../pidgin/gtkblist.c:958
+#: ../finch/gntblist.c:2714 ../pidgin/gtkblist.c:962
 msgid "Join a Chat"
 msgstr "Unirse a un chat"

-#: ../finch/gntblist.c:2331
+#: ../finch/gntblist.c:2716
 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:2333 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2718 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Unirse"

 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2371 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2763 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Opciones"

-#: ../finch/gntblist.c:2377
+#: ../finch/gntblist.c:2769
 msgid "Send IM..."
 msgstr "Enviar MI..."

-#: ../finch/gntblist.c:2382
+#: ../finch/gntblist.c:2774
+msgid "Block/Unblock..."
+msgstr "Bloquear/Desbloquear..."
+
+#: ../finch/gntblist.c:2779
 msgid "Join Chat..."
 msgstr "Unirse a un chat..."

-#: ../finch/gntblist.c:2387
+#: ../finch/gntblist.c:2784
 msgid "Show"
 msgstr "Mostrar"

-#: ../finch/gntblist.c:2392
+#: ../finch/gntblist.c:2789
 msgid "Empty groups"
 msgstr "Grupos vacíos"

-#: ../finch/gntblist.c:2399
+#: ../finch/gntblist.c:2796
 msgid "Offline buddies"
 msgstr "Amigos desconectados"

-#: ../finch/gntblist.c:2406
+#: ../finch/gntblist.c:2803
 msgid "Sort"
 msgstr "Ordenar"

-#: ../finch/gntblist.c:2411
+#: ../finch/gntblist.c:2808
 msgid "By Status"
 msgstr "Por estado"

-#: ../finch/gntblist.c:2416 ../pidgin/gtkblist.c:4196
+#: ../finch/gntblist.c:2813 ../pidgin/gtkblist.c:4240
 msgid "Alphabetically"
 msgstr "Alfabéticamente"

-#: ../finch/gntblist.c:2421
+#: ../finch/gntblist.c:2818
 msgid "By Log Size"
 msgstr "Por tamaño de registro"

-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntblist.c:2829
+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
+#: ../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
+msgid "Grouping"
+msgstr "Agrupar"
+
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Importación de certificado"

-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Especifique un nombre de sistema"

-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr ""
 "Especifique el nombre de sistema para el que se utilizará este certificado."

-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -799,19 +860,19 @@
 "No se pudo importar el archivo %s.\n"
 "Asegúrese de que el fichero puede leerse y que está en formato PEM.\n"

-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Error en la importación de certificado"

-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Falló la importación del certificado X.509"

-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Seleccione un certificado PEM"

-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -820,24 +881,24 @@
 "Falló la exportación al fichero %s.\n"
 "Asegúrese de que tiene permisos de escritura en la ruta destino\n"

-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Error en la exportación de certificado"

-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Falló la exportación del certificado X.509"

-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "Exportación de certificado PEM X.509"

-#: ../finch/gntcertmgr.c:188
+#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificado para %s"

-#: ../finch/gntcertmgr.c:195
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -850,57 +911,57 @@
 "Huella SHA1:\n"
 "%s"

-#: ../finch/gntcertmgr.c:198
+#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "Certificado de equipo SSL"

-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "¿Seguro que desea borrar el certificado para %s?"

-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Confirme el borrado del certificado"

-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Gestor de certificados"

 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:693
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
 #: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
+#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Servidor"

-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1642
-#: ../pidgin/gtkdebug.c:835
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1672
+#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Info"

 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
+#: ../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:2474
-#: ../pidgin/gtkrequest.c:274
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Cerrar"

-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"

-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se ha desconectado."

-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -913,56 +974,58 @@
 "Finch no intentará reconectarse a esta cuenta hasta que corrija el error y "
 "reactive la cuenta."

-#: ../finch/gntconn.c:138
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Reactivar cuenta"

-#: ../finch/gntconn.c:155
+#: ../finch/gntconn.c:156
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
-msgstr "Se ha desconectado la cuenta y ya no está en el chat. Se unirá automáticamenet al chat cuando se vuelva a conectar la cuenta."
-
-#: ../finch/gntconv.c:144
+msgstr ""
+"Se ha desconectado la cuenta y ya no está en el chat. Se unirá "
+"automáticamenet al chat cuando se vuelva a conectar la cuenta."
+
+#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "No existe esa orden."

-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:480
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
 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:153 ../pidgin/gtkconv.c:486
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."

-#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:493
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sólo funciona en chats, no en MIs."

-#: ../finch/gntconv.c:161 ../pidgin/gtkconv.c:496
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sólo funciona en MIs, no en chats."

-#: ../finch/gntconv.c:165 ../pidgin/gtkconv.c:501
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."

-#: ../finch/gntconv.c:173
+#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "No se pudo enviar el mensaje porque no se ha conectado."

-#: ../finch/gntconv.c:252
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"

-#: ../finch/gntconv.c:275
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"

-#: ../finch/gntconv.c:280 ../finch/gntconv.c:813
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3470
 #, c-format
 msgid ""
 "\n"
@@ -971,69 +1034,73 @@
 "\n"
 "%s está escribiendo..."

-#: ../finch/gntconv.c:299
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Ha dejado este chat"

-#: ../finch/gntconv.c:415 ../pidgin/gtkconv.c:1369
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1378
 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:421 ../pidgin/gtkconv.c:1377
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1386
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Se ha parado el registro. No se registrarán mensajes de esta conversación de "
 "ahora en adelante."

-#: ../finch/gntconv.c:470
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Enviar a"

-#: ../finch/gntconv.c:514
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "Conversación"

-#: ../finch/gntconv.c:520
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Limpiar histórico"

-#: ../finch/gntconv.c:524 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tiempo"

-#: ../finch/gntconv.c:540
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Añadir aviso de amigo..."

-#: ../finch/gntconv.c:555
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "Ver registro..."
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "Habilitar registro"

-#: ../finch/gntconv.c:561
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Habilitar sonidos"

-#: ../finch/gntconv.c:769
+#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOMÁTICA> "

 #. Print the list of users in the room
-#: ../finch/gntconv.c:901
+#: ../finch/gntconv.c:970
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"

-#: ../finch/gntconv.c:1063 ../pidgin/gtkconv.c:332
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"

-#: ../finch/gntconv.c:1099 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."

-#: ../finch/gntconv.c:1102 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1041,7 +1108,7 @@
 "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:1175 ../pidgin/gtkconv.c:7733
+#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7769
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1049,12 +1116,12 @@
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."

-#: ../finch/gntconv.c:1178 ../pidgin/gtkconv.c:7736
+#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7772
 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:1181 ../pidgin/gtkconv.c:7739
+#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7775
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1062,48 +1129,48 @@
 "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
 "actual."

-#: ../finch/gntconv.c:1184 ../pidgin/gtkconv.c:7742
+#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7778
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histórico de la ventana de conversación."

-#: ../finch/gntconv.c:1187 ../pidgin/gtkconv.c:7748
+#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7784
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."

-#: ../finch/gntconv.c:1190
+#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Muestra la lista de usuarios en el chat."

-#: ../finch/gntconv.c:1195
+#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostrar la ventana de complementos."

-#: ../finch/gntconv.c:1198
+#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostrar la lista de amigos."

-#: ../finch/gntconv.c:1201
+#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Muestra la ventana de cuentas."

-#: ../finch/gntconv.c:1204
+#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Muestra la ventana de depuración."

-#: ../finch/gntconv.c:1207
+#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: Muestra la ventana de preferencias."

-#: ../finch/gntconv.c:1210
+#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana «savedstatuses»."

-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2616
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:942 ../pidgin/gtkconv.c:2652
 #: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."

-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Ventana de depuración"

@@ -1111,7 +1178,7 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Limpiar"

@@ -1119,111 +1186,176 @@
 msgid "Filter:"
 msgstr "Filtro:"

-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pausar"

-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Trasferencias de archivo - %d%% de %d archivos"

 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferencia de archivos"

-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progreso"

-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nombre de archivo"

-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Tamaño"

-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Velocidad"

-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Restante"

 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:380
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:812
+#: ../libpurple/protocols/jabber/buddy.c:971
+#: ../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
+#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:822
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2705
-#: ../libpurple/protocols/oscar/oscar.c:3761
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3343
-#: ../pidgin/gtkblist.c:3357 ../pidgin/gtkblist.c:3359
-#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
+#: ../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
+#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Estado"

-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias terminen"

-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Limpiar transferencias terminadas"

-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Parar"

-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"

-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Cancelado"

-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Falló"

-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"

-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Se guardó el archivo como %s."

-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "Terminado"

-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:357
+#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Transfiriendo"

+#: ../finch/gntlog.c:183
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Conversaciones en %s sobre %s"
+
+#: ../finch/gntlog.c:186
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Conversación con %s sobre %s"
+
+#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+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
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+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
+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
+msgid "No logs were found"
+msgstr "No se encontraron registros"
+
+#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
+msgid "Total log size:"
+msgstr "Tamaño total del registro:"
+
+#. Search box *********
+#: ../finch/gntlog.c:338
+msgid "Scroll/Search: "
+msgstr "Deslizar/Buscar: "
+
+#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
+#, c-format
+msgid "Conversations in %s"
+msgstr "Conversaciones en %s"
+
+#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "Conversaciones con %s"
+
+#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "Registro del Sistema"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Correos"
@@ -1232,11 +1364,11 @@
 msgid "You have mail!"
 msgstr "¡Tiene correo!"

-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "Remitente"

-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "Asunto"

@@ -1247,17 +1379,17 @@
 msgstr[0] "%s (%s) tiene %d mensaje nuevo."
 msgstr[1] "%s (%s) tiene %d nuevos mensajes."

-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "Nuevo correo"

-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s:"

 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:950
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "Información de amigos"

@@ -1265,11 +1397,11 @@
 msgid "Continue"
 msgstr "Continuar"

-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1603
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1633
 msgid "IM"
 msgstr "MI"

-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3524
 msgid "Invite"
 msgstr "Invitar"

@@ -1277,19 +1409,19 @@
 msgid "(none)"
 msgstr "(ninguno)"

-#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "ERROR"

-#: ../finch/gntplugin.c:77
+#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "falló la carga del complemento"

-#: ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "falló la descarga del complemento"

-#: ../finch/gntplugin.c:132
+#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1306,40 +1438,42 @@
 "Sitio web: %s\n"
 "Nombre de fichero: %s\n"

-#: ../finch/gntplugin.c:190
+#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Debe cargar el complemento antes de poder configurarlo."

-#: ../finch/gntplugin.c:238
+#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "No hay opciones de configuración para este complemento."

-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Error al cargar el complemento"

-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "El fichero seleccionado no es un complemento válido."

-#: ../finch/gntplugin.c:261
+#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr "Para ver el mensaje exacto consulte la ventana de depuración y vuelva a intentarlo de nuevo."
-
-#: ../finch/gntplugin.c:324
+msgstr ""
+"Para ver el mensaje exacto consulte la ventana de depuración y vuelva a "
+"intentarlo de nuevo."
+
+#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Seleccione el complemento a instalar"

-#: ../finch/gntplugin.c:350
+#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Puede (des)cargar complementos de la lista mostrada a continuación."

-#: ../finch/gntplugin.c:401
+#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Instalar complemento..."

-#: ../finch/gntplugin.c:411
+#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Configurar complemento"

@@ -1348,186 +1482,186 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
+#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "Preferencias"

-#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."

-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"

-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"

-#: ../finch/gntpounce.c:344
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Avisar a quién"

 #. Account:
-#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Cuenta:"

-#: ../finch/gntpounce.c:369
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Nombre del amigo:"

 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:592
+#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."

-#: ../finch/gntpounce.c:389
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Se conecta"

+#: ../finch/gntpounce.c:389
+msgid "Signs off"
+msgstr "Se desconecta"
+
 #: ../finch/gntpounce.c:390
-msgid "Signs off"
-msgstr "Se desconecta"
+msgid "Goes away"
+msgstr "Se ausenta"

 #: ../finch/gntpounce.c:391
-msgid "Goes away"
-msgstr "Se ausenta"
+msgid "Returns from away"
+msgstr "Deja de estar ausente"

 #: ../finch/gntpounce.c:392
-msgid "Returns from away"
-msgstr "Deja de estar ausente"
+msgid "Becomes idle"
+msgstr "Está inactivo"

 #: ../finch/gntpounce.c:393
-msgid "Becomes idle"
-msgstr "Está inactivo"
+msgid "Is no longer idle"
+msgstr "Ya no está inactivo."

 #: ../finch/gntpounce.c:394
-msgid "Is no longer idle"
-msgstr "Ya no está inactivo."
-
-#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Empieza a escribir"

-#: ../finch/gntpounce.c:396
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Hace una pausa mientras escribe"

+#: ../finch/gntpounce.c:396
+msgid "Stops typing"
+msgstr "Deja de escribir"
+
 #: ../finch/gntpounce.c:397
-msgid "Stops typing"
-msgstr "Deja de escribir"
-
-#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "Envía un mensaje"

 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:653
+#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Acción"

+#: ../finch/gntpounce.c:428
+msgid "Open an IM window"
+msgstr "Abrir una ventana de MI"
+
 #: ../finch/gntpounce.c:429
-msgid "Open an IM window"
-msgstr "Abrir una ventana de MI"
-
-#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Notificación con una ventana emergente"

-#: ../finch/gntpounce.c:431
+#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Enviar un mensaje"

+#: ../finch/gntpounce.c:431
+msgid "Execute a command"
+msgstr "Ejecutar una orden"
+
 #: ../finch/gntpounce.c:432
-msgid "Execute a command"
-msgstr "Ejecutar una orden"
-
-#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Reproducir un sonido"

-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
-msgstr "Sólo avisar cuando mi estado es «no disponible»"
-
-#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1293
+#: ../finch/gntpounce.c:460
+msgid "Pounce only when my status is not Available"
+msgstr "Sólo avisar cuando mi estado no sea Disponible"
+
+#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Recurrente"

-#: ../finch/gntpounce.c:631
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "No se puede crear el aviso"

-#: ../finch/gntpounce.c:632
+#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "No tiene ninguna cuenta."

-#: ../finch/gntpounce.c:633
+#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Antes de poder crear un aviso debe crear primero una cuenta."

-#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1108
+#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "¿Está seguro que desea borrar el aviso en %s para %s?"

-#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1337
+#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"

-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"

-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ha parado mientras le escribía algo (%s)"

-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"

-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvió de su inactividad (%s)"

-#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"

-#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"

-#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"

-#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"

-#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"

-#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s le ha enviado un mensaje. (%s)"

-#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1483
+#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "

@@ -1535,12 +1669,12 @@
 msgid "Based on keyboard use"
 msgstr "Basado en el uso del teclado"

-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "Del último mensaje enviado"

-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:899 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
@@ -1557,15 +1691,15 @@
 msgid "Notify buddies when you are typing"
 msgstr "Notificar a los amigos cuando les esté escribiendo"

-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Formato de registro"

-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Registrar MIs"

-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Registrar chats"

@@ -1590,120 +1724,137 @@
 msgstr "Cambiar estado a"

 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:994 ../pidgin/gtkprefs.c:2135
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversaciones"

-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
-#: ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "Registro"

-#: ../finch/gntrequest.c:585
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "No implementado aún."

-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Enviar archivo.."

-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1557
-#: ../pidgin/gtkrequest.c:1603
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Abrir archivo..."

-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
+#: ../finch/gntrequest.c:743
+msgid "Choose Location..."
+msgstr "Escojer ubicación..."
+
+#: ../finch/gntroomlist.c:208
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Pulse «Intro» para buscar más salas en esta categoría."
+
+#: ../finch/gntroomlist.c:273
+msgid "Get"
+msgstr "Obtener"
+
+#. Create the window.
+#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
+msgid "Room List"
+msgstr "Lista de salas"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Se conecta un amigo"

-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Se desconecta un amigo"

-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Se recibe un mensaje"

-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Se recibe un mensaje que comienza una conversación"

-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Se envía un mensaje"

-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Alguien entra al chat"

-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Alguien deja el chat"

-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Usted habla en el chat"

-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Otros hablan en el chat"

-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
+#: ../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"

-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "Fallo de gstreamer"

-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
+#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "No se pudo inicializar gstreamer."

-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
-#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
+#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1631
+#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(por omisión)"

-#: ../finch/gntsound.c:729
+#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "Seleccione un archivo de sonido..."

-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "Preferencias de sonido"

-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "Perfiles"

-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "Automático"

-#: ../finch/gntsound.c:957
+#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "Timbre de la consola"

-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
+#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "Comando"

-#: ../finch/gntsound.c:959
+#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "Sin sonido"

-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "Método para reproducir sonidos"

-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "Método:"

-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1713,55 +1864,55 @@
 "(%s para nombre de archivo)"

 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
+#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "Opciones de sonido"

-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "Suena cuando la conversación obtiene el foco"

-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
+#: ../pidgin/gtkprefs.c:1791 ../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:991 ../pidgin/gtkprefs.c:1861
+#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "Sólo cuando estoy disponible"

-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
+#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "Sólo cuando no estoy disponible"

-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "Volumen(0-100):"

 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
+#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "Eventos de sonido"

-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
+#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "Acontecimiento"

-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "Archivo"

-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "Probar"

-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
+#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "Restablecer"

-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
+#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "Seleccionar..."

@@ -1779,9 +1930,10 @@
 msgstr "Estados guardados"

 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/jabber/buddy.c:326
+#: ../libpurple/protocols/jabber/buddy.c:1396
+#: ../libpurple/protocols/msn/msn.c:747
+#: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
@@ -1806,38 +1958,38 @@
 #: ../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
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1619
-#: ../libpurple/protocols/jabber/jabber.c:1635
-#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
-#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
-#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/jabber.c:1639
+#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1667
+#: ../libpurple/protocols/jabber/jabber.c:1683
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
+#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5579
-#: ../libpurple/protocols/oscar/oscar.c:5797
-#: ../libpurple/protocols/oscar/oscar.c:5811
-#: ../libpurple/protocols/oscar/oscar.c:5827
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5841
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/novell/novell.c:2856
+#: ../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:5901
+#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../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/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
+#: ../libpurple/protocols/yahoo/yahoo.c:3813
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/zephyr/zephyr.c:2352
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Mensaje"

@@ -1887,15 +2039,15 @@
 msgid "Save & Use"
 msgstr "Guardar y usar"

-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Certificados"

-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "Sonidos"

-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Estados"

@@ -1994,16 +2146,16 @@
 msgid "Toaster plugin"
 msgstr "Complemento «toaster»"

-#: ../finch/plugins/gnthistory.c:117 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, 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:175 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Debe estar conectad para utilizar el complemento de histórico"

-#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2015,17 +2167,17 @@
 "La activación del registro en mensajes instantáneos y/o chats activará el "
 "histórico para los mismos tipos de conversación."

-#: ../finch/plugins/gnthistory.c:220
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "HistóricoGnt"

-#: ../finch/plugins/gnthistory.c:222 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."

-#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2033,6 +2185,48 @@
 "Cuando se abre una nueva conversación este complemento introduce la última "
 "conversación en la conversación actual."

+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+msgid "Online"
+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/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:5733
+#: ../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
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3369
+msgid "Online Buddies"
+msgstr "Amigos conectados"
+
+#: ../finch/plugins/grouping.c:117
+msgid "Offline Buddies"
+msgstr "Amigos desconectados"
+
+#: ../finch/plugins/grouping.c:127
+msgid "Online/Offline"
+msgstr "Conectado/Desconectado"
+
+#: ../finch/plugins/grouping.c:168
+msgid "Meebo"
+msgstr "Meebo"
+
+#: ../finch/plugins/grouping.c:217
+msgid "No Grouping"
+msgstr "No agrupar"
+
+#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+msgid "Provides alternate buddylist grouping options."
+msgstr "Ofrece opciones adicionales para agrupar las listas de amigos."
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
@@ -2050,88 +2244,88 @@
 msgid "Lastlog plugin."
 msgstr "Complemento «Lastlog»."

-#: ../libpurple/account.c:875
+#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "cuentas"

-#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contraseña."

-#: ../libpurple/account.c:1084
+#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduzca la contraseña para %s (%s)"

-#: ../libpurple/account.c:1091
+#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "Introduzca la contraseña"

-#: ../libpurple/account.c:1096
+#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "Guardar la contraseña"

-#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1144 ../libpurple/connection.c:118
+#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"

-#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
+#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Error de conexión"

-#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1691
+#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1739
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseñas no coinciden."

-#: ../libpurple/account.c:1339
+#: ../libpurple/account.c:1366
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."

-#: ../libpurple/account.c:1362
+#: ../libpurple/account.c:1389
 msgid "Original password"
 msgstr "Contraseña original"

-#: ../libpurple/account.c:1369
+#: ../libpurple/account.c:1396
 msgid "New password"
 msgstr "Nueva contraseña"

-#: ../libpurple/account.c:1376
+#: ../libpurple/account.c:1403
 msgid "New password (again)"
 msgstr "Nueva contraseña (otra vez)"

-#: ../libpurple/account.c:1382
+#: ../libpurple/account.c:1409
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseña de %s"

-#: ../libpurple/account.c:1390
+#: ../libpurple/account.c:1417
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseña actual y la contraseña nueva."

-#: ../libpurple/account.c:1421
+#: ../libpurple/account.c:1448
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la información del usuario %s"

-#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1451 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Establecer su información de usuario"

-#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
+#: ../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/protocols/novell/novell.c:2849
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Desconocido"

-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3294 ../pidgin/gtkblist.c:6114
+#: ../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
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2169,61 +2363,47 @@

 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:885
+#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Autoridades de certificación"

 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1053
+#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "Caché de servidores SSL"

 #. Make messages
-#: ../libpurple/certificate.c:1184
+#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "¿Desea aceptar el certificado para %s?"

 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1190
+#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "Verificación de certificado SSL"

 #. Number of actions
-#: ../libpurple/certificate.c:1199
+#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Aceptar"

-#: ../libpurple/certificate.c:1200 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/group_opt.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Rechazar"

-#: ../libpurple/certificate.c:1201
+#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."

 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1301
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"El certificado presentado por «%s» dice que pertenece a «%s» en lugar de a "
-"aquel. Esto puede significar que no se está conectando al servicio al que "
-"piensa que se está conectado."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1326
+#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2232,7 +2412,7 @@
 "El certificado presentado por «%s» es autofirmado. No puede comprobarse de "
 "forma automática."

-#: ../libpurple/certificate.c:1344
+#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificados presentada por %s no es válida."
@@ -2242,16 +2422,16 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1422
+#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"

-#: ../libpurple/certificate.c:1353
+#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Cadena de certificado inválida"

 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1374
+#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2260,14 +2440,14 @@
 "validar este certificado."

 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1397
+#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 "Pidgin no conoce el certificado raíz bajo el que este certificado dice "
 "haberse generado."

-#: ../libpurple/certificate.c:1414
+#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2277,12 +2457,26 @@
 "La cadena de certificado presentada por %s no tiene una firma digital válida "
 "de la Autoridad de Certificación de la que asegura tener la firma."

-#: ../libpurple/certificate.c:1423
+#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "Firma de autoridad de certificación inválida"

+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1434
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"El certificado presentado por «%s» dice que pertenece a «%s» en lugar de a "
+"aquel. Esto puede significar que no se está conectando al servicio al que "
+"piensa que se está conectado."
+
 #. Make messages
-#: ../libpurple/certificate.c:1882
+#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2300,34 +2494,34 @@
 "Fecha de expiración: %s\n"

 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1891
+#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Información del certificado"

-#: ../libpurple/connection.c:107
+#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Error de registro"

-#: ../libpurple/connection.c:180
+#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Error de deregistro"

-#: ../libpurple/connection.c:334
+#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se ha conectado"

-#: ../libpurple/connection.c:364
+#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"

-#: ../libpurple/connection.c:509 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2350
+#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2397
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
+#: ../libpurple/protocols/msnp9/session.c:329
 #: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -2345,60 +2539,60 @@
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"

-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:278
-#: ../libpurple/protocols/bonjour/jabber.c:321
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
+#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."

-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1218
 msgid "Send Message"
 msgstr "Enviar un mensaje"

-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1221
 msgid "_Send Message"
 msgstr "Enviar un _mensaje"

-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."

-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1630
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."

-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1740
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"

-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1760
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"

-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."

-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1838
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."

-#: ../libpurple/dbus-server.c:584
+#: ../libpurple/dbus-server.c:586
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No se pudo obtener la conexión: %s"

-#: ../libpurple/dbus-server.c:596
+#: ../libpurple/dbus-server.c:598
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "No se pudo obtener un nombre: %s"

-#: ../libpurple/dbus-server.c:610
+#: ../libpurple/dbus-server.c:612
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "No se pudo obtener el nombre del servidor: %s"
@@ -2413,15 +2607,15 @@
 msgid "No name"
 msgstr "Sin nombre"

-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "No se pudo crear un proceso nuevo de resolución\n"

-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "No se pudo enviar una solicitud al proceso de resolución\n"

-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
+#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2430,13 +2624,13 @@
 "Error al resolver %s: \n"
 "%s"

-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Error al resolver %s: %d"

-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2445,20 +2639,20 @@
 "Error al leer del proceso de resolución:\n"
 "%s"

-#: ../libpurple/dnsquery.c:578
+#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr "Fin de fichero mientras se leía del proceso de resolución"

-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Falló en la creación de hilos: %s"

-#: ../libpurple/dnsquery.c:763
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Razón desconocida"

-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2467,7 +2661,7 @@
 "Error al leer %s: \n"
 "%s.\n"

-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2476,7 +2670,7 @@
 "Error al escribir %s: \n"
 "%s.\n"

-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2485,39 +2679,39 @@
 "Error al acceder a %s: \n"
 "%s.\n"

-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "No se puede escribir en el directorio."

-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "No se puede enviar un archivo de 0 bytes."

-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "No se puede enviar un directorio."

-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un archivo normal. No se sobreescribirá.\n"

-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"

-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quiere enviarle un fichero"

-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "¿Aceptar solicitud de transferencia de archivo de %s?"

-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2528,60 +2722,60 @@
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"

-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s se ofrece a enviarle el archivo %s"

-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no es un nombre de archivo válido.\n"

-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se ofrece enviar %s a %s"

-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Comienza la transferencia de %s de %s"

-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"

-#: ../libpurple/ft.c:685
+#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"

-#: ../libpurple/ft.c:1108
+#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vd. canceló la transferencia de %s"

-#: ../libpurple/ft.c:1113
+#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"

-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"

-#: ../libpurple/ft.c:1176
+#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s canceló la transferencia de archivos"

-#: ../libpurple/ft.c:1233
+#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Falló la transferencia del archivo a %s."

-#: ../libpurple/ft.c:1235
+#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Falló la transferencia del archivo de %s."
@@ -2763,27 +2957,27 @@
 msgstr ""
 "<b><font color=\"red\">El registro no tiene función de lectura</font></b>"

-#: ../libpurple/log.c:598
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"

-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "En claro"

-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Formato antiguo plano"

-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversación."

-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"

-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2792,7 +2986,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"

-#: ../libpurple/log.c:1368
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2801,17 +2995,17 @@
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"

-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 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:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, 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:1500
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
@@ -2889,50 +3083,50 @@
 msgid "Autoaccept complete"
 msgstr "Completada autoaceptada"

-#: ../libpurple/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Cuando llega una solicitud de transferencia de %s?"

-#: ../libpurple/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Configurar la autoaceptación"

-#: ../libpurple/plugins/autoaccept.c:164
+#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Guardar"

-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../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:1449
-#: ../libpurple/protocols/oscar/oscar.c:2238
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:5911
-#: ../libpurple/protocols/oscar/oscar.c:5966
-#: ../libpurple/protocols/oscar/oscar.c:6192
-#: ../libpurple/protocols/oscar/oscar.c:6262 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:546
+#: ../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/request.h:1411
 msgid "_Cancel"
 msgstr "_Cancelar"

-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Preguntar"

-#: ../libpurple/plugins/autoaccept.c:169
+#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Autoaceptar"

-#: ../libpurple/plugins/autoaccept.c:170
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Rechazo automática"

-#: ../libpurple/plugins/autoaccept.c:185
+#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Autoaceptar transferencia de archivos..."

 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2940,13 +3134,13 @@
 "Ruta donde se guardarán los ficheros\n"
 "(Debe dar la ruta completa)"

-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Rechazar automáticamente las transferencias de usuarios que no están en mi "
 "lista de amigos"

-#: ../libpurple/plugins/autoaccept.c:224
+#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2955,10 +3149,10 @@
 "ficheros autoaceptada\n"
 "(sólo cuando no hay ya una conversación con el que la envía)"

-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msnp9/msn.c:1671
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Notes"
 msgstr "Notas"

@@ -3142,15 +3336,15 @@
 "Complemento de soporte IPC de prueba, como servidor. Éste registra las "
 "órdenes IPC."

-#: ../libpurple/plugins/joinpart.c:229
+#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "Configuración de la ocultación de Unir/Salir"

-#: ../libpurple/plugins/joinpart.c:233
+#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "Tamaño mínimo de sala"

-#: ../libpurple/plugins/joinpart.c:239
+#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tiempo de inactividad de usuario (en minutos)"

@@ -3160,19 +3354,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
+#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "Esconder Unir/Dejar"

 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
+#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "Oculta los mensajes de unir/salir ajenos"

 #. *  description
-#: ../libpurple/plugins/joinpart.c:275
+#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3416,31 +3610,31 @@

 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Sí"

 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "No"

@@ -3691,7 +3885,10 @@
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
 "LocalMessaging for more information."
-msgstr "No se encontró el conjunto de herramientas Apple Bonjour para Windows. Para más información consulte las preguntas frecuentas (FAQ) en http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
+msgstr ""
+"No se encontró el conjunto de herramientas Apple Bonjour para Windows. Para "
+"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
 msgid "Unable to listen for incoming IM connections\n"
@@ -3706,39 +3903,39 @@

 #. Creating the options for the protocol
 #: ../libpurple/protocols/bonjour/bonjour.c:392
-#: ../libpurple/protocols/bonjour/bonjour.c:697
+#: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:969
+#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "Nombre:"

 #: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:700
+#: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:973
+#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "Apellidos:"

 #: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
+#: ../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/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+#: ../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:706
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "Cuenta AIM"

 #: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:709
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "Cuenta XMPP"

@@ -3761,13 +3958,13 @@
 msgid "Purple Person"
 msgstr "Persona morada"

-#: ../libpurple/protocols/bonjour/bonjour.c:703
+#: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:961
+#: ../libpurple/protocols/jabber/jabber.c:998
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "Correo electrónico"

@@ -3775,39 +3972,44 @@
 msgid "Bonjour"
 msgstr "Bonjour"

-#: ../libpurple/protocols/bonjour/jabber.c:410
+#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversación."

-#: ../libpurple/protocols/bonjour/jabber.c:453
-#: ../libpurple/protocols/bonjour/jabber.c:548
-#: ../libpurple/protocols/bonjour/jabber.c:725
-#: ../libpurple/protocols/bonjour/jabber.c:743
+#: ../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
 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:642
+#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"

-#: ../libpurple/protocols/bonjour/jabber.c:652
+#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "Error al establecer las opciones del socket"

-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "No se pudo vincular el socket al puerto"

-#: ../libpurple/protocols/bonjour/jabber.c:688
+#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"

-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+msgid "Error communicating with local mDNSResponder."
+msgstr "Error comunicándose con el servicio «mDNSResponder» local."
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"

-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1908
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3881,9 +4083,9 @@
 msgstr "¡Se completó el registro con éxito!"

 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:944
-#: ../libpurple/protocols/jabber/jabber.c:947
-#: ../libpurple/protocols/jabber/jabber.c:1724
+#: ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "Contraseña"

@@ -3909,9 +4111,9 @@

 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/oscar/oscar.c:3849
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
@@ -3920,14 +4122,14 @@
 msgid "Year of birth"
 msgstr "Año de nacimiento"

-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../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/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
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "Sexo"

@@ -3936,14 +4138,14 @@
 msgstr "Hombre o mujer"

 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../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:3713
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -4002,65 +4204,51 @@
 msgid "Add to chat..."
 msgstr "Añadir al chat"

-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5629
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3109 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3343 ../pidgin/gtkblist.c:3681
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Desconectado"
-
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2083
 #: ../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
 #: ../libpurple/protocols/msnp9/state.c:30
 #: ../libpurple/protocols/msnp9/state.c:37
 #: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3111 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "Disponible"

 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
 #: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4528
-#: ../libpurple/protocols/oscar/oscar.c:5657
+#: ../libpurple/protocols/jabber/buddy.c:2087
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:5761
 #: ../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:3663
-#: ../libpurple/protocols/yahoo/yahoo.c:3737 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../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
 msgid "Away"
 msgstr "Ausente"

 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2704
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/oscar/oscar.c:2767
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "UIN"
 msgstr "UIN"

 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3691
-#: ../libpurple/protocols/silc/ops.c:990
+#: ../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/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
@@ -4070,7 +4258,7 @@
 msgstr "Año de nacimiento"

 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la búsqueda."

@@ -4114,23 +4302,10 @@
 msgid "Connection failed."
 msgstr "Falló la conexión."

-#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr "Bloqueado"
-
 #: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Añadir al chat"

-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "Bloquear"
-
 #: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
@@ -4201,36 +4376,39 @@

 #: ../libpurple/protocols/irc/cmds.c:43
 #: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"

-#: ../libpurple/protocols/irc/cmds.c:506
+#: ../libpurple/protocols/irc/cmds.c:509
 #: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"

-#: ../libpurple/protocols/irc/cmds.c:510
+#: ../libpurple/protocols/irc/cmds.c:513
 #: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "No hay tema establecido"

-#: ../libpurple/protocols/irc/dcc_send.c:293
-#: ../libpurple/protocols/irc/dcc_send.c:334
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libpurple/protocols/irc/dcc_send.c:298
+#: ../libpurple/protocols/irc/dcc_send.c:339
+#: ../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
 msgid "File Transfer Failed"
 msgstr "Falló la transferencia de archivos"

-#: ../libpurple/protocols/irc/dcc_send.c:294
-#: ../libpurple/protocols/irc/dcc_send.c:335
+#: ../libpurple/protocols/irc/dcc_send.c:299
+#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "No se pudo abrir un puerto de escucha."

@@ -4252,83 +4430,83 @@
 msgstr "MOTD para %s"

 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
-#: ../libpurple/protocols/myspace/myspace.c:2400
+#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2532
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"

-#: ../libpurple/protocols/irc/irc.c:253
+#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Ver MOTD"

-#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"

-#: ../libpurple/protocols/irc/irc.c:271
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
+#: ../libpurple/protocols/irc/irc.c:278
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "Contra_seña:"

-#: ../libpurple/protocols/irc/irc.c:304
+#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"

 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:325
-#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../libpurple/protocols/irc/irc.c:332
+#: ../libpurple/protocols/jabber/jabber.c:1346
 #: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/msnp9/session.c:354
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
-#: ../libpurple/protocols/simple/simple.c:1893
-#: ../libpurple/protocols/yahoo/yahoo.c:2947
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/sametime/sametime.c:3777
+#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/yahoo/yahoo.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "Conectando"

-#: ../libpurple/protocols/irc/irc.c:335
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"

-#: ../libpurple/protocols/irc/irc.c:348
-#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/irc/irc.c:355
+#: ../libpurple/protocols/myspace/myspace.c:313
 #: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"

-#: ../libpurple/protocols/irc/irc.c:430
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:437
+#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"

-#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
-#: ../libpurple/protocols/myspace/myspace.c:2394
+#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2526
 msgid "Read error"
 msgstr "Error de lectura"

-#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/irc/irc.c:798
 #: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Usuarios"

-#: ../libpurple/protocols/irc/irc.c:793
-#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/irc/irc.c:801
+#: ../libpurple/protocols/sametime/sametime.c:3425
 #: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
+#: ../libpurple/protocols/silc/ops.c:1408
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Tema"

@@ -4340,68 +4518,70 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:931
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"

 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:932
+#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"

 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2335
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6696
+#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2197
+#: ../libpurple/protocols/oscar/oscar.c:6763
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/sametime/sametime.c:5782
+#: ../libpurple/protocols/silc/ops.c:1264
+#: ../libpurple/protocols/silc/ops.c:1358
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"

 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6699
+#: ../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/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/sametime/sametime.c:5787
 #: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Puerto"

-#: ../libpurple/protocols/irc/irc.c:963
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Codificaciones"

-#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:939
+#: ../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:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
+#: ../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:916
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "Username"
 msgstr "Nombre de usuario"

-#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:319
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
 #: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "Nombre real"

@@ -4409,7 +4589,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:977
+#: ../libpurple/protocols/irc/irc.c:985
 msgid "Use SSL"
 msgstr "Usar SSL"

@@ -4441,14 +4621,14 @@
 msgstr " <i>(identificado)</i>"

 #: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3681
-#: ../libpurple/protocols/silc/ops.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/silc/ops.c:1437
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apodo"

 #: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc/ops.c:1283
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
@@ -4502,66 +4682,66 @@
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"

-#: ../libpurple/protocols/irc/msgs.c:577
+#: ../libpurple/protocols/irc/msgs.c:579
 msgid "Time Response"
 msgstr "Respuesta de hora"

-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"

-#: ../libpurple/protocols/irc/msgs.c:589
+#: ../libpurple/protocols/irc/msgs.c:591
 msgid "No such channel"
 msgstr "No existe ese canal"

 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:600
+#: ../libpurple/protocols/irc/msgs.c:602
 msgid "no such channel"
 msgstr "no existe el canal"

-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:605
 msgid "User is not logged in"
 msgstr "El usuario no está conectado"

-#: ../libpurple/protocols/irc/msgs.c:608
+#: ../libpurple/protocols/irc/msgs.c:610
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"

-#: ../libpurple/protocols/irc/msgs.c:628
+#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Could not send"
 msgstr "No se pudo enviar"

-#: ../libpurple/protocols/irc/msgs.c:684
+#: ../libpurple/protocols/irc/msgs.c:686
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitación."

-#: ../libpurple/protocols/irc/msgs.c:685
+#: ../libpurple/protocols/irc/msgs.c:687
 msgid "Invitation only"
 msgstr "Sólo con invitación"

-#: ../libpurple/protocols/irc/msgs.c:800
+#: ../libpurple/protocols/irc/msgs.c:803
 #, 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:805 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:808 ../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:828
+#: ../libpurple/protocols/irc/msgs.c:831
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"

-#: ../libpurple/protocols/irc/msgs.c:913 ../libpurple/protocols/irc/msgs.c:914
+#: ../libpurple/protocols/irc/msgs.c:919 ../libpurple/protocols/irc/msgs.c:920
 msgid "Invalid nickname"
 msgstr "Apodo inválido"

-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4569,7 +4749,7 @@
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."

-#: ../libpurple/protocols/irc/msgs.c:920
+#: ../libpurple/protocols/irc/msgs.c:926
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4577,44 +4757,44 @@
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."

-#: ../libpurple/protocols/irc/msgs.c:959
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"

-#: ../libpurple/protocols/irc/msgs.c:959
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"

-#: ../libpurple/protocols/irc/msgs.c:980
+#: ../libpurple/protocols/irc/msgs.c:986
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"

-#: ../libpurple/protocols/irc/msgs.c:1022
+#: ../libpurple/protocols/irc/msgs.c:1028
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inválido del servidor"

-#: ../libpurple/protocols/irc/msgs.c:1024
+#: ../libpurple/protocols/irc/msgs.c:1030
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"

-#: ../libpurple/protocols/irc/msgs.c:1115
+#: ../libpurple/protocols/irc/msgs.c:1121
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "No se pudo unir a %s: es necesario registrarse"

-#: ../libpurple/protocols/irc/msgs.c:1116
-#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/irc/msgs.c:1122
+#: ../libpurple/protocols/silc/ops.c:1108
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"

-#: ../libpurple/protocols/irc/msgs.c:1150
+#: ../libpurple/protocols/irc/msgs.c:1156
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal están temporalmente no disponibles."

-#: ../libpurple/protocols/irc/msgs.c:1162
+#: ../libpurple/protocols/irc/msgs.c:1168
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
@@ -4723,7 +4903,7 @@
 "names [canal]:  Obtener la lista de los usuarios que están en el canal."

 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2314
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."

@@ -4732,6 +4912,10 @@
 msgstr "nickserv: Enviar un comando al servidor."

 #: ../libpurple/protocols/irc/parse.c:139
+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
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4739,7 +4923,7 @@
 "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:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4747,11 +4931,11 @@
 "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
 "utilizarlo."

-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "operserv: Send a command to operserv"
 msgstr "openserv: Enviar un comando al servidor"

-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4759,7 +4943,7 @@
 "part [sala] [mensaje]:  Abandonar el canal actual, o un canal específico, "
 "con el mensaje opcional."

-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4767,7 +4951,7 @@
 "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
 "no se especifica un usuario)."

-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4775,17 +4959,17 @@
 "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:145
+#: ../libpurple/protocols/irc/parse.c:146
 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:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crudo al servidor."

-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4793,24 +4977,24 @@
 "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. Sólo puede "
 "hacerlo un operador de canal."

-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 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:149
+#: ../libpurple/protocols/irc/parse.c:150
 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:150
+#: ../libpurple/protocols/irc/parse.c:151
 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:151
+#: ../libpurple/protocols/irc/parse.c:152
 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:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4818,47 +5002,47 @@
 "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:153
+#: ../libpurple/protocols/irc/parse.c:154
 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:154
+#: ../libpurple/protocols/irc/parse.c:155
 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:155
+#: ../libpurple/protocols/irc/parse.c:156
 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:520
+#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"

-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"

-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"

-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:634
+#: ../libpurple/protocols/irc/parse.c:641 ../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."
 msgstr "Desconectado."

 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:698
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:735
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "Error desconocido"

@@ -4881,7 +5065,7 @@
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"

 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:518
+#: ../libpurple/protocols/jabber/auth.c:532
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4892,30 +5076,29 @@

 #: ../libpurple/protocols/jabber/auth.c:325
 #: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:520
-#: ../libpurple/protocols/jabber/auth.c:521
-#: ../libpurple/protocols/jabber/auth.c:614
-#: ../libpurple/protocols/jabber/auth.c:615
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:535
+#: ../libpurple/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:727
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"

-#: ../libpurple/protocols/jabber/auth.c:340
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:627
-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:472
-#: ../libpurple/protocols/jabber/auth.c:576
-#: ../libpurple/protocols/jabber/auth.c:795
-#: ../libpurple/protocols/jabber/auth.c:944
-#: ../libpurple/protocols/jabber/auth.c:971
-#: ../libpurple/protocols/jabber/auth.c:993
+#: ../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/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."

-#: ../libpurple/protocols/jabber/auth.c:616
+#: ../libpurple/protocols/jabber/auth.c:548
+#: ../libpurple/protocols/jabber/auth.c:739
+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?"
@@ -4923,115 +5106,115 @@
 "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:818
-#: ../libpurple/protocols/jabber/auth.c:843
+#: ../libpurple/protocols/jabber/auth.c:930
+#: ../libpurple/protocols/jabber/auth.c:955
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"

-#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:1031
 msgid "SASL error"
 msgstr "Error de SASL"

-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4174
-#: ../libpurple/protocols/silc/ops.c:986
+#: ../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/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"

-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/jabber/buddy.c:312
+#: ../libpurple/protocols/jabber/buddy.c:1268
+#: ../libpurple/protocols/silc/ops.c:1013
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"

-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:313
+#: ../libpurple/protocols/jabber/buddy.c:1271
 msgid "Given Name"
 msgstr "Nombre propio"

-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"

-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:316
+#: ../libpurple/protocols/jabber/buddy.c:1319
 msgid "Street Address"
 msgstr "Calle"

-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:317
+#: ../libpurple/protocols/jabber/buddy.c:1316
 msgid "Extended Address"
 msgstr "Dirección extendida"

-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:318
+#: ../libpurple/protocols/jabber/buddy.c:1322
 msgid "Locality"
 msgstr "Localidad"

-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:319
+#: ../libpurple/protocols/jabber/buddy.c:1325
 msgid "Region"
 msgstr "Región"

-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:320
+#: ../libpurple/protocols/jabber/buddy.c:1328
 msgid "Postal Code"
 msgstr "Código postal"

-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:321
+#: ../libpurple/protocols/jabber/buddy.c:1332
 #: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "País"

-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:322
+#: ../libpurple/protocols/jabber/buddy.c:1343
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Telephone"
 msgstr "Teléfono"

-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:324
+#: ../libpurple/protocols/jabber/buddy.c:1387
 msgid "Organization Name"
 msgstr "Nombre de la organización"

-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:325
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"

-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:327
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Role"
 msgstr "Rol"

-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/jabber/buddy.c:328
+#: ../libpurple/protocols/jabber/buddy.c:1287
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1669
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Birthday"
 msgstr "Cumpleaños"

-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../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:3355
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3345
+#: ../pidgin/gtkplugin.c:568 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Descripción"

-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:752
+#: ../libpurple/protocols/jabber/buddy.c:753
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard de XMPP"

-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:754
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5039,386 +5222,386 @@
 "Todos los campos siguientes son opcionales. Introduzca sólo la información "
 "con la que se sienta cómodo."

-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:990
 msgid "Client"
 msgstr "Cliente"

-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:994
 msgid "Operating System"
 msgstr "Sistema operativo"

-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
-msgid "Last Activity"
-msgstr "Última actividad"
-
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-msgid "Service Discovery Info"
-msgstr "Información de descubrimiento de servicio"
-
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
-msgstr "Elementos de descubrimiento de servicio"
-
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-msgid "Extended Stanza Addressing"
-msgstr "Dirección de grupo extendida"
-
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
-msgid "Multi-User Chat"
-msgstr "Chat multiusuario"
-
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Información de presencia extendida en chat multiusuario"
-
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
-msgstr "Flujos de bytes en banda"
-
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-msgid "Ad-Hoc Commands"
-msgstr "Órdenes ad-hoc"
-
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr "Servicio PubSub"
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr "Flujos de bytes SOCKS5"
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr "Datos fuera de banda"
-
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-msgid "In-Band Registration"
-msgstr "Registro en línea"
-
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-msgid "User Location"
-msgstr "Ubicación del usuario"
-
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-msgid "User Avatar"
-msgstr "Avatar del usuario"
-
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-msgid "Chat State Notifications"
-msgstr "Notificaciones de estado de chat"
+msgid "Last Activity"
+msgstr "Última actividad"

 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-msgid "Software Version"
-msgstr "Versión del programa"
+msgid "Service Discovery Info"
+msgstr "Información de descubrimiento de servicio"

 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-msgid "Stream Initiation"
-msgstr "Origen del flujo"
+msgid "Service Discovery Items"
+msgstr "Elementos de descubrimiento de servicio"

 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
-msgid "File Transfer"
-msgstr "Transferencia de archivo"
+msgid "Extended Stanza Addressing"
+msgstr "Dirección de grupo extendida"

 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-msgid "User Mood"
-msgstr "Estado de ánimo del usuario"
+msgid "Multi-User Chat"
+msgstr "Chat multiusuario"

 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-msgid "User Activity"
-msgstr "Actividad de usuario"
+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
-msgid "Entity Capabilities"
-msgstr "Capacidades de la entidad"
+msgid "In-Band Bytestreams"
+msgstr "Flujos de bytes en banda"

 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
-msgstr "Negociaciones de sesiones cifradas"
+msgid "Ad-Hoc Commands"
+msgstr "Órdenes ad-hoc"

 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-msgid "User Tune"
-msgstr "Música del usuario"
+msgid "PubSub Service"
+msgstr "Servicio PubSub"

 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-msgid "Roster Item Exchange"
-msgstr "Intercambio de elementos de la lista"
+msgid "SOCKS5 Bytestreams"
+msgstr "Flujos de bytes SOCKS5"

 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-msgid "Reachability Address"
-msgstr "Dirección alcanzable"
+msgid "Out of Band Data"
+msgstr "Datos fuera de banda"

 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "In-Band Registration"
+msgstr "Registro en línea"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "User Location"
+msgstr "Ubicación del usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Avatar"
+msgstr "Avatar del usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Chat State Notifications"
+msgstr "Notificaciones de estado de chat"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Software Version"
+msgstr "Versión del programa"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+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
+msgid "File Transfer"
+msgstr "Transferencia de archivo"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "User Mood"
+msgstr "Estado de ánimo del usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "User Activity"
+msgstr "Actividad de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Entity Capabilities"
+msgstr "Capacidades de la entidad"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "Encrypted Session Negotiations"
+msgstr "Negociaciones de sesiones cifradas"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Tune"
+msgstr "Música del usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "Roster Item Exchange"
+msgstr "Intercambio de elementos de la lista"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "Reachability Address"
+msgstr "Dirección alcanzable"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "User Profile"
 msgstr "Perfil de usuario"

 # JFS: Jingle es un protocolo de transporte, no se traduce
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
 msgid "Jingle"
 msgstr "Jingle"

-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Jingle Audio"
 msgstr "Audio Jingle"

-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "User Nickname"
 msgstr "Nombre de usuario"

-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"

-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"

-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "Jingle Raw UDP"
 msgstr "Jingle UDP en crudo"

-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Jingle Video"
 msgstr "Vídeo Jingle"

-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Jingle DTMF"
 msgstr "DTMF Jingle"

-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Message Receipts"
 msgstr "Recibos de mensajes"

-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
+#: ../libpurple/protocols/jabber/buddy.c:917
+#: ../libpurple/protocols/jabber/buddy.c:1077
 msgid "Public Key Publishing"
 msgstr "Publicación de la clave pública"

-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
+#: ../libpurple/protocols/jabber/buddy.c:919
+#: ../libpurple/protocols/jabber/buddy.c:1079
 msgid "User Chatting"
 msgstr "Chatear con usuarios"

-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
 msgid "User Browsing"
 msgstr "Navegar usuarios"

-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
 msgid "User Gaming"
 msgstr "Jugar con usuarios"

-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
+#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:1085
 msgid "User Viewing"
 msgstr "Ver usuarios"

-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
+#: ../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/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"

-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:1089
 msgid "Stanza Encryption"
 msgstr "Cifrado de grupo"

-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Entity Time"
 msgstr "Tiempo de entidad"

-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Delayed Delivery"
 msgstr "Envío con demora"

-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Collaborative Data Objects"
 msgstr "Objetods de datos colaborativos"

-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "File Repository and Sharing"
 msgstr "Repositorio de archivos y compartición"

-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:939
+#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "STUN Service Discovery for Jingle"
 msgstr "Servidor de descubrimiento STUN para Jingle"

-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Negociación de sesión cifrada simplificada"

-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "Hop Check"
 msgstr "Comprobación de saltos"

-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/jabber/buddy.c:1111
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Capabilities"
 msgstr "Capacidades"

-#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:963
 #: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "Recurso"

-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1576
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1638
+#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Priority"
 msgstr "Prioridad"

-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/silc/ops.c:1009
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nombre medio"

-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:977
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/buddy.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3848
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc/ops.c:1045
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Dirección"

-#: ../libpurple/protocols/jabber/buddy.c:1276
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "P.O. Box"
 msgstr "Código postal"

-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Photo"
 msgstr "Foto"

-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Logo"
 msgstr "Logotipo"

-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Un-hide From"
 msgstr "No ocultarse de"

-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"

 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:2004
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"

-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:2011
 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:1973
+#: ../libpurple/protocols/jabber/buddy.c:2020
 msgid "Unsubscribe"
 msgstr "De-suscribir"

-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:2035
 msgid "Log In"
 msgstr "Conectarse"

-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Log Out"
 msgstr "Desconectarse"

-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/buddy.c:2085
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "Hablador"

-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2089
 msgid "Extended Away"
 msgstr "Ausencia extendida"

-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1617
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/sametime/sametime.c:3339
+#: ../libpurple/protocols/jabber/buddy.c:2091
+#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/sametime/sametime.c:3348
 msgid "Do Not Disturb"
 msgstr "No molestar"

-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2258
 msgid "JID"
 msgstr "JID"

-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:2262
+#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Last Name"
 msgstr "Apellidos"

-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2294
 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:2332
+#: ../libpurple/protocols/jabber/buddy.c:2379
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5426,71 +5609,71 @@
 "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:2352
+#: ../libpurple/protocols/jabber/buddy.c:2399
 msgid "Directory Query Failed"
 msgstr "Falló la consulta al directorio"

-#: ../libpurple/protocols/jabber/buddy.c:2353
+#: ../libpurple/protocols/jabber/buddy.c:2400
 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:2387
+#: ../libpurple/protocols/jabber/buddy.c:2434
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"

-#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/jabber/buddy.c:2441
 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:2414
+#: ../libpurple/protocols/jabber/buddy.c:2461
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3770
 msgid "E-Mail Address"
 msgstr "Dirección de correo electrónico"

-#: ../libpurple/protocols/jabber/buddy.c:2423
-#: ../libpurple/protocols/jabber/buddy.c:2424
+#: ../libpurple/protocols/jabber/buddy.c:2470
+#: ../libpurple/protocols/jabber/buddy.c:2471
 msgid "Search for XMPP users"
 msgstr "Buscar un usuario XMPP"

 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/jabber/buddy.c:2472
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5657
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../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
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"

-#: ../libpurple/protocols/jabber/buddy.c:2440
+#: ../libpurple/protocols/jabber/buddy.c:2487
 msgid "Invalid Directory"
 msgstr "Directorio inválido"

-#: ../libpurple/protocols/jabber/buddy.c:2457
+#: ../libpurple/protocols/jabber/buddy.c:2504
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"

-#: ../libpurple/protocols/jabber/buddy.c:2458
+#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"

-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2508
 msgid "Search Directory"
 msgstr "Buscar en el directorio"

 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5313
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5417
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Sala:"

@@ -5559,7 +5742,7 @@

 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
+#: ../libpurple/protocols/silc/ops.c:1475
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
@@ -5590,15 +5773,19 @@
 msgid "Write error"
 msgstr "Error de escritura"

-#: ../libpurple/protocols/jabber/jabber.c:424
-#: ../libpurple/protocols/jabber/jabber.c:463
+#: ../libpurple/protocols/jabber/jabber.c:401
+msgid "Ping timeout"
+msgstr "Tiempo de expiración del ping"
+
+#: ../libpurple/protocols/jabber/jabber.c:451
+#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "Error de lectura"

-#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/jabber/jabber.c:528
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2561
-#: ../libpurple/protocols/yahoo/yahoo.c:2593
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5607,602 +5794,606 @@
 "No se pudo establecer una conexión con el servidor:\n"
 "%s"

-#: ../libpurple/protocols/jabber/jabber.c:550
+#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"

-#: ../libpurple/protocols/jabber/jabber.c:598
-#: ../libpurple/protocols/jabber/jabber.c:1083
+#: ../libpurple/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no válido"

-#: ../libpurple/protocols/jabber/jabber.c:605
+#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."

-#: ../libpurple/protocols/jabber/jabber.c:683
+#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"

-#: ../libpurple/protocols/jabber/jabber.c:689
+#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registro a %s efectuado con éxito"

-#: ../libpurple/protocols/jabber/jabber.c:691
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "Éxito en el registro"

-#: ../libpurple/protocols/jabber/jabber.c:700
-#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:737
+#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "Falló el registro"

-#: ../libpurple/protocols/jabber/jabber.c:719
+#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registro de %s efectuado con éxito"

-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
+#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "Éxito en el deregistro"

-#: ../libpurple/protocols/jabber/jabber.c:730
-#: ../libpurple/protocols/jabber/jabber.c:731
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "Falló el deregistro"

-#: ../libpurple/protocols/jabber/jabber.c:897
-#: ../libpurple/protocols/jabber/jabber.c:898
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "Ya está registrado"

-#: ../libpurple/protocols/jabber/jabber.c:985
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:3837
+#: ../libpurple/protocols/oscar/oscar.c:3850
 msgid "State"
 msgstr "Estado"

-#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "Código postal"

-#: ../libpurple/protocols/jabber/jabber.c:993
-#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1030
+#: ../libpurple/protocols/silc/ops.c:1050
 #: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Teléfono"

-#: ../libpurple/protocols/jabber/jabber.c:1001
+#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "Fecha"

-#: ../libpurple/protocols/jabber/jabber.c:1005
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "Deregistrar"

-#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Por favor, rellene la información abajo indicada para cambiar su registro de "
 "cuenta."

-#: ../libpurple/protocols/jabber/jabber.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."

-#: ../libpurple/protocols/jabber/jabber.c:1023
-#: ../libpurple/protocols/jabber/jabber.c:1024
+#: ../libpurple/protocols/jabber/jabber.c:1060
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "Registrando cuenta nueva de XMPP"

-#: ../libpurple/protocols/jabber/jabber.c:1025
-#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "Registrar"

-#: ../libpurple/protocols/jabber/jabber.c:1030
+#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Cambiar la cuenta de registro en %s"

-#: ../libpurple/protocols/jabber/jabber.c:1031
+#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registrar una cuenta nueva en %s"

-#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "Cambiar registro"

-#: ../libpurple/protocols/jabber/jabber.c:1142
-#: ../libpurple/protocols/jabber/jabber.c:1143
+#: ../libpurple/protocols/jabber/jabber.c:1180
+#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "Error al deregistrar la cuenta"

-#: ../libpurple/protocols/jabber/jabber.c:1148
-#: ../libpurple/protocols/jabber/jabber.c:1149
+#: ../libpurple/protocols/jabber/jabber.c:1186
+#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "La cuenta se ha deregistrado con éxito"

-#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"

-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "Inicializando SSL/TLS"

-#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1359
 #: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:361
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autenticando"

-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"

-#: ../libpurple/protocols/jabber/jabber.c:1420
-#: ../libpurple/protocols/jabber/jabber.c:1872
-#: ../libpurple/protocols/jabber/jabber.c:1915
-#: ../libpurple/protocols/jabber/jabber.c:1953
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5627
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:2001
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5731
 msgid "Not Authorized"
 msgstr "No autorizado"

-#: ../libpurple/protocols/jabber/jabber.c:1468
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "Ambos"

-#: ../libpurple/protocols/jabber/jabber.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"

-#: ../libpurple/protocols/jabber/jabber.c:1472
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "De"

-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "A"

-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"

-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1521
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ninguno"

-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "Subscripción"

-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1495
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1592
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../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/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc/ops.c:1227
 #: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Estado de ánimo"

-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:647
-msgid "Current media"
-msgstr "Medio actual"
-
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1593
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/msn/msn.c:656
+msgid "Now Listening"
+msgstr "Escuchando ahora"
+
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1641
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1669
 msgid "Mood Text"
 msgstr "Texto de estado de ánimo"

-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1595
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Allow Buzz"
 msgstr "Permitir codazos"

-#: ../libpurple/protocols/jabber/jabber.c:1641
+#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "Artista de música"

-#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "Título de música"

-#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "Album de música"

-#: ../libpurple/protocols/jabber/jabber.c:1644
+#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "Género de música"

-#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "Comentario de música"

-#: ../libpurple/protocols/jabber/jabber.c:1646
+#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "Pista de música"

-#: ../libpurple/protocols/jabber/jabber.c:1647
+#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "Tiempo de música"

-#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "Año de música"

-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "URL de música"

-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "Contraseña modificada"

-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."

-#: ../libpurple/protocols/jabber/jabber.c:1672
-#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"

-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"

-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "Cambiar contraseña XMPP"

-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"

-#: ../libpurple/protocols/jabber/jabber.c:1751
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/jabber/jabber.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:6518
 #: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../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:1756
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:6529
 #: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Cambiar su contraseña..."

 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."

-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "Solicitud errónea"

-#: ../libpurple/protocols/jabber/jabber.c:1854
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "Conflicto"

-#: ../libpurple/protocols/jabber/jabber.c:1856
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"

-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "Prohibido"

-#: ../libpurple/protocols/jabber/jabber.c:1860
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "Se fue"

-#: ../libpurple/protocols/jabber/jabber.c:1862
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"

-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"

-#: ../libpurple/protocols/jabber/jabber.c:1866
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "ID de XMPP malformado"

-#: ../libpurple/protocols/jabber/jabber.c:1868
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "No aceptable"

-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "No permitido"

-#: ../libpurple/protocols/jabber/jabber.c:1874
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "Pago necesario"

-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"

-#: ../libpurple/protocols/jabber/jabber.c:1880
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "Registro necesario"

-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"

-#: ../libpurple/protocols/jabber/jabber.c:1884
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"

-#: ../libpurple/protocols/jabber/jabber.c:1886
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"

-#: ../libpurple/protocols/jabber/jabber.c:1888
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"

-#: ../libpurple/protocols/jabber/jabber.c:1890
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"

-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"

-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"

-#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"

-#: ../libpurple/protocols/jabber/jabber.c:1904
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "Authzid inválido"

-#: ../libpurple/protocols/jabber/jabber.c:1906
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"

-#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"

-#: ../libpurple/protocols/jabber/jabber.c:1917
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"

-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"

-#: ../libpurple/protocols/jabber/jabber.c:1928
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "Formato erróneo"

-#: ../libpurple/protocols/jabber/jabber.c:1930
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"

-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"

-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1983
 #: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"

-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "Servidor desaparecido"

-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "Servidor desconocido"

-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"

-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "ID no válido"

-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"

-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "XML inválido"

-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"

-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "Violación de la política"

-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"

-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"

-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "XML restringido"

-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "Ver otros servidores"

-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "Parada del sistema"

-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "Condición no definida"

-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "Codificación no soportada"

-#: ../libpurple/protocols/jabber/jabber.c:1971
+#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"

-#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "Versión no soportada"

-#: ../libpurple/protocols/jabber/jabber.c:1975
+#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML malformado"

-#: ../libpurple/protocols/jabber/jabber.c:1977
+#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "Error de flujo"

-#: ../libpurple/protocols/jabber/jabber.c:2062
+#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"

-#: ../libpurple/protocols/jabber/jabber.c:2082
+#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación desconocida: \"%s\""

-#: ../libpurple/protocols/jabber/jabber.c:2087
+#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No se pudo afiliar al usuario %s como \"%s\""

-#: ../libpurple/protocols/jabber/jabber.c:2106
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""

-#: ../libpurple/protocols/jabber/jabber.c:2111
+#: ../libpurple/protocols/jabber/jabber.c:2159
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "No se pudo establecer el rol \"%s\" para el usuario: %s"

-#: ../libpurple/protocols/jabber/jabber.c:2164
+#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"

-#: ../libpurple/protocols/jabber/jabber.c:2195
+#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "No puede hacer un ping al usuario %s"

-#: ../libpurple/protocols/jabber/jabber.c:2213
-#: ../libpurple/protocols/jabber/jabber.c:2224
+#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2272
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "No se pudo dar el codazo porque no se sabe nada del usuario %s."

-#: ../libpurple/protocols/jabber/jabber.c:2219
+#: ../libpurple/protocols/jabber/jabber.c:2267
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr "No se pudo dar el codazo porque puede que el usuario %s esté desconectado."
-
-#: ../libpurple/protocols/jabber/jabber.c:2250
+msgstr ""
+"No se pudo dar el codazo porque puede que el usuario %s esté desconectado."
+
+#: ../libpurple/protocols/jabber/jabber.c:2298
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "No se pudo dar un codazo porque el usuario %s no tiene soporte para ello."
-
-#: ../libpurple/protocols/jabber/jabber.c:2272
-#: ../libpurple/protocols/yahoo/yahoo.c:4129
+msgstr ""
+"No se pudo dar un codazo porque el usuario %s no tiene soporte para ello."
+
+#. 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
 msgid "Buzz"
 msgstr "Codazo"

-#: ../libpurple/protocols/jabber/jabber.c:2273
+#: ../libpurple/protocols/jabber/jabber.c:2319
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "¡%s le ha dado un codazo!"

-#: ../libpurple/protocols/jabber/jabber.c:2274
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#: ../libpurple/protocols/jabber/jabber.c:2319
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Dando un codazo a %s..."

-#: ../libpurple/protocols/jabber/jabber.c:2306
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."

-#: ../libpurple/protocols/jabber/jabber.c:2310
+#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"

-#: ../libpurple/protocols/jabber/jabber.c:2319
+#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."

-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."

-#: ../libpurple/protocols/jabber/jabber.c:2330
+#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."

-#: ../libpurple/protocols/jabber/jabber.c:2336
+#: ../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."

-#: ../libpurple/protocols/jabber/jabber.c:2342
+#: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6210,7 +6401,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
 "la afiliación de un usuario a la sala."

-#: ../libpurple/protocols/jabber/jabber.c:2348
+#: ../libpurple/protocols/jabber/jabber.c:2392
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6218,32 +6409,32 @@
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."

-#: ../libpurple/protocols/jabber/jabber.c:2354
+#: ../libpurple/protocols/jabber/jabber.c:2398
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."

-#: ../libpurple/protocols/jabber/jabber.c:2360
+#: ../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."

-#: ../libpurple/protocols/jabber/jabber.c:2366
+#: ../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."

-#: ../libpurple/protocols/jabber/jabber.c:2371
+#: ../libpurple/protocols/jabber/jabber.c:2415
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;nick&gt; &lt;mensaje&gt;:  Enviar un mensaje en privado a un usuario."

-#: ../libpurple/protocols/jabber/jabber.c:2377
+#: ../libpurple/protocols/jabber/jabber.c:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 "ping &lt;jid&gt;:       Hacer un ping a un usuario, componente o servidor."

-#: ../libpurple/protocols/jabber/jabber.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:4155
+#: ../libpurple/protocols/jabber/jabber.c:2426
+#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atención"

@@ -6263,7 +6454,7 @@
 msgstr "Complemento de protocolo XMPP"

 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Dominio"

@@ -6279,23 +6470,27 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"

-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3327
-#: ../libpurple/protocols/simple/simple.c:2089
+#: ../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/simple/simple.c:2105
 msgid "Connect port"
 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:231
-#: ../libpurple/protocols/myspace/myspace.c:3324
+#: ../libpurple/protocols/jabber/libxmpp.c:239
+#: ../libpurple/protocols/myspace/myspace.c:3465
 #: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:840
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "Conectar con el servidor"

-#: ../libpurple/protocols/jabber/libxmpp.c:236
+#: ../libpurple/protocols/jabber/libxmpp.c:244
 msgid "File transfer proxies"
 msgstr "Pasarelas de transferencia de archivos"

@@ -6404,8 +6599,8 @@

 #: ../libpurple/protocols/jabber/si.c:1092
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
-msgstr "Elija el recurso de %s al que quiere enviar un archivo"
+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
 msgid "Select a Resource"
@@ -6449,15 +6644,15 @@
 msgid "Set Nickname..."
 msgstr "Establecer apodo..."

-#: ../libpurple/protocols/jabber/xdata.c:378
+#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Actions"
 msgstr "Acciones"

-#: ../libpurple/protocols/jabber/xdata.c:380
+#: ../libpurple/protocols/jabber/xdata.c:383
 msgid "Select an action"
 msgstr "Seleccione una acción"

-#: ../libpurple/protocols/msn/contact.c:712
+#: ../libpurple/protocols/msn/contact.c:776
 msgid "Unable to retrieve MSN Address Book"
 msgstr "No se pudo obtener el libro de direcciones de MSN"

@@ -6544,7 +6739,7 @@

 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "El usuario no está conectado"

@@ -6610,7 +6805,7 @@

 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"

@@ -6734,10 +6929,10 @@

 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1375
+#: ../libpurple/protocols/oscar/oscar.c:1422
 #: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
+#: ../libpurple/protocols/silc10/ops.c:1713
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
 msgid "Authentication failed"
 msgstr "Falló la autenticación"

@@ -6778,49 +6973,49 @@
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"

-#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Codazo"

-#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "¡Le ha dado un codazo %s!"

-#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Dando un codazo a %s..."

-#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."

-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."

-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:297 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Éste es el nombre bajo el que otros amigos MSN le verán."

-#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Establezca el número de teléfono de su domicilio."

-#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Establezca el número de teléfono de su trabajo."

-#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Establezca su número de teléfono móvil."

-#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "¿Permitir los envíos de MSN Mobile?"

-#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:365 ../libpurple/protocols/msnp9/msn.c:348
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6828,394 +7023,413 @@
 "¿Quiere permitir o rechazar el envío de mensajes a través de MSN Mobile a su "
 "teléfono móvil (u otro dispositivo móvil) de la gente en su lista de amigos?"

-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:371 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Permitir"

-#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Rechazar"

-#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:388 ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "Puede que esta cuenta de Hotmail no esté activa."

-#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Enviar un mensaje a un móvil."

-#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Buscapersonas"

-#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
+msgid "Home Phone Number"
+msgstr "Número de teléfono de casa"
+
+#: ../libpurple/protocols/msn/msn.c:683 ../libpurple/protocols/msnp9/msn.c:571
+msgid "Work Phone Number"
+msgstr "Número de teléfono del trabajo"
+
+#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msnp9/msn.c:575
+msgid "Mobile Phone Number"
+msgstr "Número de teléfono móvil"
+
+#: ../libpurple/protocols/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3771
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"

-#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:598
 #: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3774
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "Busy"
 msgstr "Ocupado"

-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo.c:3786
+#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3144
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "On the Phone"
 msgstr "Al teléfono"

-#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3101
-#: ../libpurple/protocols/yahoo/yahoo.c:3792
+#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3148
+#: ../libpurple/protocols/yahoo/yahoo.c:3844
 msgid "Out to Lunch"
 msgstr "Salí a comer"

-#: ../libpurple/protocols/msn/msn.c:723
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/msn/msn.c:745
+#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Artista"

-#: ../libpurple/protocols/msn/msn.c:724
+#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "Album"

-#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Establecer su nombre de amigo..."

-#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Establecer el número de teléfono de su domicilio..."

-#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Establecer el número de teléfono de su trabajo..."

-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer su número de teléfono móvil..."

-#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Permitir/Rechazar dispositivos móviles..."

-#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rechazar páginas Mobile"

-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "Abrir bandeja de entrada de Hotmail"

-#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
+#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"

-#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
+#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"

-#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:871 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."

-#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
+#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."

-#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1526
+#: ../libpurple/protocols/msnp9/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"

-#: ../libpurple/protocols/msn/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:366
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1751
+#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
+#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "General"

-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../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/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
 msgid "Age"
 msgstr "Edad"

-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1601
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
 msgid "Occupation"
 msgstr "Ocupación"

-#: ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msnp9/msn.c:1602
+#: ../libpurple/protocols/myspace/user.c:133
 #: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
+#: ../libpurple/protocols/zephyr/zephyr.c:802
+#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Ubicación"

-#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
+#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
+#: ../libpurple/protocols/msnp9/msn.c:1607
+#: ../libpurple/protocols/msnp9/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1812
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"

-#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
+#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
+#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msnp9/msn.c:1613
+#: ../libpurple/protocols/msnp9/msn.c:1733
+#: ../libpurple/protocols/msnp9/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1754
+#: ../libpurple/protocols/msnp9/msn.c:1761
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"

-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "Social"

-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msnp9/msn.c:1632
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Marital Status"
 msgstr "Estado civil"

-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "Aficiones"

-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "Mascotas"

-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "Ciudad donde vive"

-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "Lugares donde he vivido"

-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "Moda"

-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "Humor"

-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
-msgid "Music"
-msgstr "Música"
-
-#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
-msgid "Favorite Quote"
-msgstr "Cita preferida"
-
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
-msgid "Contact Info"
-msgstr "Información del contacto"
-
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
-msgid "Personal"
-msgstr "Personal"
-
 #: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
+#: ../libpurple/protocols/msnp9/msn.c:1639
+msgid "Music"
+msgstr "Música"
+
+#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msn/msn.c:1986
+#: ../libpurple/protocols/msnp9/msn.c:1640
+#: ../libpurple/protocols/msnp9/msn.c:1821
+#: ../libpurple/protocols/msnp9/msn.c:1827
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
+msgid "Favorite Quote"
+msgstr "Cita preferida"
+
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msnp9/msn.c:1657
+msgid "Contact Info"
+msgstr "Información del contacto"
+
+#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msnp9/msn.c:1658
+msgid "Personal"
+msgstr "Personal"
+
+#: ../libpurple/protocols/msn/msn.c:1820
+#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "Otra persona importante"

-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1821
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "Teléfono de casa"

-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "Teléfono de casa (2)"

-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3840
 msgid "Home Address"
 msgstr "Domicilio"

-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "Móvil personal"

-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "Fax personal"

-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal E-Mail"
 msgstr "Correo-e personal"

-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "MI personal"

-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "Aniversario"

 #. Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "Trabajo"

 # Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
-#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/msn/msn.c:1847
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/silc/ops.c:1025
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"

-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1848
+#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3861
 msgid "Company"
 msgstr "Compañía"

-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1849
+#: ../libpurple/protocols/msnp9/msn.c:1690
 #: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departamento"

-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1850
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "Profesión"

-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1851
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "Teléfono del trabajo"

-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1852
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "Teléfono del trabajo (2)"

-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1853
+#: ../libpurple/protocols/msnp9/msn.c:1694
+#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Work Address"
 msgstr "Dirección del trabajo"

 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1854
+#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "Móvil del trabajo"

-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "Buscapersonas del trabajo"

-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1856
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "Fax del trabajo"

-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1857
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work E-Mail"
 msgstr "Correo-e del trabajo"

-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "MI del trabajo"

-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "Fecha inicial"

-#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
+#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Favorite Things"
 msgstr "Cosas preferidas"

-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
+#: ../libpurple/protocols/msn/msn.c:1994
+#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "Actualizado por última vez"

-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../libpurple/protocols/msn/msn.c:2005
+#: ../libpurple/protocols/msnp9/msn.c:1846
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página personal"

-#: ../libpurple/protocols/msn/msn.c:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2029
+#: ../libpurple/protocols/msnp9/msn.c:1870
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil público."

-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
+#: ../libpurple/protocols/msn/msn.c:2030
+#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7225,8 +7439,8 @@
 "que o bien el usuario no existe o que el usuario existe pero no ha creado un "
 "perfil público."

-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
+#: ../libpurple/protocols/msn/msn.c:2034
+#: ../libpurple/protocols/msnp9/msn.c:1875
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7234,9 +7448,9 @@
 "No se pudo encontrar información en el perfil de usuario. Es probable que el "
 "usuario no exista."

-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libpurple/protocols/msn/msn.c:2042
+#: ../libpurple/protocols/msnp9/msn.c:1883
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "URL del perfil"

@@ -7250,27 +7464,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Windows Live Messenger"

-#: ../libpurple/protocols/msn/msn.c:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
+#: ../libpurple/protocols/msn/msn.c:2366
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"

-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
+#: ../libpurple/protocols/msn/msn.c:2371
+#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "Servidor de método HTTP"

-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
+#: ../libpurple/protocols/msn/msn.c:2376
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"

-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
+#: ../libpurple/protocols/msn/msn.c:2384
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atención"

@@ -7283,7 +7497,9 @@
 msgid ""
 "Windows Live ID authentication: cannot find authenticate token in server "
 "response"
-msgstr "Autenticación Windows Live ID: no se encontró el token de autenticación en la respuesta del servidor"
+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
 msgid "Windows Live ID authentication Failed"
@@ -7300,7 +7516,7 @@
 #: ../libpurple/protocols/msn/session.c:387
 #: ../libpurple/protocols/msnp9/notification.c:184
 #: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:340
+#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Error desconocido."

@@ -7321,7 +7537,7 @@
 msgstr "Error desconocido (%d)"

 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
+#: ../libpurple/protocols/sametime/sametime.c:4480
 msgid "Unable to add user"
 msgstr "No puede añadir al usuario"

@@ -7360,18 +7576,18 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Servicio no disponible temporalmente."

-#: ../libpurple/protocols/msn/notification.c:1276
-#: ../libpurple/protocols/msnp9/notification.c:866
+#: ../libpurple/protocols/msn/notification.c:1328
+#: ../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:1331
-#: ../libpurple/protocols/msnp9/notification.c:921
+#: ../libpurple/protocols/msn/notification.c:1383
+#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"

-#: ../libpurple/protocols/msn/notification.c:1944
-#: ../libpurple/protocols/msnp9/notification.c:1340
+#: ../libpurple/protocols/msn/notification.c:1997
+#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7418,8 +7634,9 @@
 #: ../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/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "No se pudo conectar"

@@ -7444,42 +7661,42 @@
 "%s"

 #: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:302
+#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no soporta nuestro protocolo."

 #: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:307
+#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Error en el análisis HTTP."

 #: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/msnp9/session.c:310
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicación."

 #: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:317
+#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."

 #: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:323
+#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."

 #: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:328
+#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No se pudo autenticar: %s"

 #: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:334
+#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
@@ -7488,28 +7705,28 @@

 #: ../libpurple/protocols/msn/session.c:403
 #: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Negociación"

 #: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:359
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Empezando la autenticación"

 #: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:360
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Obteniendo una cookie"

 #: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:362
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Enviando cookie"

 #: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:363
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"

@@ -7528,35 +7745,35 @@
 msgid "Out To Lunch"
 msgstr "Salí a comer"

-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 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:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 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:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 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:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 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:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:426
+#: ../libpurple/protocols/msnp9/switchboard.c:428
 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:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:430
+#: ../libpurple/protocols/msnp9/switchboard.c:432
 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:"
@@ -7565,15 +7782,15 @@
 "servidor. Es posible que se trate de un error del servidor, vuelva a "
 "intentarlo en unos minutos."

-#: ../libpurple/protocols/msn/switchboard.c:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 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:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:445
+#: ../libpurple/protocols/msnp9/switchboard.c:447
 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:"

@@ -7592,18 +7809,18 @@
 #. 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:693
+#: ../libpurple/protocols/msn/userlist.c:714
 #: ../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:696
+#: ../libpurple/protocols/msn/userlist.c:717
 #: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "El nombre de usuario especificado no es válido."

-#: ../libpurple/protocols/msnp9/msn.c:549
+#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr "Le tiene"

@@ -7617,8 +7834,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"

@@ -7638,34 +7855,19 @@
 "Actualice a una versión de libpurple con soporte de RC4 (>= 2.0.1). No se "
 "cargará el complemento de MySpaceIM."

-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-"Lo siento, MySpace no permite el uso de contraseñas de más de %d caracteres "
-"de longitud (la suya tiene %d)."
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1842
-msgid "MySpaceIM Error"
-msgstr "Error MySpaceIM"
-
-#: ../libpurple/protocols/myspace/myspace.c:352
+#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "Leyendo el desafío"

-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "Longitud de desafío inesperada recibida del servidor"

-#: ../libpurple/protocols/myspace/myspace.c:364
+#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Accediendo"

-#: ../libpurple/protocols/myspace/myspace.c:1318
+#: ../libpurple/protocols/myspace/myspace.c:1324
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
@@ -7673,117 +7875,127 @@
 "segundos)"

 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1361
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New mail messages"
 msgstr "Mensajes de correo nuevos"

-#: ../libpurple/protocols/myspace/myspace.c:1362
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New blog comments"
 msgstr "Nuevos comentarios de bitácora"

-#: ../libpurple/protocols/myspace/myspace.c:1363
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New profile comments"
 msgstr "Nuevos comentarios de perfil"

-#: ../libpurple/protocols/myspace/myspace.c:1364
+#: ../libpurple/protocols/myspace/myspace.c:1370
 msgid "New friend requests!"
 msgstr "¡Nuevas solicitudes de amigos!"

-#: ../libpurple/protocols/myspace/myspace.c:1365
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "New picture comments"
 msgstr "Nuevos comentarios de fotos"

-#: ../libpurple/protocols/myspace/myspace.c:1393
+#: ../libpurple/protocols/myspace/myspace.c:1401
 msgid "MySpace"
 msgstr "MySpace"

+#: ../libpurple/protocols/myspace/myspace.c:1587
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - No se ha configurado un nombre de usuario"
+
+#: ../libpurple/protocols/myspace/myspace.c:1588
+msgid "You appear to have no MySpace username."
+msgstr "Parece que no tiene un nombre de usuario MySpace."
+
+#: ../libpurple/protocols/myspace/myspace.c:1589
+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:1576
-#: ../libpurple/protocols/sametime/sametime.c:1546
+#: ../libpurple/protocols/myspace/myspace.c:1613
+#: ../libpurple/protocols/sametime/sametime.c:1547
 msgid "Connected"
 msgstr "Conectado"

-#: ../libpurple/protocols/myspace/myspace.c:1587
-#: ../libpurple/protocols/myspace/myspace.c:1590
-msgid "No username set"
-msgstr "No se ha configurado un nombre de usuario"
-
-#: ../libpurple/protocols/myspace/myspace.c:1588
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-"Por favor, vaya a http://editprofile.myspace.com/index.cfm?"
-"fuseaction=profile.username, escoja un nombre de usuario e intente "
-"conectarse de nuevo."
-
-#: ../libpurple/protocols/myspace/myspace.c:1816
+#: ../libpurple/protocols/myspace/myspace.c:1848
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Error de prótocolo, código %d: %s"

-#: ../libpurple/protocols/myspace/myspace.c:2012
-#: ../libpurple/protocols/myspace/myspace.c:2046
+#: ../libpurple/protocols/myspace/myspace.c:1870
+#, 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."
+
+#: ../libpurple/protocols/myspace/myspace.c:1893
+msgid "MySpaceIM Error"
+msgstr "Error MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:2071
+#: ../libpurple/protocols/myspace/myspace.c:2105
 msgid "Failed to add buddy"
 msgstr "No se pudo añadir al amigo"

-#: ../libpurple/protocols/myspace/myspace.c:2012
+#: ../libpurple/protocols/myspace/myspace.c:2071
 msgid "'addbuddy' command failed."
 msgstr "Falló la orden 'addbudy'."

-#: ../libpurple/protocols/myspace/myspace.c:2046
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2105
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "persist command failed"
 msgstr "Falló la orden 'persist'"

-#: ../libpurple/protocols/myspace/myspace.c:2151
+#: ../libpurple/protocols/myspace/myspace.c:2210
 #, c-format
 msgid "No such user: %s"
 msgstr "No existe el usuario: %s"

-#: ../libpurple/protocols/myspace/myspace.c:2152
+#: ../libpurple/protocols/myspace/myspace.c:2212
 msgid "User lookup"
 msgstr "Búsqueda de usuario"

-#: ../libpurple/protocols/myspace/myspace.c:2264
-#: ../libpurple/protocols/myspace/myspace.c:2283
-#: ../libpurple/protocols/myspace/myspace.c:2305
+#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Failed to remove buddy"
 msgstr "No se pudo eliminar al amigo"

-#: ../libpurple/protocols/myspace/myspace.c:2264
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "'delbuddy' command failed"
 msgstr "Falló la orden 'delbuddy'"

-#: ../libpurple/protocols/myspace/myspace.c:2305
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "blocklist command failed"
 msgstr "Falló la orden 'blocklist'"

-#: ../libpurple/protocols/myspace/myspace.c:2353
+#: ../libpurple/protocols/myspace/myspace.c:2486
 msgid "Invalid input condition"
 msgstr "Condición de entrada inválida"

-#: ../libpurple/protocols/myspace/myspace.c:2373
-#: ../libpurple/protocols/myspace/myspace.c:2410
-msgid "Read buffer full"
-msgstr "Cola de lectura llena"
-
-#: ../libpurple/protocols/myspace/myspace.c:2452
+#: ../libpurple/protocols/myspace/myspace.c:2541
+msgid "Read buffer full (2)"
+msgstr "Cola de lectura llena (2)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2584
 msgid "Unparseable message"
 msgstr "No se pudo interpretar el mensaje"

-#: ../libpurple/protocols/myspace/myspace.c:2521
+#: ../libpurple/protocols/myspace/myspace.c:2655
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "No se pudo conectar al servidor: %s (%d)"

-#: ../libpurple/protocols/myspace/myspace.c:2692
+#: ../libpurple/protocols/myspace/myspace.c:2833
 msgid "IM Friends"
 msgstr "Amigos MI"

-#: ../libpurple/protocols/myspace/myspace.c:2791
+#: ../libpurple/protocols/myspace/myspace.c:2933
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7792,121 +8004,155 @@
 "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:2792
+#: ../libpurple/protocols/myspace/myspace.c:2934
 msgid "Add contacts from server"
 msgstr "Añadir contactos del servidor"

-#: ../libpurple/protocols/myspace/myspace.c:2844
-#: ../libpurple/protocols/myspace/myspace.c:2909
+#: ../libpurple/protocols/myspace/myspace.c:2986
+#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Add friends from MySpace.com"
 msgstr "Añadir amigos de MySpace.com"

-#: ../libpurple/protocols/myspace/myspace.c:2845
+#: ../libpurple/protocols/myspace/myspace.c:2987
 msgid "Importing friends failed"
 msgstr "Falló la carga de los amigos"

 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2901
+#: ../libpurple/protocols/myspace/myspace.c:3043
 msgid "Find people..."
 msgstr "Encontrar gente... "

-#: ../libpurple/protocols/myspace/myspace.c:2904
+#: ../libpurple/protocols/myspace/myspace.c:3046
 msgid "Change IM name..."
 msgstr "Cambiar mi nombre MI..."

-#: ../libpurple/protocols/myspace/myspace.c:3206
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "myim URL handler"
 msgstr "gestor de URL myim"

-#: ../libpurple/protocols/myspace/myspace.c:3207
+#: ../libpurple/protocols/myspace/myspace.c:3348
 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:3208
+#: ../libpurple/protocols/myspace/myspace.c:3349
 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:3331
+#: ../libpurple/protocols/myspace/myspace.c:3472
 msgid "Show display name in status text"
 msgstr "Mostrar el nombre visible en el texto de estado"

-#: ../libpurple/protocols/myspace/myspace.c:3334
+#: ../libpurple/protocols/myspace/myspace.c:3475
 msgid "Show headline in status text"
 msgstr "Mostrar titulares en los textos de estado"

-#: ../libpurple/protocols/myspace/myspace.c:3339
+#: ../libpurple/protocols/myspace/myspace.c:3480
 msgid "Send emoticons"
 msgstr "Enviar emoticonos"

-#: ../libpurple/protocols/myspace/myspace.c:3344
+#: ../libpurple/protocols/myspace/myspace.c:3485
 msgid "Screen resolution (dots per inch)"
 msgstr "Resolución de pantalla (puntos por pulgada)"

-#: ../libpurple/protocols/myspace/myspace.c:3347
+#: ../libpurple/protocols/myspace/myspace.c:3488
 msgid "Base font size (points)"
 msgstr "Tamaño de tipografía base (puntos)"

-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Usuario"

-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3032
 msgid "Profile"
 msgstr "Perfil"

-#: ../libpurple/protocols/myspace/user.c:128
+#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "Titular"

-#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Canción"

-#: ../libpurple/protocols/myspace/user.c:141
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Amigos en total"

-#: ../libpurple/protocols/myspace/user.c:159
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Versión del cliente"

+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+msgid "No username set"
+msgstr "No se ha configurado un nombre de usuario"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Introduzca un nombre de usuario"
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr "Defina un nombre de usuario para comprobar si está disponible:"
+
+#: ../libpurple/protocols/myspace/user.c:658
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - Nombre de usuario disponible"
+
+#: ../libpurple/protocols/myspace/user.c:659
+msgid "This username is available. Would you like to set it?"
+msgstr "Este nombre de usuario está disponible, ¿quiere utilizarlo?"
+
+#: ../libpurple/protocols/myspace/user.c:660
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "¡NO PODRÁ MODIFICARLO UNA VEZ FIJADO!"
+
+#: ../libpurple/protocols/myspace/user.c:672
+msgid "This username is unavailable."
+msgstr "Este nombre de usuario no está disponible."
+
+#: ../libpurple/protocols/myspace/user.c:673
+msgid "Please try another username:"
+msgstr "Introduzca otro nombre de usuario:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Zapear"

-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "¡%s le ha zapeado!"

-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Zapeando a %s..."

 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Golpear"

-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "¡%s le ha golpeado!"

-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Golpeando a %s..."
@@ -7914,7 +8160,7 @@
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
+#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Encender"

@@ -7933,57 +8179,57 @@
 msgid "Smooch"
 msgstr "Besar"

-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "¡%s le ha besado!"

-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Besando a %s..."

 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Abrazar"

-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "¡%s le ha abrazado!"

-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Abrazando a %s..."

 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Abofetear"

-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "¡%s le ha abofeteado!"

-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Abofeteando a %s..."

 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Pellizcar el trasero"

-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "¡%s le ha pellizcado el trasero!"

-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Pellizcando el trasero de %s..."
@@ -7991,16 +8237,16 @@
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "Chocar los cinco"

-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "¡%s le ha chocado los cinco!"

-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Chocando los cinco con %s..."
@@ -8008,16 +8254,16 @@
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Tomar el pelo"

-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "¡%s le ha tomado el pelo!"

-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Tomando el pelo a %s..."
@@ -8029,16 +8275,16 @@
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Pedorreta"

-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "¡%s le ha hecho una pedorreta!"

-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Haciendo una pedorreta a %s..."
@@ -8285,7 +8531,7 @@
 msgstr "Buzón de correo"

 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
+#: ../libpurple/protocols/sametime/sametime.c:4177
 msgid "User ID"
 msgstr "ID de usuario"

@@ -8340,12 +8586,12 @@
 msgid "Would you like to join the conversation?"
 msgstr "¿Desea unirse a la conversación?"

-#: ../libpurple/protocols/novell/novell.c:2027
+#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Ha sido desconectado porque se ha conectado desde otra estación de trabajo."

-#: ../libpurple/protocols/novell/novell.c:2084
+#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8353,7 +8599,7 @@
 "No parece que %s esté conectado y no ha recibido el mensaje que acaba de "
 "enviar."

-#: ../libpurple/protocols/novell/novell.c:2184
+#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8361,11 +8607,11 @@
 "No se pudo contactar con el servidor. Por favor, indique la dirección del "
 "servidor con el que desea conectarse."

-#: ../libpurple/protocols/novell/novell.c:2213
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no está instalado."

-#: ../libpurple/protocols/novell/novell.c:2521
+#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."

@@ -8379,16 +8625,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
+#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensajería de Grupos de Novell"

-#: ../libpurple/protocols/novell/novell.c:3562
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Dirección del servidor"

-#: ../libpurple/protocols/novell/novell.c:3566
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Puerto del servidor"

@@ -8401,19 +8647,19 @@
 msgstr "Nombre de sala de chat inválida"

 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2472
-#: ../libpurple/protocols/yahoo/yahoo.c:2640
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
+#: ../libpurple/protocols/yahoo/yahoo.c:2505
+#: ../libpurple/protocols/yahoo/yahoo.c:2673
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
+#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
+#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
 msgid "Server closed the connection."
 msgstr "El servidor ha cerrado la conexión."

 #: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2633 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
+#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
+#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8423,9 +8669,9 @@
 "%s"

 #: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
+#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
+#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
+#: ../libpurple/proxy.c:1554
 msgid "Received invalid data on connection with server."
 msgstr "Se recibieron datos inválidos al conectarse al servidor."

@@ -8460,8 +8706,8 @@
 msgstr "Complemento de protocolo ICQ"

 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4452
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Codificación"

@@ -8495,110 +8741,113 @@
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
-msgstr "%s intentó enviar un archivo %s, pero sólo se permite enviar ficheros hasta %s a través de conexión MI directa. Inténtelo de nuevo utilizando la función de transferencia de archivos.\n"
+msgstr ""
+"%s intentó enviar un archivo %s, pero sólo se permite enviar ficheros hasta %"
+"s a través de conexión MI directa. Inténtelo de nuevo utilizando la función "
+"de transferencia de archivos.\n"

 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fichero %s es %s, que es más grande que el tamaño máximo de %s."

-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Error inválido"

-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"

-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"

-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"

-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Servicio no disponible"

-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Servicio no definido"

-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"

-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"

-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"

-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"

-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"

-#: ../libpurple/protocols/oscar/oscar.c:128
-msgid "Responses lost"
-msgstr "Respuestas perdidas"
-
 #: ../libpurple/protocols/oscar/oscar.c:129
-msgid "Request denied"
-msgstr "Solicitud denegada"
+msgid "Responses lost"
+msgstr "Respuestas perdidas"

 #: ../libpurple/protocols/oscar/oscar.c:130
+msgid "Request denied"
+msgstr "Solicitud denegada"
+
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"

-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"

-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "En la lista local de autorizar/negar"

-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (sender)"
 msgstr "Demasiado malvado (remitente)"

-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
-msgstr "Demasiado malvado (destinatario)"
-
 #: ../libpurple/protocols/oscar/oscar.c:135
-msgid "User temporarily unavailable"
-msgstr "Usuario temporalmente no disponible"
+msgid "Too evil (receiver)"
+msgstr "Demasiado malvado (destinatario)"

 #: ../libpurple/protocols/oscar/oscar.c:136
+msgid "User temporarily unavailable"
+msgstr "Usuario temporalmente no disponible"
+
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "No hubo coincidencia"

-#: ../libpurple/protocols/oscar/oscar.c:137
-msgid "List overflow"
-msgstr "Desbordamiento de la lista"
-
 #: ../libpurple/protocols/oscar/oscar.c:138
+msgid "List overflow"
+msgstr "Desbordamiento de la lista"
+
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Solicitud ambigua"

-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Cola llena"

-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"

-#: ../libpurple/protocols/oscar/oscar.c:347
+#: ../libpurple/protocols/oscar/oscar.c:349
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8610,7 +8859,7 @@
 "Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
 "ICQ si sabe que codificación está utilizando.)"

-#: ../libpurple/protocols/oscar/oscar.c:456
+#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8621,147 +8870,135 @@
 "defectuosa.)"

 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2392
-#: ../pidgin/gtkutils.c:2422
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
+#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2444
+#: ../pidgin/gtkutils.c:2474
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "Icono de amigo"

-#: ../libpurple/protocols/oscar/oscar.c:641
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "Voz"

-#: ../libpurple/protocols/oscar/oscar.c:644
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"

-#: ../libpurple/protocols/oscar/oscar.c:647
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Charlar"
-
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Get File"
 msgstr "Recibir archivo"

-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "Juegos"

-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "Extensiones"

-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"

-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"

-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "Usuario de AP"

-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"

-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "Nihilista"

-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"

-#: ../libpurple/protocols/oscar/oscar.c:681
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"

-#: ../libpurple/protocols/oscar/oscar.c:684
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"

-#: ../libpurple/protocols/oscar/oscar.c:687
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"

-#: ../libpurple/protocols/oscar/oscar.c:690
+#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "Hiptop"

-#: ../libpurple/protocols/oscar/oscar.c:693
+#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "Seguridad activada"

-#: ../libpurple/protocols/oscar/oscar.c:696
+#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "Video chat"

-#: ../libpurple/protocols/oscar/oscar.c:700
+#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat AV"

-#: ../libpurple/protocols/oscar/oscar.c:703
+#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"

-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "Cámara"

-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5805
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5909
 msgid "Free For Chat"
 msgstr "Disponible para conversar"

-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5840
-msgid "Not Available"
-msgstr "No disponible"
-
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5826
+#: ../libpurple/protocols/oscar/oscar.c:5944
+msgid "Not Available"
+msgstr "No disponible"
+
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5930
 msgid "Occupied"
 msgstr "Ocupado"

-#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:736
 msgid "Web Aware"
 msgstr "Capacidad web"

-#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3105 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "Invisible"

-#: ../libpurple/protocols/oscar/oscar.c:738
-msgid "Online"
-msgstr "Conectado"
-
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3688
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1153
+#: ../libpurple/protocols/oscar/oscar.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3754
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "Dirección IP"

-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:846
+#: ../libpurple/protocols/oscar/oscar.c:2959
 msgid "Warning Level"
 msgstr "Niveles de aviso"

-#: ../libpurple/protocols/oscar/oscar.c:854
+#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"

-#: ../libpurple/protocols/oscar/oscar.c:994
+#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8770,7 +9007,7 @@
 "No se pudo conectar al servidor de autenticación:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:1002
+#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8779,59 +9016,54 @@
 "No se pudo conectar al servidor BOS:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:1042
-msgid "Screen name sent"
-msgstr "Se ha enviado el nombre de usuario"
-
-#: ../libpurple/protocols/oscar/oscar.c:1047
+#: ../libpurple/protocols/oscar/oscar.c:1044
+msgid "Username sent"
+msgstr "Nombre de usuario enviado"
+
+#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"

 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"

-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names 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."
+#: ../libpurple/protocols/oscar/oscar.c:1306
+#, c-format
+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."

 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2107
-msgid "Invalid screen name."
-msgstr "Nombre de usuario no válido"
-
-#: ../libpurple/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1392
+msgid "Invalid username."
+msgstr "Nombre de usuario no válido."
+
+#: ../libpurple/protocols/oscar/oscar.c:1398
 #: ../libpurple/protocols/qq/login_logout.c:485
 #: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."

 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."

 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1359
+#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."

 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1419
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8841,46 +9073,45 @@
 "tiempo."

 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"

-#: ../libpurple/protocols/oscar/oscar.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"

-#: ../libpurple/protocols/oscar/oscar.c:1409
+#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "Se recibió la autorización"

-#: ../libpurple/protocols/oscar/oscar.c:1432
+#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es válida."

-#: ../libpurple/protocols/oscar/oscar.c:1445
+#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"

-#: ../libpurple/protocols/oscar/oscar.c:1446
+#: ../libpurple/protocols/oscar/oscar.c:1493
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."

 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1448
-#: ../libpurple/protocols/oscar/oscar.c:2237
-#: ../libpurple/protocols/oscar/oscar.c:2286
-#: ../libpurple/protocols/oscar/oscar.c:5910
-#: ../libpurple/protocols/oscar/oscar.c:6191 ../libpurple/request.h:1388
+#: ../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
 msgid "_OK"
 msgstr "_Aceptar"

-#: ../libpurple/protocols/oscar/oscar.c:1487
-#: ../libpurple/protocols/oscar/oscar.c:1530
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8889,53 +9120,54 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."

-#: ../libpurple/protocols/oscar/oscar.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:1533
+#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "No se pudo obtener un «hash» de conexión a AIM válido."

-#: ../libpurple/protocols/oscar/oscar.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:1578
+#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."

-#: ../libpurple/protocols/oscar/oscar.c:1621
+#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "No se pudo un «hash» de conexión válido."

-#: ../libpurple/protocols/oscar/oscar.c:1651
+#: ../libpurple/protocols/oscar/oscar.c:1710
 msgid "Password sent"
 msgstr "Contraseña enviada"

-#: ../libpurple/protocols/oscar/oscar.c:1707
+#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexión"

-#: ../libpurple/protocols/oscar/oscar.c:2195
+#: ../libpurple/protocols/oscar/oscar.c:2256
 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:2235
+#: ../libpurple/protocols/oscar/oscar.c:2298
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"

-#: ../libpurple/protocols/oscar/oscar.c:2236
+#: ../libpurple/protocols/oscar/oscar.c:2299
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"

-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:2285
-#: ../libpurple/protocols/oscar/oscar.c:2412
-#: ../libpurple/protocols/oscar/oscar.c:5282
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../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/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "No se indicó una razón."

-#: ../libpurple/protocols/oscar/oscar.c:2284
+#: ../libpurple/protocols/oscar/oscar.c:2347
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"

-#: ../libpurple/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8946,18 +9178,18 @@
 "la siguiente razón:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."

 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2483
 #, 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:2428
+#: ../libpurple/protocols/oscar/oscar.c:2491
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8970,7 +9202,7 @@
 "De: %s [%s]\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2499
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8983,7 +9215,7 @@
 "De: %s [%s]\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2444
+#: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8996,38 +9228,38 @@
 "El mensaje es:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2465
+#: ../libpurple/protocols/oscar/oscar.c:2528
 #, 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:2471
+#: ../libpurple/protocols/oscar/oscar.c:2534
 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:2476 ../pidgin/gtkroomlist.c:318
+#: ../libpurple/protocols/oscar/oscar.c:2539 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Añadir"

-#: ../libpurple/protocols/oscar/oscar.c:2477
+#: ../libpurple/protocols/oscar/oscar.c:2540
 msgid "_Decline"
 msgstr "_Rehusar"

-#: ../libpurple/protocols/oscar/oscar.c:2601
+#: ../libpurple/protocols/oscar/oscar.c:2664
 #, 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:2610
+#: ../libpurple/protocols/oscar/oscar.c:2673
 #, 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:2619
+#: ../libpurple/protocols/oscar/oscar.c:2682
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9037,21 +9269,21 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."

-#: ../libpurple/protocols/oscar/oscar.c:2628
+#: ../libpurple/protocols/oscar/oscar.c:2691
 #, 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:2637
+#: ../libpurple/protocols/oscar/oscar.c:2700
 #, 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:2646
+#: ../libpurple/protocols/oscar/oscar.c:2709
 #, 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."
@@ -9059,47 +9291,47 @@
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."

 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2801
+#: ../libpurple/protocols/oscar/oscar.c:2864
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"

-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2806
-#: ../libpurple/protocols/oscar/oscar.c:2870
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2933
 msgid "Unknown reason."
 msgstr "Razón desconocida."

-#: ../libpurple/protocols/oscar/oscar.c:2804
-#: ../libpurple/protocols/sametime/sametime.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/sametime/sametime.c:2460
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"

-#: ../libpurple/protocols/oscar/oscar.c:2870
+#: ../libpurple/protocols/oscar/oscar.c:2933
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario de no disponible: %s"

-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Online Since"
 msgstr "Conectado desde"

-#: ../libpurple/protocols/oscar/oscar.c:2906
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "Miembro desde"

-#: ../libpurple/protocols/oscar/oscar.c:2941
+#: ../libpurple/protocols/oscar/oscar.c:3004
 msgid "Available Message"
 msgstr "Mensajes disponibles"

-#: ../libpurple/protocols/oscar/oscar.c:3049
+#: ../libpurple/protocols/oscar/oscar.c:3108
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."

 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3237
+#: ../libpurple/protocols/oscar/oscar.c:3296
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9107,7 +9339,7 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"

-#: ../libpurple/protocols/oscar/oscar.c:3401
+#: ../libpurple/protocols/oscar/oscar.c:3460
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9116,125 +9348,115 @@
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."

-#: ../libpurple/protocols/oscar/oscar.c:3486
+#: ../libpurple/protocols/oscar/oscar.c:3545
 #: ../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:3710
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"

-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Personal Web Page"
 msgstr "Página web personal"

-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3830
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Información adicional"

-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3838
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Zip Code"
 msgstr "Código postal"

-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3862
 msgid "Division"
 msgstr "Sección"

-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3863
 msgid "Position"
 msgstr "Cargo"

-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Web Page"
 msgstr "Página web"

-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3868
 msgid "Work Information"
 msgstr "Información de trabajo"

-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"

-#: ../libpurple/protocols/oscar/oscar.c:3898
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
+#: ../libpurple/protocols/oscar/oscar.c:3964
+#, 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 siguientes nombres de usuarios están asociados a %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:3903
-msgid "Screen name"
-msgstr "Nombre de usuario"
-
-#: ../libpurple/protocols/oscar/oscar.c:3929
+msgstr[1] "Los nombres de usuarios siguientes están asociados a %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, 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:3950
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, 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:3952
+#: ../libpurple/protocols/oscar/oscar.c:4018
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"

-#: ../libpurple/protocols/oscar/oscar.c:3983
-msgid "Error Changing Account Info"
-msgstr "Error cambiando la información de la cuenta"
-
-#: ../libpurple/protocols/oscar/oscar.c:3986
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+#: ../libpurple/protocols/oscar/oscar.c:4051
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
 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:3989
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Error 0x%04x: No se puede dar formato al nombre de usuario porque es "
-"inválido."
-
-#: ../libpurple/protocols/oscar/oscar.c:3992
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+#: ../libpurple/protocols/oscar/oscar.c:4053
+#, 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."
+
+#: ../libpurple/protocols/oscar/oscar.c:4055
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
 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:3995
+#: ../libpurple/protocols/oscar/oscar.c:4057
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 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:3998
+#: ../libpurple/protocols/oscar/oscar.c:4059
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 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:4001
+#: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9243,32 +9465,36 @@
 "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:4004
+#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."

-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4065
+msgid "Error Changing Account Info"
+msgstr "Error cambiando la información de la cuenta"
+
+#: ../libpurple/protocols/oscar/oscar.c:4071
 #, 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:4016
+#: ../libpurple/protocols/oscar/oscar.c:4073
 msgid "Account Info"
 msgstr "Información de la cuenta"

-#: ../libpurple/protocols/oscar/oscar.c:4199
+#: ../libpurple/protocols/oscar/oscar.c:4259
 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:4470
+#: ../libpurple/protocols/oscar/oscar.c:4530
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."

-#: ../libpurple/protocols/oscar/oscar.c:4471
+#: ../libpurple/protocols/oscar/oscar.c:4531
 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 "
@@ -9278,7 +9504,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."

-#: ../libpurple/protocols/oscar/oscar.c:4485
+#: ../libpurple/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9291,11 +9517,11 @@
 msgstr[1] ""
 "Se ha excedido el tamaño máximo de perfil de %d bytes. Se ha truncado."

-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4550
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."

-#: ../libpurple/protocols/oscar/oscar.c:4535
+#: ../libpurple/protocols/oscar/oscar.c:4594
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9310,46 +9536,49 @@
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia. Se "
 "ha truncado."

-#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:4599
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"

-#: ../libpurple/protocols/oscar/oscar.c:4613
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+#: ../libpurple/protocols/oscar/oscar.c:4672
+#, c-format
+msgid ""
+"Could not add the buddy %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 ""
 "No se pudo añadir al amigo %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 contener sólo letras, números y espacios, o contener sólo números."

-#: ../libpurple/protocols/oscar/oscar.c:4615
-#: ../libpurple/protocols/oscar/oscar.c:5068
-#: ../libpurple/protocols/oscar/oscar.c:5083
+#: ../libpurple/protocols/oscar/oscar.c:4674
+#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Unable To Add"
 msgstr "No se pudo añadir"

-#: ../libpurple/protocols/oscar/oscar.c:4734
+#: ../libpurple/protocols/oscar/oscar.c:4793
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"

-#: ../libpurple/protocols/oscar/oscar.c:4735
+#: ../libpurple/protocols/oscar/oscar.c:4794
 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."
-msgstr "No se ha podido enviar su lista de amigos a los servidores de AIM. No se ha perdido la lista de amigos, seguramente volverá a estar disponible en unos minutos."
-
-#: ../libpurple/protocols/oscar/oscar.c:4918
-#: ../libpurple/protocols/oscar/oscar.c:4920
-#: ../libpurple/protocols/oscar/oscar.c:5148
-#: ../libpurple/protocols/oscar/oscar.c:5149
-#: ../libpurple/protocols/oscar/oscar.c:5154
+msgstr ""
+"No se ha podido enviar su lista de amigos a los servidores de AIM. No se ha "
+"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
 msgid "Orphans"
 msgstr "Huérfanos"

-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9358,17 +9587,17 @@
 "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:5066
-#: ../libpurple/protocols/oscar/oscar.c:5081
+#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5168
 msgid "(no name)"
 msgstr "(sin nombre)"

-#: ../libpurple/protocols/oscar/oscar.c:5080
+#: ../libpurple/protocols/oscar/oscar.c:5167
 #, 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:5197
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9377,23 +9606,23 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"

-#: ../libpurple/protocols/oscar/oscar.c:5205
+#: ../libpurple/protocols/oscar/oscar.c:5309
 msgid "Authorization Given"
 msgstr "Autorización otorgada"

 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/oscar/oscar.c:5382
 #, 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:5279
+#: ../libpurple/protocols/oscar/oscar.c:5383
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"

 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5282
+#: ../libpurple/protocols/oscar/oscar.c:5386
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9404,48 +9633,48 @@
 "la siguiente razón:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:5283
+#: ../libpurple/protocols/oscar/oscar.c:5387
 msgid "Authorization Denied"
 msgstr "Autorización denegada"

-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5423
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"

-#: ../libpurple/protocols/oscar/oscar.c:5432
+#: ../libpurple/protocols/oscar/oscar.c:5536
 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:5594
-#: ../libpurple/protocols/oscar/oscar.c:5599
+#: ../libpurple/protocols/oscar/oscar.c:5698
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "Away Message"
 msgstr "Mensajes de ausencia"

-#: ../libpurple/protocols/oscar/oscar.c:5599
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"

-#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:5903
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"

-#: ../libpurple/protocols/oscar/oscar.c:5907
+#: ../libpurple/protocols/oscar/oscar.c:6011
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"

-#: ../libpurple/protocols/oscar/oscar.c:5908
+#: ../libpurple/protocols/oscar/oscar.c:6012
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"

-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:6059
 #, 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:5959
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9453,67 +9682,67 @@
 "Puede considerarse como un riesgo a su privacidad  ya que hacer ésto revela "
 "su dirección IP. ¿Quiere continuar?"

-#: ../libpurple/protocols/oscar/oscar.c:5965
+#: ../libpurple/protocols/oscar/oscar.c:6069
 #: ../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:6000
+#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get AIM Info"
 msgstr "Info"

-#: ../libpurple/protocols/oscar/oscar.c:6006
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"

-#: ../libpurple/protocols/oscar/oscar.c:6014
+#: ../libpurple/protocols/oscar/oscar.c:6118
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"

-#: ../libpurple/protocols/oscar/oscar.c:6027
+#: ../libpurple/protocols/oscar/oscar.c:6131
 msgid "Direct IM"
 msgstr "MI directo"

-#: ../libpurple/protocols/oscar/oscar.c:6049
+#: ../libpurple/protocols/oscar/oscar.c:6153
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"

-#: ../libpurple/protocols/oscar/oscar.c:6108
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Require authorization"
 msgstr "Solicitar autorización"

-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6215
 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:6116
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"

-#: ../libpurple/protocols/oscar/oscar.c:6135
+#: ../libpurple/protocols/oscar/oscar.c:6240
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."

-#: ../libpurple/protocols/oscar/oscar.c:6136
-msgid "Screen name formatting can change only capitalization and whitespace."
+#: ../libpurple/protocols/oscar/oscar.c:6241
+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:6189
+#: ../libpurple/protocols/oscar/oscar.c:6294
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"

-#: ../libpurple/protocols/oscar/oscar.c:6235
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"

-#: ../libpurple/protocols/oscar/oscar.c:6238
+#: ../libpurple/protocols/oscar/oscar.c:6343
 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:6239
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9521,74 +9750,66 @@
 "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:6256
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrónico"

-#: ../libpurple/protocols/oscar/oscar.c:6257
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"

-#: ../libpurple/protocols/oscar/oscar.c:6258
+#: ../libpurple/protocols/oscar/oscar.c:6363
 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:6261
+#: ../libpurple/protocols/oscar/oscar.c:6366
 msgid "_Search"
 msgstr "_Buscar"

-#: ../libpurple/protocols/oscar/oscar.c:6419
-msgid "Set User Info (URL)..."
-msgstr "Establecer su información de usuario (URL)..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Change Password (URL)"
-msgstr "Cambiar su contraseña (URL)"
-
-#: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Configure IM Forwarding (URL)"
-msgstr "Configurar reenvío de MI (URL)"
+#: ../libpurple/protocols/oscar/oscar.c:6524
+msgid "Set User Info (web)..."
+msgstr "Establecer su información de usuario (web)..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6535
+msgid "Change Password (web)"
+msgstr "Cambiar su contraseña (web)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6539
+msgid "Configure IM Forwarding (web)"
+msgstr "Configurar reenvío de MI (web)"

 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6444
+#: ../libpurple/protocols/oscar/oscar.c:6549
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."

 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6451
+#: ../libpurple/protocols/oscar/oscar.c:6556
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"

-#: ../libpurple/protocols/oscar/oscar.c:6455
+#: ../libpurple/protocols/oscar/oscar.c:6560
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"

-#: ../libpurple/protocols/oscar/oscar.c:6459
+#: ../libpurple/protocols/oscar/oscar.c:6564
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar la dirección de correo registrada actualmente..."

-#: ../libpurple/protocols/oscar/oscar.c:6466
+#: ../libpurple/protocols/oscar/oscar.c:6571
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"

-#: ../libpurple/protocols/oscar/oscar.c:6472
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un amigo por correo electrónico..."

-#: ../libpurple/protocols/oscar/oscar.c:6477
+#: ../libpurple/protocols/oscar/oscar.c:6582
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"

-#: ../libpurple/protocols/oscar/oscar.c:6545
-msgid "Use recent buddies group"
-msgstr "Usar grupo de amigos reciente"
-
-#: ../libpurple/protocols/oscar/oscar.c:6548
-msgid "Show how long you have been idle"
-msgstr "Mostrar cuánto tiempo se ha estado inactivo"
-
-#: ../libpurple/protocols/oscar/oscar.c:6703
+#: ../libpurple/protocols/oscar/oscar.c:6770
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9807,7 +10028,7 @@
 msgstr "Cara QQ inválida"

 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Ha rechazado la solicitud de %d"
@@ -9822,7 +10043,7 @@

 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Lo siento, no eres mi tipo..."

@@ -9861,7 +10082,7 @@
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Enviar"

@@ -9917,7 +10138,7 @@

 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
+#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Razón: %s"
@@ -9929,16 +10150,16 @@
 #: ../libpurple/protocols/qq/group_im.c:292
 #: ../libpurple/protocols/qq/group_join.c:233
 #: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "Opciones QQ Qun"

 #: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libpurple/protocols/qq/group_opt.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprobar"

@@ -10031,32 +10252,32 @@
 msgstr "Error de operación de grupo"

 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/group_opt.c:99
 #: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "¿Desea aprobar esta solicitud?"

-#: ../libpurple/protocols/qq/group_opt.c:137
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Introduzca sus motivos:"

-#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Ha modificado el miembro Qun con éxito"

-#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Ha modificado la información Qun con éxito"

-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Ha creado un Qun con éxito"

-#: ../libpurple/protocols/qq/group_opt.c:394
+#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "¿Desea establecer los detalles de Qun ahora?"

-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Configurar"

@@ -10076,14 +10297,19 @@
 msgid "Error requesting login token"
 msgstr "Error al solicitar un testigo de conexión"

-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr "No pudo conectarse, compruebe el registro de depuración"
+#: ../libpurple/protocols/qq/login_logout.c:490
+msgid "Unable to login. Check debug log."
+msgstr "No pudo conectarse, compruebe el registro de depuración."
+
+#: ../libpurple/protocols/qq/login_logout.c:493
+msgid "Unable to login"
+msgstr "No pudo conectarse"

 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
 #: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "No se pudo conectar."
@@ -10222,116 +10448,116 @@
 msgid "Login failed, no reply"
 msgstr "Fallo en la conexión, no ha habido respuesta"

-#: ../libpurple/protocols/qq/sys_msg.c:110
+#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "¿Desea añadir este amigo?"

 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Ha sido añadido por %s"

-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
+#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "¿Desea añadirle?"

-#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "El usuario %s lo ha añadido [%s] a su lista de amigos."

-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "El usuario %s rechazó su solicitud"

-#: ../libpurple/protocols/qq/sys_msg.c:212
+#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "El usuario %s ha aprobado su solicitud"

 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s quiere añadirle [%s] como amigo"

-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"

-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s no está en su lista de amigos"

-#: ../libpurple/protocols/sametime/sametime.c:419
+#: ../libpurple/protocols/sametime/sametime.c:420
 msgid "Connection closed (writing)"
 msgstr "Conexión cerrada (escribiendo)"

-#: ../libpurple/protocols/sametime/sametime.c:1292
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título de grupo:</b> %s<br>"

-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Identificador de grupo «Notes»:</b> %s<br>"

-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1296
 #, c-format
 msgid "Info for Group %s"
 msgstr "Información sobre el grupo %s"

-#: ../libpurple/protocols/sametime/sametime.c:1297
+#: ../libpurple/protocols/sametime/sametime.c:1298
 msgid "Notes Address Book Information"
 msgstr "Información de la libreta de direcciones «Notes»"

-#: ../libpurple/protocols/sametime/sametime.c:1329
+#: ../libpurple/protocols/sametime/sametime.c:1330
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo a la conferencia..."

-#: ../libpurple/protocols/sametime/sametime.c:1339
+#: ../libpurple/protocols/sametime/sametime.c:1340
 msgid "Get Notes Address Book Info"
 msgstr "Obtener la información de la libreta de direcciones «Notes»"

-#: ../libpurple/protocols/sametime/sametime.c:1506
+#: ../libpurple/protocols/sametime/sametime.c:1507
 msgid "Sending Handshake"
 msgstr "Enviando negociación"

-#: ../libpurple/protocols/sametime/sametime.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:1512
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptación del saludo inicial"

-#: ../libpurple/protocols/sametime/sametime.c:1516
+#: ../libpurple/protocols/sametime/sametime.c:1517
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se aceptó el saludo inicial. Enviando la identificación"

-#: ../libpurple/protocols/sametime/sametime.c:1521
+#: ../libpurple/protocols/sametime/sametime.c:1522
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptación de la identificación"

-#: ../libpurple/protocols/sametime/sametime.c:1526
+#: ../libpurple/protocols/sametime/sametime.c:1527
 msgid "Login Redirected"
 msgstr "Identificación redirigida"

-#: ../libpurple/protocols/sametime/sametime.c:1532
+#: ../libpurple/protocols/sametime/sametime.c:1533
 msgid "Forcing Login"
 msgstr "Forzando la identificación"

-#: ../libpurple/protocols/sametime/sametime.c:1536
+#: ../libpurple/protocols/sametime/sametime.c:1537
 msgid "Login Acknowledged"
 msgstr "Identificación aceptada"

-#: ../libpurple/protocols/sametime/sametime.c:1541
+#: ../libpurple/protocols/sametime/sametime.c:1542
 msgid "Starting Services"
 msgstr "Arrancando servicios"

-#: ../libpurple/protocols/sametime/sametime.c:1678
+#: ../libpurple/protocols/sametime/sametime.c:1679
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
@@ -10339,69 +10565,69 @@
 "Un administrador de «Sametime» ha enviado el siguiente anuncio en el "
 "servidor %s"

-#: ../libpurple/protocols/sametime/sametime.c:1683
+#: ../libpurple/protocols/sametime/sametime.c:1684
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador «Sametime»"

-#: ../libpurple/protocols/sametime/sametime.c:1734
+#: ../libpurple/protocols/sametime/sametime.c:1737
 msgid "Connection reset"
 msgstr "Conexión rehusada"

-#: ../libpurple/protocols/sametime/sametime.c:1746
+#: ../libpurple/protocols/sametime/sametime.c:1749
 #, 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:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
+#: ../libpurple/protocols/sametime/sametime.c:1774
+#: ../libpurple/protocols/sametime/sametime.c:3781
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"

-#: ../libpurple/protocols/sametime/sametime.c:1812
+#: ../libpurple/protocols/sametime/sametime.c:1815
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"

-#: ../libpurple/protocols/sametime/sametime.c:1986
+#: ../libpurple/protocols/sametime/sametime.c:1989
 msgid "Conference Closed"
 msgstr "Conferencia cerrada"

-#: ../libpurple/protocols/sametime/sametime.c:2445
+#: ../libpurple/protocols/sametime/sametime.c:2454
 msgid "Unable to send message: "
 msgstr "No se pudo enviar el mensaje:"

-#: ../libpurple/protocols/sametime/sametime.c:3001
+#: ../libpurple/protocols/sametime/sametime.c:3010
 msgid "Place Closed"
 msgstr "Lugar cerrado"

-#: ../libpurple/protocols/sametime/sametime.c:3271
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Microphone"
 msgstr "Micrófono"

-#: ../libpurple/protocols/sametime/sametime.c:3272
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Speakers"
 msgstr "Altavoces"

-#: ../libpurple/protocols/sametime/sametime.c:3273
+#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Video Camera"
 msgstr "Vídeo cámara"

-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:3320
+#: ../libpurple/protocols/sametime/sametime.c:4200
 msgid "Supports"
 msgstr "Soporta"

-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3325
+#: ../libpurple/protocols/sametime/sametime.c:4174
 msgid "External User"
 msgstr "Usuario externo"

-#: ../libpurple/protocols/sametime/sametime.c:3422
+#: ../libpurple/protocols/sametime/sametime.c:3431
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"

-#: ../libpurple/protocols/sametime/sametime.c:3423
+#: ../libpurple/protocols/sametime/sametime.c:3432
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10410,27 +10636,27 @@
 "Por favor ingrese tema para la nueva conferencia, y un mensaje de invitación "
 "que se enviará a %s"

-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/sametime/sametime.c:3436
 msgid "New Conference"
 msgstr "Nueva conferencia"

-#: ../libpurple/protocols/sametime/sametime.c:3429
+#: ../libpurple/protocols/sametime/sametime.c:3438
 msgid "Create"
 msgstr "Crear"

-#: ../libpurple/protocols/sametime/sametime.c:3494
+#: ../libpurple/protocols/sametime/sametime.c:3503
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"

-#: ../libpurple/protocols/sametime/sametime.c:3500
+#: ../libpurple/protocols/sametime/sametime.c:3509
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."

-#: ../libpurple/protocols/sametime/sametime.c:3507
+#: ../libpurple/protocols/sametime/sametime.c:3516
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"

-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3517
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10441,27 +10667,27 @@
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario también."

-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3522
 msgid "Invite to Conference"
 msgstr "Invitar a conferencia"

-#: ../libpurple/protocols/sametime/sametime.c:3604
+#: ../libpurple/protocols/sametime/sametime.c:3613
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."

-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3618
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"

-#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4382
+#: ../libpurple/protocols/sametime/sametime.c:3637 ../pidgin/gtkconv.c:4420
 msgid "Topic:"
 msgstr "Tema:"

-#: ../libpurple/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3665
 msgid "No Sametime Community Server specified"
 msgstr "No se ha especificado el servidor de comunidad «Sametime»"

-#: ../libpurple/protocols/sametime/sametime.c:3681
+#: ../libpurple/protocols/sametime/sametime.c:3690
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10470,42 +10696,42 @@
 "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:3686
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración de la conexión «Meanwhile»"

-#: ../libpurple/protocols/sametime/sametime.c:3687
+#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad «Sametime»"

-#: ../libpurple/protocols/sametime/sametime.c:3689
+#: ../libpurple/protocols/sametime/sametime.c:3698
 msgid "Connect"
 msgstr "Conectar"

-#: ../libpurple/protocols/sametime/sametime.c:4181
+#: ../libpurple/protocols/sametime/sametime.c:4190
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"

-#: ../libpurple/protocols/sametime/sametime.c:4183
+#: ../libpurple/protocols/sametime/sametime.c:4192
 msgid "Last Known Client"
 msgstr "Último cliente conocido:"

-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:4356
+#: ../libpurple/protocols/sametime/sametime.c:5561
 msgid "User Name"
 msgstr "Nombre de usuario"

-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
+#: ../libpurple/protocols/sametime/sametime.c:4359
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "Sametime ID"
 msgstr "ID Sametime"

-#: ../libpurple/protocols/sametime/sametime.c:4374
+#: ../libpurple/protocols/sametime/sametime.c:4383
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"

-#: ../libpurple/protocols/sametime/sametime.c:4375
+#: ../libpurple/protocols/sametime/sametime.c:4384
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10515,15 +10741,15 @@
 "usuarios. Por favor seleccione el usuario de la lista mostrada para añadirlo "
 "a su lista de amigos."

-#: ../libpurple/protocols/sametime/sametime.c:4380
+#: ../libpurple/protocols/sametime/sametime.c:4389
 msgid "Select User"
 msgstr "Seleccionar usuario"

-#: ../libpurple/protocols/sametime/sametime.c:4464
+#: ../libpurple/protocols/sametime/sametime.c:4473
 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:4466
+#: ../libpurple/protocols/sametime/sametime.c:4475
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10532,7 +10758,7 @@
 "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:5057
+#: ../libpurple/protocols/sametime/sametime.c:5066
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10541,65 +10767,65 @@
 "Error al leer el archivo %s: \n"
 "%s\n"

-#: ../libpurple/protocols/sametime/sametime.c:5192
+#: ../libpurple/protocols/sametime/sametime.c:5201
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"

-#: ../libpurple/protocols/sametime/sametime.c:5197
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"

 # Usar empotrable? (jfs)
-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5209
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"

-#: ../libpurple/protocols/sametime/sametime.c:5202
+#: ../libpurple/protocols/sametime/sametime.c:5211
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"

-#: ../libpurple/protocols/sametime/sametime.c:5204
+#: ../libpurple/protocols/sametime/sametime.c:5213
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"

-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5215
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"

-#: ../libpurple/protocols/sametime/sametime.c:5261
+#: ../libpurple/protocols/sametime/sametime.c:5270
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar la lista «Sametime» para la cuenta %s"

-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista «Sametime» para la cuenta %s"

-#: ../libpurple/protocols/sametime/sametime.c:5355
+#: ../libpurple/protocols/sametime/sametime.c:5364
 msgid "Unable to add group: group exists"
 msgstr "No se pudo añadir el grupo: el grupo ya existe"

-#: ../libpurple/protocols/sametime/sametime.c:5356
+#: ../libpurple/protocols/sametime/sametime.c:5365
 #, 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:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
+#: ../libpurple/protocols/sametime/sametime.c:5368
+#: ../libpurple/protocols/sametime/sametime.c:5498
 msgid "Unable to add group"
 msgstr "No se pudo añadir el grupo"

-#: ../libpurple/protocols/sametime/sametime.c:5418
+#: ../libpurple/protocols/sametime/sametime.c:5427
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"

-#: ../libpurple/protocols/sametime/sametime.c:5434
+#: ../libpurple/protocols/sametime/sametime.c:5443
 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:5435
+#: ../libpurple/protocols/sametime/sametime.c:5444
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10610,15 +10836,15 @@
 "de la libreta de direcciones «Notes». Escoja el grupo más apropiado de la "
 "lista que se muestra abajo para añadirlo a su lista de amigos."

-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5449
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones «Notes»"

-#: ../libpurple/protocols/sametime/sametime.c:5483
+#: ../libpurple/protocols/sametime/sametime.c:5492
 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:5485
+#: ../libpurple/protocols/sametime/sametime.c:5494
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10627,11 +10853,11 @@
 "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:5526
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos «Notes»"

-#: ../libpurple/protocols/sametime/sametime.c:5527
+#: ../libpurple/protocols/sametime/sametime.c:5536
 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."
@@ -10640,12 +10866,12 @@
 "campo a continuación para añadir al grupo y a sus miembros en su lista de "
 "amigos."

-#: ../libpurple/protocols/sametime/sametime.c:5576
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la búsqueda '%s'"

-#: ../libpurple/protocols/sametime/sametime.c:5577
+#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10656,30 +10882,30 @@
 "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:5584 ../pidgin/gtknotify.c:763
+#: ../libpurple/protocols/sametime/sametime.c:5593 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"

-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "No matches"
 msgstr "No hubo coincidencias"

-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5619
 #, 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:5614
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "No Matches"
 msgstr "No hubo coincidencias"

-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid "Search for a user"
 msgstr "Buscar un usuario"

-#: ../libpurple/protocols/sametime/sametime.c:5652
+#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10687,32 +10913,32 @@
 "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:5655
+#: ../libpurple/protocols/sametime/sametime.c:5664
 msgid "User Search"
 msgstr "Búsqueda de usuarios"

-#: ../libpurple/protocols/sametime/sametime.c:5668
+#: ../libpurple/protocols/sametime/sametime.c:5677
 msgid "Import Sametime List..."
 msgstr "Importar la lista «Sametime»..."

-#: ../libpurple/protocols/sametime/sametime.c:5672
+#: ../libpurple/protocols/sametime/sametime.c:5681
 msgid "Export Sametime List..."
 msgstr "Exportar la lista «Sametime»..."

-#: ../libpurple/protocols/sametime/sametime.c:5676
+#: ../libpurple/protocols/sametime/sametime.c:5685
 msgid "Add Notes Address Book Group..."
 msgstr "Añadir a la libreta de direcciones de grupos «Notes»..."

-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5689
 msgid "User Search..."
 msgstr "Búsqueda de los usuarios..."

-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5795
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexión (ignorar redirecciones del servidor)"

 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
+#: ../libpurple/protocols/sametime/sametime.c:5805
 msgid "Hide client identity"
 msgstr "Ocultar identidad de cliente"

@@ -10843,8 +11069,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
+#: ../libpurple/protocols/silc/ops.c:1518
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10853,8 +11079,8 @@
 msgstr "Obtener clave pública"

 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1530
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10878,11 +11104,11 @@
 msgstr "No se pudo cargar la clave pública"

 #: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
+#: ../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/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10893,8 +11119,8 @@
 msgstr "Información de usuario"

 #: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
+#: ../libpurple/protocols/silc/ops.c:1184
+#: ../libpurple/protocols/silc/ops.c:1325
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10998,140 +11224,140 @@

 #: ../libpurple/protocols/silc/buddy.c:1496
 #: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/util.c:525
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Feliz"

 #: ../libpurple/protocols/silc/buddy.c:1498
 #: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:527
 #: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Triste"

 #: ../libpurple/protocols/silc/buddy.c:1500
 #: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/util.c:529
 #: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Furioso"

 #: ../libpurple/protocols/silc/buddy.c:1502
 #: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/util.c:531
 #: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
+#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Celoso"

 #: ../libpurple/protocols/silc/buddy.c:1504
 #: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/util.c:533
 #: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Avergonzado"

 #: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/util.c:535
 #: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Invencible"

 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/util.c:537
 #: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
+#: ../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:536
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Dormido"

 #: ../libpurple/protocols/silc/buddy.c:1512
 #: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
+#: ../libpurple/protocols/silc10/silc.c:676
+#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Aburrido"

 #: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
+#: ../libpurple/protocols/silc10/silc.c:678
+#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Excitado"

 #: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc/util.c:545
 #: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
+#: ../libpurple/protocols/silc10/silc.c:680
+#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Ansioso"

 #: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1222
 #: ../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:1224
+#: ../libpurple/protocols/silc/ops.c:1239
 #: ../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:1229
+#: ../libpurple/protocols/silc/ops.c:1244
 #: ../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:1234
+#: ../libpurple/protocols/silc/ops.c:1249
 #: ../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:1239
+#: ../libpurple/protocols/silc/ops.c:1254
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc10/silc.c:728
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Zona horaria"

 #: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1259
 #: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
@@ -11158,7 +11384,7 @@
 msgstr "Obtener clave pública..."

 #: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1627
 #: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
@@ -11310,11 +11536,11 @@
 msgstr "Nombre de grupo"

 #: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/ops.c:1832
 #: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Contraseña"

@@ -11423,21 +11649,21 @@
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../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/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../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/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Orden desconocida"

@@ -11515,12 +11741,12 @@
 msgid "Cannot send file"
 msgstr "No se puede enviar el archivo."

-#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "Se produjo un error"

-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
+#: ../libpurple/protocols/silc/ops.c:566
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -11528,38 +11754,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha cambiado el tema a de <I>%s</I> a: %s"

-#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc/ops.c:632
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del canal <I>%s</I> a: %s"

-#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc/ops.c:636
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del canal <I>%s</I>"

-#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc/ops.c:669
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"

-#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc/ops.c:677
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del usuario <I>%s<I>"

-#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc/ops.c:706
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Ha sido expulsado de <I>%s</I> por %s (%s)"

-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
+#: ../libpurple/protocols/silc/ops.c:743
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -11567,8 +11793,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "Ha sido expulsado por %s (%s)"

-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
+#: ../libpurple/protocols/silc/ops.c:774
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -11576,158 +11802,158 @@
 msgid "Killed by %s (%s)"
 msgstr "Expulsado por %s (%s)"

-#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc/ops.c:811
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"

-#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Información personal"

-#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc/ops.c:1021
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Cumpleaños"

-#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc/ops.c:1029
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"

-#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/ops.c:1033
 #: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organización"

-#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc/ops.c:1037
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidad"

-#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc/ops.c:1061
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"

-#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc/ops.c:1108
 #: ../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:1127
+#: ../libpurple/protocols/silc/ops.c:1142
 #: ../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:1131
+#: ../libpurple/protocols/silc/ops.c:1146
 #: ../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:1190
-#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/silc/ops.c:1205
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "Nombre real"

-#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc/ops.c:1233
 #: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"

-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1369
 #: ../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:1281
-#: ../libpurple/protocols/silc/ops.c:1355
+#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1370
 #: ../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:1294
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Más..."

-#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/ops.c:1388
 #: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Desligar del servidor"

-#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/ops.c:1388
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "No se puede desligar"

-#: ../libpurple/protocols/silc/ops.c:1393
+#: ../libpurple/protocols/silc/ops.c:1408
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"

-#: ../libpurple/protocols/silc/ops.c:1422
+#: ../libpurple/protocols/silc/ops.c:1437
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"

-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1486
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"

-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1486
 #: ../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:1472
+#: ../libpurple/protocols/silc/ops.c:1487
 msgid "Network is empty"
 msgstr "La red está vacía"

-#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1531
 #: ../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:1528
-#: ../libpurple/protocols/silc/ops.c:1541
+#: ../libpurple/protocols/silc/ops.c:1543
+#: ../libpurple/protocols/silc/ops.c:1556
 #: ../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:1529
+#: ../libpurple/protocols/silc/ops.c:1544
 #: ../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:1552
+#: ../libpurple/protocols/silc/ops.c:1567
 #: ../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:1553
+#: ../libpurple/protocols/silc/ops.c:1568
 #: ../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:1560
+#: ../libpurple/protocols/silc/ops.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11763,55 +11989,55 @@
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"

-#: ../libpurple/protocols/silc/ops.c:1592
+#: ../libpurple/protocols/silc/ops.c:1607
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estadísticas de red"

-#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1615
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falló el ping"

-#: ../libpurple/protocols/silc/ops.c:1605
+#: ../libpurple/protocols/silc/ops.c:1620
 #: ../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:1613
+#: ../libpurple/protocols/silc/ops.c:1628
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"

-#: ../libpurple/protocols/silc/ops.c:1652
+#: ../libpurple/protocols/silc/ops.c:1667
 msgid "WATCH"
 msgstr "AÑADIR"

-#: ../libpurple/protocols/silc/ops.c:1652
+#: ../libpurple/protocols/silc/ops.c:1667
 msgid "Cannot watch user"
 msgstr "No se puede añadir al usuario"

-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/ops.c:1743
+#: ../libpurple/protocols/silc/ops.c:1794
 #: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: ../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:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc/ops.c:1745
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Autenticando la conexión"

-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc/ops.c:1796
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pública del servidor"

-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc/ops.c:1833
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Se necesita una contraseña"

@@ -11857,22 +12083,22 @@
 msgstr "Tipo de clave pública no soportada"

 #: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"

 #: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexión al servidor SILC"

 #: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Falló el intercambio de claves"

 #: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
+#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
@@ -11881,61 +12107,63 @@

 #: ../libpurple/protocols/silc/silc.c:373
 #: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Falló la conexión"

 #: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../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:325
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"

 #: ../libpurple/protocols/silc/silc.c:455
+#: ../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:355
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "No se pudo crear la conexión"

 #: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Sin memoria"

 #: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../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/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/silc10/silc.c:650
+#: ../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:652 ../pidgin/gtkprefs.c:1741
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "Normal"

 #: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Enamorado"

 #: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11944,46 +12172,46 @@
 "Sus métodos de contacto preferidos"

 #: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
+#: ../libpurple/protocols/silc/util.c:571
+#: ../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:569
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
+#: ../libpurple/protocols/silc/util.c:573
+#: ../libpurple/protocols/silc10/silc.c:693
+#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"

 #: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Video conferencia"

 #: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Su estado actual"

 #: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Servicios en línea"

 #: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../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/silc10/silc.c:710
+#: ../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/silc10/silc.c:717
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Su archivo VCard"

@@ -11993,13 +12221,13 @@

 #: ../libpurple/protocols/silc/silc.c:959
 #: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../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/silc10/silc.c:731
+#: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -12012,21 +12240,21 @@
 #: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc/silc.c:1008
 #: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../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/silc10/silc.c:772
+#: ../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/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../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"

@@ -12034,192 +12262,192 @@
 #: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc/silc.c:1171
 #: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc10/silc.c:945
+#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"

 #: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../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/silc10/silc.c:868
+#: ../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/silc10/silc.c:907
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Longitud de clave"

 #: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Fichero de clave pública"

 #: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Fichero de clave privada"

 #: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Contraseña (escribir de nuevo)"

 #: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"

 #: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Estado en línea"

 #: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../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/silc10/silc.c:996
+#: ../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/silc10/silc.c:1095
+#: ../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/silc10/silc.c:1286
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Tema demasiado largo"

 #: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../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/silc10/silc.c:1469
+#: ../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/silc10/silc.c:1474
+#: ../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/silc10/silc.c:1476
+#: ../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/silc10/silc.c:1489
+#: ../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/silc10/silc.c:1519
+#: ../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/silc10/silc.c:1582
+#: ../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/silc10/silc.c:1586
+#: ../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/silc10/silc.c:1590
+#: ../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/silc10/silc.c:1595
+#: ../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/silc10/silc.c:1599
+#: ../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/silc10/silc.c:1603
+#: ../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/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../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/silc10/silc.c:1611
+#: ../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/silc10/silc.c:1615
+#: ../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/silc10/silc.c:1619
+#: ../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/silc10/silc.c:1623
+#: ../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/silc10/silc.c:1627
+#: ../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/silc10/silc.c:1633
+#: ../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/silc10/silc.c:1637
+#: ../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/silc10/silc.c:1641
+#: ../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/silc10/silc.c:1645
+#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12228,7 +12456,7 @@
 "modos del canal"

 #: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12237,17 +12465,17 @@
 "usuario o del canal"

 #: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../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/silc10/silc.c:1657
+#: ../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/silc10/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12256,46 +12484,46 @@
 "el apodo de la lista de invitados para el canal"

 #: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../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/silc10/silc.c:1669
+#: ../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/silc10/silc.c:1673
+#: ../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/silc10/silc.c:1677
+#: ../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/silc10/silc.c:1681
+#: ../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/silc10/silc.c:1685
+#: ../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/silc10/silc.c:1690
+#: ../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/silc10/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12313,38 +12541,38 @@
 #. *< version
 #. *  summary
 #: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"

 #. *  description
 #: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../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:1853 ../pidgin/gtkprefs.c:2138
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "Red"

 #: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Fichero de clave pública"

 #: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Fichero de clave privada"

 #: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Cifrado"

 #: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"

@@ -12354,27 +12582,27 @@
 msgstr "Utilizar «Confidencialidad directa perfecta»"

 #: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../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/silc10/silc.c:1894
+#: ../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/silc10/silc.c:1897
+#: ../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/silc10/silc.c:1900
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra automáticamente"

 #: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Firmar digitalmente todos los mensajes instantáneos"

@@ -12475,28 +12703,28 @@
 msgid "Public Key Information"
 msgstr "Información de clave pública"

-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Enviar"

-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
+#: ../libpurple/protocols/silc/util.c:575
+#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Video conferencia"

-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
+#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Ordenador"

-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
+#: ../libpurple/protocols/silc/util.c:598
+#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"

-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
+#: ../libpurple/protocols/silc/util.c:600
+#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminal"

@@ -12521,62 +12749,58 @@
 msgid "No server statistics available"
 msgstr "No se disponen de estadísticas del servidor"

-#: ../libpurple/protocols/silc10/ops.c:1931
+#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Fallo: Existe una diferencia en las versiones, por favor, actualice su "
 "cliente"

-#: ../libpurple/protocols/silc10/ops.c:1934
+#: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"

-#: ../libpurple/protocols/silc10/ops.c:1937
+#: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"

-#: ../libpurple/protocols/silc10/ops.c:1940
+#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"

-#: ../libpurple/protocols/silc10/ops.c:1943
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"

-#: ../libpurple/protocols/silc10/ops.c:1946
+#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"

-#: ../libpurple/protocols/silc10/ops.c:1949
+#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"

-#: ../libpurple/protocols/silc10/ops.c:1951
+#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"

-#: ../libpurple/protocols/silc10/ops.c:1953
+#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"

-#: ../libpurple/protocols/silc10/ops.c:1964
+#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"

-#: ../libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexión del cliente SILC"

-#: ../libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Pepe sin nombre"

-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "No se puede encontrar o acceder al directorio ~/.silc"
-
-#: ../libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "No se pudo cargar la clave pública SILC: %s"
@@ -12586,7 +12810,7 @@
 msgstr "No se pudo escribir"

 #: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
+#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "No se pudo conectar"

@@ -12594,22 +12818,22 @@
 msgid "Unknown server response."
 msgstr "Respuesta desconocida del servidor."

-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
+#: ../libpurple/protocols/simple/simple.c:1749
+#: ../libpurple/protocols/simple/simple.c:1795
+#: ../libpurple/protocols/simple/simple.c:1810
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "No se pudo crear el socket de escucha"

-#: ../libpurple/protocols/simple/simple.c:1752
+#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "No se pudo resolver el nombre"

-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "No se pudo resolver el nombre de sistema"

-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "Los nombres de usuario SIP no pueden tener espacios en blanco ni el símbolo @"
@@ -12622,36 +12846,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2057
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"

 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2058
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El complemento de protocolo SIP/SIMPLE"

-#: ../libpurple/protocols/simple/simple.c:2086
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estatus público (nota: todos podrán verlo)"

-#: ../libpurple/protocols/simple/simple.c:2092
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Utilizar UDP"

-#: ../libpurple/protocols/simple/simple.c:2094
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Usar proxy"

-#: ../libpurple/protocols/simple/simple.c:2096
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Proxy"

-#: ../libpurple/protocols/simple/simple.c:2098
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Usuario de autenticación"

-#: ../libpurple/protocols/simple/simple.c:2100
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"

@@ -12813,8 +13037,7 @@
 msgid "Password Change Successful"
 msgstr "La contraseña se ha cambiado con éxito"

-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6325
-#: ../pidgin/gtkblist.c:6696
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6764
 msgid "_Group:"
 msgstr "_Grupo:"

@@ -12877,27 +13100,27 @@
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"

-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s le ha enviado una invitación para utilizar la webcam, algo aún no "
 "soportado."

-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."

-#: ../libpurple/protocols/yahoo/yahoo.c:961
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"

-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Mensaje de autorización denegada:"

-#: ../libpurple/protocols/yahoo/yahoo.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12906,18 +13129,18 @@
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."

-#: ../libpurple/protocols/yahoo/yahoo.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
 "forma retroactiva)."

-#: ../libpurple/protocols/yahoo/yahoo.c:1053
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"

-#: ../libpurple/protocols/yahoo/yahoo.c:1995
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12928,11 +13151,11 @@
 "desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s "
 "para ver si existe una actualización."

-#: ../libpurple/protocols/yahoo/yahoo.c:1998
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"

-#: ../libpurple/protocols/yahoo/yahoo.c:2064
+#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12941,53 +13164,57 @@
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."

-#: ../libpurple/protocols/yahoo/yahoo.c:2067
+#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"

-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../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 ""
 "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"

-#: ../libpurple/protocols/yahoo/yahoo.c:2135
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."

-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."

-#: ../libpurple/protocols/yahoo/yahoo.c:2191
+#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"

-#: ../libpurple/protocols/yahoo/yahoo.c:2310
+#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"

-#: ../libpurple/protocols/yahoo/yahoo.c:2656
+#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."

-#: ../libpurple/protocols/yahoo/yahoo.c:2681
-#: ../libpurple/protocols/yahoo/yahoo.c:2869
-#: ../libpurple/protocols/yahoo/yahoo.c:2973
-#: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoo.c:2718
+#: ../libpurple/protocols/yahoo/yahoo.c:2906
+#: ../libpurple/protocols/yahoo/yahoo.c:3011
+#: ../libpurple/protocols/yahoo/yahoo.c:3022
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 #: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Error de conexión"

-#: ../libpurple/protocols/yahoo/yahoo.c:2707
+#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12996,7 +13223,7 @@
 "Se perdió la conexión con %s:\n"
 "%s"

-#: ../libpurple/protocols/yahoo/yahoo.c:2732
+#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13005,103 +13232,103 @@
 "No se pudo establecer una conexión con %s:\n"
 "%s"

-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3777
+#: ../libpurple/protocols/yahoo/yahoo.c:3138
+#: ../libpurple/protocols/yahoo/yahoo.c:3829
 msgid "Not at Home"
 msgstr "Fuera de casa"

-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3780
+#: ../libpurple/protocols/yahoo/yahoo.c:3140
+#: ../libpurple/protocols/yahoo/yahoo.c:3832
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"

-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3783
+#: ../libpurple/protocols/yahoo/yahoo.c:3142
+#: ../libpurple/protocols/yahoo/yahoo.c:3835
 msgid "Not in Office"
 msgstr "Fuera de la oficina"

-#: ../libpurple/protocols/yahoo/yahoo.c:3099
-#: ../libpurple/protocols/yahoo/yahoo.c:3789
+#: ../libpurple/protocols/yahoo/yahoo.c:3146
+#: ../libpurple/protocols/yahoo/yahoo.c:3841
 msgid "On Vacation"
 msgstr "De vacaciones"

-#: ../libpurple/protocols/yahoo/yahoo.c:3103
-#: ../libpurple/protocols/yahoo/yahoo.c:3795
+#: ../libpurple/protocols/yahoo/yahoo.c:3150
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "Stepped Out"
 msgstr "Ha abandonado"

-#: ../libpurple/protocols/yahoo/yahoo.c:3196
-#: ../libpurple/protocols/yahoo/yahoo.c:3226
-msgid "Not on server list"
-msgstr "No está en la lista del servidor"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:3243
-#: ../libpurple/protocols/yahoo/yahoo.c:3301
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
+msgid "Not on server list"
+msgstr "No está en la lista del servidor"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "Parecer conectado"

-#: ../libpurple/protocols/yahoo/yahoo.c:3246
-#: ../libpurple/protocols/yahoo/yahoo.c:3322
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"

-#: ../libpurple/protocols/yahoo/yahoo.c:3264
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "Presencia"

-#: ../libpurple/protocols/yahoo/yahoo.c:3307
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "Parecer desconectado"

-#: ../libpurple/protocols/yahoo/yahoo.c:3316
+#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"

-#: ../libpurple/protocols/yahoo/yahoo.c:3364
+#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "Unirse a un chat"

-#: ../libpurple/protocols/yahoo/yahoo.c:3370
+#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"

-#: ../libpurple/protocols/yahoo/yahoo.c:3398
+#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "Usar configuración del entorno"

-#: ../libpurple/protocols/yahoo/yahoo.c:3404
+#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "Comenzar una sesión de Doodle"

-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3557
 msgid "Activate which ID?"
 msgstr "¿Qué ID quiere activar?"

-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3568
 msgid "Join whom in chat?"
 msgstr "¿Con quién quiere juntarse en un chat?"

-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3580
 msgid "Activate ID..."
 msgstr "Activar ID..."

-#: ../libpurple/protocols/yahoo/yahoo.c:3532
+#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."

-#: ../libpurple/protocols/yahoo/yahoo.c:3537
+#: ../libpurple/protocols/yahoo/yahoo.c:3589
 msgid "Open Inbox"
 msgstr "Abrir bandeja de entrada"

-#: ../libpurple/protocols/yahoo/yahoo.c:4146
+#: ../libpurple/protocols/yahoo/yahoo.c:4178
 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:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:4183
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"

-#: ../libpurple/protocols/yahoo/yahoo.c:4159
+#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"

@@ -13115,56 +13342,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4368
-#: ../libpurple/protocols/yahoo/yahoo.c:4370
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4402
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"

-#: ../libpurple/protocols/yahoo/yahoo.c:4393
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"

-#: ../libpurple/protocols/yahoo/yahoo.c:4396
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 msgid "Pager server"
 msgstr "Servidor buscapersonas"

-#: ../libpurple/protocols/yahoo/yahoo.c:4399
+#: ../libpurple/protocols/yahoo/yahoo.c:4431
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonés"

-#: ../libpurple/protocols/yahoo/yahoo.c:4402
+#: ../libpurple/protocols/yahoo/yahoo.c:4434
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"

-#: ../libpurple/protocols/yahoo/yahoo.c:4405
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"

-#: ../libpurple/protocols/yahoo/yahoo.c:4408
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonés"

-#: ../libpurple/protocols/yahoo/yahoo.c:4411
+#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"

-#: ../libpurple/protocols/yahoo/yahoo.c:4414
+#: ../libpurple/protocols/yahoo/yahoo.c:4446
 msgid "Chat room locale"
 msgstr "Localización de la sala de chat"

-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4449
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"

-#: ../libpurple/protocols/yahoo/yahoo.c:4425
+#: ../libpurple/protocols/yahoo/yahoo.c:4457
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"

-#: ../libpurple/protocols/yahoo/yahoo.c:4428
+#: ../libpurple/protocols/yahoo/yahoo.c:4460
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"

-#: ../libpurple/protocols/yahoo/yahoo.c:4431
+#: ../libpurple/protocols/yahoo/yahoo.c:4463
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"

@@ -13175,12 +13402,19 @@
 msgid "Sent Doodle request."
 msgstr "Enviar petición Doodle."

-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../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
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."

+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#, 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"
+
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Error de escritura"
@@ -13208,54 +13442,54 @@
 msgstr ""
 "Si desea ver este perfil, deberá visitar este enlace con su navegador web:"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "Aficiones"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "Últimas noticias"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "Página personal"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "Enlace interesante 1"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "Enlace interesante 2"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "Enlace interesante 3"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "Última actualización"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s no disponible"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 "Lo siento, este perfil parece estar en un idioma o formato aún no soportado."

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13263,7 +13497,7 @@
 "No se pudo obtener el perfil del usuario. Esto es habitualmente un problema "
 "temporal en el lado del servidor. Por favor, pruebe de nuevo más tarde."

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -13274,39 +13508,39 @@
 "de usuario. Si está seguro de que el usuario existe inténtelo de nuevo más "
 "tarde."

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."

-#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."

-#: ../libpurple/protocols/yahoo/yahoochat.c:219
+#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Invitación rechazada"

-#: ../libpurple/protocols/yahoo/yahoochat.c:438
+#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "No se pudo unir al chat"

 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Sala desconocida"

 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Quizás la sala está llena"

 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "No disponible"

-#: ../libpurple/protocols/yahoo/yahoochat.c:451
+#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13315,38 +13549,38 @@
 "antes de poder volver a unirse a la sala del chat."

 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Ahora está chateando en %s."

-#: ../libpurple/protocols/yahoo/yahoochat.c:719
+#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "No se pudo unir al amigo al chat"

-#: ../libpurple/protocols/yahoo/yahoochat.c:720
+#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "¿Quizás no están en un chat?"

-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "No se pudo obtener la lista de salas."

-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Voces"

-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Cámaras web"

-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "No se pudo obtener la lista de salas."

-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Salas de usuarios"

@@ -13363,7 +13597,7 @@
 "Se ha perdido la conexión con el servidor\n"
 "%s"

-#: ../libpurple/protocols/zephyr/zephyr.c:354
+#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13371,77 +13605,77 @@
 "(Hubo un error convirtiendo este mensaje.\\t Verifique la opción "
 "«Codificación» en el Editor de cuentas)"

-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"

-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:795
+#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Oculto o no conectado"

-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"

-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1510
+#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Cualquiera"

-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_Clase:"

-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_Instancia:"

-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "_Destinatario:"

-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Falló el intento de suscripción a %s,%s,%s"

-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;apodo&gt;: Localiza un usuario"

-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;apodo&gt;: Localiza un usuario"

-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"

-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"

-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2725
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"

-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Unirse a un nuevo chat"

-#: ../libpurple/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2736
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar un mensaje a &lt;mensaje,<i>instancia</i>,*&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2742
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13449,7 +13683,7 @@
 "zci &lt;clase&gt; &lt;instancia&gt;: Enviar un mensaje a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2748
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -13457,7 +13691,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a "
 "&lt;<i>clase</i>,<i>instancia</i>,<i>receptor</i>&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13465,15 +13699,15 @@
 "zir &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;MENSAJE,"
 "<i>instancia</i>,<i>receptor</i>&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2759
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar un mensaje a &lt;<i>clase</i>,PERSONAL,*&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "Re-suscribir"

-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "Obtener las suscripciones del servidor"

@@ -13487,45 +13721,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2931
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"

-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "Use tzc"

-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "orden tzc"

-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"

-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"

-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"

-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zephyr.subs"

-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "Dominio"

-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Exposición"

-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
+#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
+#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13534,47 +13768,47 @@
 "No se pudo crear el socket:\n"
 "%s"

-#: ../libpurple/proxy.c:662
+#: ../libpurple/proxy.c:687
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"

-#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
+#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
+#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexión en el proxy HTTP %d"

-#: ../libpurple/proxy.c:794
+#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d."

-#: ../libpurple/proxy.c:1022
+#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"

-#: ../libpurple/proxy.c:1730
+#: ../libpurple/proxy.c:1793
 msgid "Could not resolve host name"
 msgstr "No se pudo resolver el nombre de equipo"

 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "_Sí"

-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_No"
 msgstr "_No"

 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
+#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "_Aceptar"

@@ -13585,26 +13819,26 @@
 msgid "I'm not here right now"
 msgstr "No estoy aquí ahora"

-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "Estadísticas guardadas"

-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"

-#: ../libpurple/server.c:302
+#: ../libpurple/server.c:356
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Solicitando la atención de %s..."

-#: ../libpurple/server.c:347
+#: ../libpurple/server.c:401
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "¡%s ha solicitado su atención!"

-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13613,12 +13847,12 @@
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"

-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitado a %s a la sala de chat %s\n"

-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"

@@ -13643,7 +13877,7 @@
 msgstr "Desactivado"

 #: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "No molestar"

@@ -13662,50 +13896,35 @@

 #: ../libpurple/status.c:610
 #, c-format
-msgid "%s changed status from %s to %s"
-msgstr "el estado de %s cambió de %s a %s"
-
-#: ../libpurple/status.c:613
-#, 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:624
-#, c-format
-msgid "%s is now %s"
-msgstr "%s es ahora %s"
-
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:621
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) es ahora %s"

-#: ../libpurple/status.c:632
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s ya no está %s "
-
-#: ../libpurple/status.c:634
+#: ../libpurple/status.c:627
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ya no está %s"

-#: ../libpurple/status.c:1247
+#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora está inactivo"

-#: ../libpurple/status.c:1264
+#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora está activo"

-#: ../libpurple/status.c:1327
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ahora está inactivo"

-#: ../libpurple/status.c:1329
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ahora está activo"
@@ -13715,12 +13934,12 @@
 msgid "%x %X"
 msgstr "%x %X"

-#: ../libpurple/util.c:2798
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"

-#: ../libpurple/util.c:2799
+#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13729,67 +13948,67 @@
 "Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
 "antiguo se ha renombrado a %s~."

-#: ../libpurple/util.c:3298
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Calculando..."

-#: ../libpurple/util.c:3301
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Desconocido."

-#: ../libpurple/util.c:3327
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"

-#: ../libpurple/util.c:3339
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"

-#: ../libpurple/util.c:3347
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"

-#: ../libpurple/util.c:3353
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"

-#: ../libpurple/util.c:3361
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"

-#: ../libpurple/util.c:3367
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"

-#: ../libpurple/util.c:3627
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "No se pudo abrir %s: se produjeron demasiadas redirecciones"

-#: ../libpurple/util.c:3664 ../libpurple/util.c:3960
+#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"

-#: ../libpurple/util.c:3787
+#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13798,21 +14017,55 @@
 "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es "
 "posible que el servidor web esté intentando algo con malas intenciones."

-#: ../libpurple/util.c:3822
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"

-#: ../libpurple/util.c:3853
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"

-#: ../libpurple/util.c:3878
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"

+#: ../libpurple/util.c:4697
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#: ../libpurple/util.c:4703
+#, 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."
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Cliente de mensajería de Internet"
@@ -13834,71 +14087,71 @@
 msgstr "La orientación en el área de notificación."

 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
+#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Opciones de conexión"

-#: ../pidgin/gtkaccount.c:431
+#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"

-#: ../pidgin/gtkaccount.c:442
+#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
 msgstr "_Nombre de usuario:"

-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
 msgstr "Apodo _local:"

-#: ../pidgin/gtkaccount.c:536
+#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "Recordar _contraseña"

 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
+#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "Opciones de usuario"

-#: ../pidgin/gtkaccount.c:607
+#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
 msgstr "Notificaciones de _correo nuevo"

 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
+#: ../pidgin/gtkaccount.c:581
 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:734
+#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"

-#: ../pidgin/gtkaccount.c:939
+#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuración del proxy de GNOME"

-#: ../pidgin/gtkaccount.c:940
+#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global del proxy"

-#: ../pidgin/gtkaccount.c:946
+#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "Sin proxy"

-#: ../pidgin/gtkaccount.c:952
+#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"

-#: ../pidgin/gtkaccount.c:958
+#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"

-#: ../pidgin/gtkaccount.c:964
+#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"

-#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"

@@ -13907,73 +14160,73 @@
 #. 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:1009
+#: ../pidgin/gtkaccount.c:978
 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:1012
+#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"

-#: ../pidgin/gtkaccount.c:1033
+#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "Opciones del proxy"

-#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
+#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"

-#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_Servidor:"

-#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_Puerto:"

-#: ../pidgin/gtkaccount.c:1068
+#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "Nombre de _usuario:"

-#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"

-#: ../pidgin/gtkaccount.c:1199
+#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "No se pudo guardar la nueva cuenta"

-#: ../pidgin/gtkaccount.c:1200
+#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr "Ya existe una cuenta con los criterios especificados."

-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "Añadir cuenta"

-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Básica"

-#: ../pidgin/gtkaccount.c:1504
+#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
 msgstr "Crear esta nueva cuenta en el servidor"

-#: ../pidgin/gtkaccount.c:1520
+#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "_Avanzadas"

-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:586
-#: ../pidgin/plugins/convcolors.c:322
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:643
+#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Habilitado"

-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "Protocolo"

-#: ../pidgin/gtkaccount.c:2207
+#: ../pidgin/gtkaccount.c:2137
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13993,7 +14246,7 @@
 "cuenta. Si quiere que %s se conecte a múltiples cuentas de MI, deberá pulsar "
 "<b>Añadir</b> otra vez para configurarlas todas."

-#: ../pidgin/gtkblist.c:543
+#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -14001,346 +14254,363 @@
 msgstr[0] "Tiene %d contacto llamado %s. ¿Desearía fusionarlo?"
 msgstr[1] "Tiene %d contactos llamados %s. ¿Desearía fusionarlos?"

-#: ../pidgin/gtkblist.c:544
+#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
-msgstr "Si fusiona estos contactos hará que tengan una sola entrada en la lista de 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:546
-msgid "_Merge"
-msgstr "_Fusionar"
-
-#: ../pidgin/gtkblist.c:960 ../pidgin/gtkblist.c:6622
+msgstr ""
+"Si fusiona estos contactos hará que tengan una sola entrada en la lista de "
+"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
 msgid "Room _List"
 msgstr "_Lista de salas"

-#: ../pidgin/gtkblist.c:980
+#: ../pidgin/gtkblist.c:984
 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:991 ../pidgin/gtkblist.c:6657
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:709
+#: ../pidgin/gtkblist.c:996 ../pidgin/gtkblist.c:6746
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Cuenta:"

-#: ../pidgin/gtkblist.c:1280 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1274 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Bloquear"

-#: ../pidgin/gtkblist.c:1280
+#: ../pidgin/gtkblist.c:1274
 msgid "Un_block"
 msgstr "Des_bloquear"

-#: ../pidgin/gtkblist.c:1323
+#: ../pidgin/gtkblist.c:1317
 msgid "Move to"
 msgstr "Mover a"

-#: ../pidgin/gtkblist.c:1363
+#: ../pidgin/gtkblist.c:1357
 msgid "Get _Info"
 msgstr "Obtener _información"

-#: ../pidgin/gtkblist.c:1366 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1360 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"

-#: ../pidgin/gtkblist.c:1372
+#: ../pidgin/gtkblist.c:1366
 msgid "_Send File..."
 msgstr "_Enviar archivo..."

-#: ../pidgin/gtkblist.c:1379
+#: ../pidgin/gtkblist.c:1373
 msgid "Add Buddy _Pounce..."
 msgstr "Añadir _aviso de amigo..."

-#: ../pidgin/gtkblist.c:1384 ../pidgin/gtkblist.c:1388
-#: ../pidgin/gtkblist.c:1503 ../pidgin/gtkblist.c:1526
+#: ../pidgin/gtkblist.c:1378 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1502 ../pidgin/gtkblist.c:1525
 msgid "View _Log"
 msgstr "Ver _registro"

-#: ../pidgin/gtkblist.c:1394
+#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
 msgid "Hide when offline"
 msgstr "Ocultar cuando se esté desconectado"

-#: ../pidgin/gtkblist.c:1394
+#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
 msgid "Show when offline"
 msgstr "Mostrar cuando se esté desconectado"

-#: ../pidgin/gtkblist.c:1408 ../pidgin/gtkblist.c:1417
-#: ../pidgin/gtkblist.c:1511 ../pidgin/gtkblist.c:1532
+#: ../pidgin/gtkblist.c:1402 ../pidgin/gtkblist.c:1411
+#: ../pidgin/gtkblist.c:1510 ../pidgin/gtkblist.c:1531
 msgid "_Alias..."
 msgstr "_Apodo..."

-#: ../pidgin/gtkblist.c:1411 ../pidgin/gtkblist.c:1419
-#: ../pidgin/gtkblist.c:1513 ../pidgin/gtkblist.c:1534
+#: ../pidgin/gtkblist.c:1405 ../pidgin/gtkblist.c:1413
+#: ../pidgin/gtkblist.c:1512 ../pidgin/gtkblist.c:1533
 msgid "_Remove"
 msgstr "Elimina_r"

-#: ../pidgin/gtkblist.c:1469
+#: ../pidgin/gtkblist.c:1463
 msgid "Add _Buddy..."
 msgstr "Añadir _amigo..."

-#: ../pidgin/gtkblist.c:1472
+#: ../pidgin/gtkblist.c:1466
 msgid "Add C_hat..."
 msgstr "Añadir c_hat..."

-#: ../pidgin/gtkblist.c:1475
+#: ../pidgin/gtkblist.c:1469
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"

-#: ../pidgin/gtkblist.c:1477
+#: ../pidgin/gtkblist.c:1471
 msgid "_Rename"
 msgstr "_Renombrar"

 #. join button
-#: ../pidgin/gtkblist.c:1497 ../pidgin/gtkroomlist.c:316
-#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Unirse"

-#: ../pidgin/gtkblist.c:1499
+#: ../pidgin/gtkblist.c:1498
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"

-#: ../pidgin/gtkblist.c:1501
+#: ../pidgin/gtkblist.c:1500
 msgid "Persistent"
 msgstr "Persistente"

-#: ../pidgin/gtkblist.c:1539 ../pidgin/gtkblist.c:1562
+#: ../pidgin/gtkblist.c:1538 ../pidgin/gtkblist.c:1561
 msgid "_Collapse"
 msgstr "_Contraer"

-#: ../pidgin/gtkblist.c:1567
+#: ../pidgin/gtkblist.c:1566
 msgid "_Expand"
 msgstr "_Expandir"

-#: ../pidgin/gtkblist.c:1818 ../pidgin/gtkblist.c:1830
-#: ../pidgin/gtkblist.c:5285 ../pidgin/gtkblist.c:5298
+#: ../pidgin/gtkblist.c:1817 ../pidgin/gtkblist.c:1829
+#: ../pidgin/gtkblist.c:5410 ../pidgin/gtkblist.c:5423
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"

-#: ../pidgin/gtkblist.c:2290 ../pidgin/gtkconv.c:4849
+#: ../pidgin/gtkblist.c:2289 ../pidgin/gtkconv.c:4807
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."

+#. 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
+msgid "Unknown node type"
+msgstr "Tipo de nodo desconocido"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3108
+#: ../pidgin/gtkblist.c:3076
 msgid "/_Buddies"
 msgstr "/A_migos"

-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo..."

-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."

-#: ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."

-#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3080
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."

-#: ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Sh_ow"
 msgstr "/Amigos/M_ostrar"

-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desc_onectados"

-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3084
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos _vacíos"

-#: ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Amigos/Mostrar/_Detalles de amigo"

-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3086
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Amigos/Mostrar/_Tiempo de inactividad"

-#: ../pidgin/gtkblist.c:3119
+#: ../pidgin/gtkblist.c:3087
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de _protocolo"

-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3088
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"

-#: ../pidgin/gtkblist.c:3122
+#: ../pidgin/gtkblist.c:3090
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."

-#: ../pidgin/gtkblist.c:3123
+#: ../pidgin/gtkblist.c:3091
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."

-#: ../pidgin/gtkblist.c:3124
+#: ../pidgin/gtkblist.c:3092
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."

-#: ../pidgin/gtkblist.c:3126
+#: ../pidgin/gtkblist.c:3094
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"

 #. Accounts menu
-#: ../pidgin/gtkblist.c:3129
+#: ../pidgin/gtkblist.c:3097
 msgid "/_Accounts"
 msgstr "/_Cuentas"

-#: ../pidgin/gtkblist.c:3130 ../pidgin/gtkblist.c:7359
+#: ../pidgin/gtkblist.c:3098 ../pidgin/gtkblist.c:7431
 msgid "/Accounts/Manage"
 msgstr "/Cuentas/Gestionar"

 #. Tools
-#: ../pidgin/gtkblist.c:3133
+#: ../pidgin/gtkblist.c:3101
 msgid "/_Tools"
 msgstr "/_Herramientas"

-#: ../pidgin/gtkblist.c:3134
+#: ../pidgin/gtkblist.c:3102
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"

-#: ../pidgin/gtkblist.c:3135
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/_Certificates"
 msgstr "/Herramientas/_Certificados"

-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3104
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"

-#: ../pidgin/gtkblist.c:3137
+#: ../pidgin/gtkblist.c:3105
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"

-#: ../pidgin/gtkblist.c:3138
+#: ../pidgin/gtkblist.c:3106
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"

-#: ../pidgin/gtkblist.c:3140
+#: ../pidgin/gtkblist.c:3108
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"

-#: ../pidgin/gtkblist.c:3141
+#: ../pidgin/gtkblist.c:3109
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"

-#: ../pidgin/gtkblist.c:3142
+#: ../pidgin/gtkblist.c:3110
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/_Registro del sistema"

-#: ../pidgin/gtkblist.c:3144
+#: ../pidgin/gtkblist.c:3112
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"

 #. Help
-#: ../pidgin/gtkblist.c:3146
+#: ../pidgin/gtkblist.c:3114
 msgid "/_Help"
 msgstr "/_Ayuda"

-#: ../pidgin/gtkblist.c:3147
+#: ../pidgin/gtkblist.c:3115
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"

-#: ../pidgin/gtkblist.c:3148
+#: ../pidgin/gtkblist.c:3116
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"

-#: ../pidgin/gtkblist.c:3150 ../pidgin/gtkblist.c:3152
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"

-#: ../pidgin/gtkblist.c:3181
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Cuenta:</b> %s"
-
-#: ../pidgin/gtkblist.c:3259
+#: ../pidgin/gtkblist.c:3151
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Cuenta:</b> %s"
+
+#: ../pidgin/gtkblist.c:3171
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr "\n<b>Tema:</b> %s"
+
+#: ../pidgin/gtkblist.c:3171
+msgid "(no topic set)"
+msgstr "(no hay tema establecido)"
+
+#: ../pidgin/gtkblist.c:3249
 msgid "Buddy Alias"
 msgstr "Apodo de amigo"

-#: ../pidgin/gtkblist.c:3288
+#: ../pidgin/gtkblist.c:3278
 msgid "Logged In"
 msgstr "Conectado"

-#: ../pidgin/gtkblist.c:3334
+#: ../pidgin/gtkblist.c:3324
 msgid "Last Seen"
 msgstr "Visto por última vez"

-#: ../pidgin/gtkblist.c:3355
+#: ../pidgin/gtkblist.c:3345
 msgid "Spooky"
 msgstr "Asustadizo"

-#: ../pidgin/gtkblist.c:3357
+#: ../pidgin/gtkblist.c:3347
 msgid "Awesome"
 msgstr "Genial"

-#: ../pidgin/gtkblist.c:3359
+#: ../pidgin/gtkblist.c:3349
 msgid "Rockin'"
 msgstr "Rock'n'roleando"

-#: ../pidgin/gtkblist.c:3698
+#: ../pidgin/gtkblist.c:3380
+msgid "Total Buddies"
+msgstr "Amigos en total"
+
+#: ../pidgin/gtkblist.c:3742
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"

-#: ../pidgin/gtkblist.c:3700
+#: ../pidgin/gtkblist.c:3744
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"

-#: ../pidgin/gtkblist.c:3702
+#: ../pidgin/gtkblist.c:3746
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"

-#: ../pidgin/gtkblist.c:3856
+#: ../pidgin/gtkblist.c:3900
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantáneo..."

-#: ../pidgin/gtkblist.c:3857 ../pidgin/gtkblist.c:3890
+#: ../pidgin/gtkblist.c:3901 ../pidgin/gtkblist.c:3934
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."

-#: ../pidgin/gtkblist.c:3858
+#: ../pidgin/gtkblist.c:3902
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener información del usuario..."

-#: ../pidgin/gtkblist.c:3859
+#: ../pidgin/gtkblist.c:3903
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Añadir un amigo..."

-#: ../pidgin/gtkblist.c:3860 ../pidgin/gtkblist.c:3893
+#: ../pidgin/gtkblist.c:3904 ../pidgin/gtkblist.c:3937
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Añadir un chat..."

-#: ../pidgin/gtkblist.c:3861
+#: ../pidgin/gtkblist.c:3905
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Añadir un grupo..."

-#: ../pidgin/gtkblist.c:3896
+#: ../pidgin/gtkblist.c:3940
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"

-#: ../pidgin/gtkblist.c:3899
+#: ../pidgin/gtkblist.c:3943
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"

-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4075 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14348,66 +14618,68 @@
 msgstr[0] "%d mensaje sin leer de %s\n"
 msgstr[1] "%d mensajes sin leer de %s\n"

-#: ../pidgin/gtkblist.c:4194
+#: ../pidgin/gtkblist.c:4238
 msgid "Manually"
 msgstr "Manualmente"

-#: ../pidgin/gtkblist.c:4197
+#: ../pidgin/gtkblist.c:4241
 msgid "By status"
 msgstr "Por estado"

-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4242
 msgid "By log size"
 msgstr "Por tamaño de registro"

-#: ../pidgin/gtkblist.c:4524
+#: ../pidgin/gtkblist.c:4579
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"

-#: ../pidgin/gtkblist.c:4526
+#: ../pidgin/gtkblist.c:4581
 #, c-format
 msgid "%s disabled"
 msgstr "%s deshabilitado"

-#: ../pidgin/gtkblist.c:4530
+#: ../pidgin/gtkblist.c:4585
 msgid "Reconnect"
 msgstr "Reconectar"

-#: ../pidgin/gtkblist.c:4530 ../pidgin/gtkblist.c:4629
+#: ../pidgin/gtkblist.c:4585 ../pidgin/gtkblist.c:4704
 msgid "Re-enable"
 msgstr "Reactivar"

-#: ../pidgin/gtkblist.c:4627
+#: ../pidgin/gtkblist.c:4702
 msgid "Welcome back!"
 msgstr "¡Bienvenido!"

-#: ../pidgin/gtkblist.c:4657
+#: ../pidgin/gtkblist.c:4738
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "se deshabilitó %d cuenta porque se ha conectado desde otra ubicación."
-msgstr[1] "se deshabilitaron %d cuentas porque se ha conectado desde otra ubicación."
-
-#: ../pidgin/gtkblist.c:4895
+msgstr[0] ""
+"se deshabilitó %d cuenta porque se ha conectado desde otra ubicación."
+msgstr[1] ""
+"se deshabilitaron %d cuentas porque se ha conectado desde otra ubicación."
+
+#: ../pidgin/gtkblist.c:5017
 msgid "<b>Username:</b>"
 msgstr "<b>Nombre de usuario:</b>"

-#: ../pidgin/gtkblist.c:4902
+#: ../pidgin/gtkblist.c:5024
 msgid "<b>Password:</b>"
 msgstr "<b>Contraseña:</b>"

-#: ../pidgin/gtkblist.c:4913
+#: ../pidgin/gtkblist.c:5035
 msgid "_Login"
 msgstr "_Entrada"

-#: ../pidgin/gtkblist.c:4997
+#: ../pidgin/gtkblist.c:5119
 msgid "/Accounts"
 msgstr "/Cuentas"

 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5011
+#: ../pidgin/gtkblist.c:5133
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14418,61 +14690,54 @@
 msgstr ""
 "<span size='larger' weight='bold'>¡Bienvenido a %s!</span>\n"
 "\n"
-"No tiene ninguna cuenta activa. Puede activar sus cuentas de MI en la ventana de <b>Cuentas</b> en <b>Cuentas->Gestionar</b>. Podrá conectarse, fijar su estado y hablar con sus amigos una vez active sus cuentas."
+"No tiene ninguna cuenta activa. Puede activar sus cuentas de MI en la "
+"ventana de <b>Cuentas</b> en <b>Cuentas->Gestionar</b>. Podrá conectarse, "
+"fijar su estado y hablar con sus amigos una vez active sus cuentas."

 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5279
+#: ../pidgin/gtkblist.c:5404
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desconectados"

-#: ../pidgin/gtkblist.c:5282
+#: ../pidgin/gtkblist.c:5407
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos vacíos"

-#: ../pidgin/gtkblist.c:5288
+#: ../pidgin/gtkblist.c:5413
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Amigos/Mostrar/Detalles de amigo"

-#: ../pidgin/gtkblist.c:5291
+#: ../pidgin/gtkblist.c:5416
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Amigos/Mostrar/Tiempos de inactividad"

-#: ../pidgin/gtkblist.c:5294
+#: ../pidgin/gtkblist.c:5419
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de protocolo"

-#: ../pidgin/gtkblist.c:6250
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Introduzca el nombre de usuario de la persona que usted quiere añadir a la "
-"lista. Puede, opcionalmente, introducir un sobrenombre o apodo. El "
-"sobrenombre se mostrará en lugar del nombre de usuario siempre que sea "
-"posible.\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6273
-msgid "A_ccount:"
-msgstr "_Cuenta:"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:6285
-msgid "_Screen name:"
-msgstr "Nombre de _usuario:"
-
-#: ../pidgin/gtkblist.c:6307 ../pidgin/gtkblist.c:6678
-msgid "A_lias:"
-msgstr "_Apodo:"
-
-#: ../pidgin/gtkblist.c:6587
+#: ../pidgin/gtkblist.c:6372
+msgid "Add a buddy.\n"
+msgstr "Añadir un amigo.\n"
+
+#: ../pidgin/gtkblist.c:6387
+msgid "Buddy's _screen name:"
+msgstr "Nombre de _usuario del amigo:"
+
+#: ../pidgin/gtkblist.c:6409
+msgid "(Optional) A_lias:"
+msgstr "(Opcional) A_podo:"
+
+#: ../pidgin/gtkblist.c:6427
+msgid "Add buddy to _group:"
+msgstr "Añadir el amigo a un _grupo:"
+
+#: ../pidgin/gtkblist.c:6676
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."

-#: ../pidgin/gtkblist.c:6603
+#: ../pidgin/gtkblist.c:6692
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14480,7 +14745,7 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."

-#: ../pidgin/gtkblist.c:6647
+#: ../pidgin/gtkblist.c:6736
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14488,75 +14753,79 @@
 "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:6706
+#: ../pidgin/gtkblist.c:6759
+msgid "A_lias:"
+msgstr "_Apodo:"
+
+#: ../pidgin/gtkblist.c:6766
 msgid "Auto_join when account becomes online."
 msgstr "Reconec_tarse cuando la cuenta se pone en línea."

-#: ../pidgin/gtkblist.c:6707
+#: ../pidgin/gtkblist.c:6767
 msgid "_Hide chat when the window is closed."
 msgstr "_Ocultar el chat cuando se cierra la ventana."

-#: ../pidgin/gtkblist.c:6733
+#: ../pidgin/gtkblist.c:6793
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."

-#: ../pidgin/gtkblist.c:7379
+#: ../pidgin/gtkblist.c:7451
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Cuentas/"

-#: ../pidgin/gtkblist.c:7403
+#: ../pidgin/gtkblist.c:7475
 msgid "_Edit Account"
 msgstr "_Editar cuenta"

-#: ../pidgin/gtkblist.c:7416 ../pidgin/gtkconv.c:3097
+#: ../pidgin/gtkblist.c:7488 ../pidgin/gtkconv.c:3128
 msgid "No actions available"
 msgstr "No hay acciones disponibles"

-#: ../pidgin/gtkblist.c:7424
+#: ../pidgin/gtkblist.c:7496
 msgid "_Disable"
 msgstr "_Deshabilitar"

-#: ../pidgin/gtkblist.c:7436
+#: ../pidgin/gtkblist.c:7508
 msgid "Enable Account"
 msgstr "Habilitar cuenta"

-#: ../pidgin/gtkblist.c:7442
+#: ../pidgin/gtkblist.c:7514
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Cuentas/Activar cuenta"

-#: ../pidgin/gtkblist.c:7491
+#: ../pidgin/gtkblist.c:7563
 msgid "/Tools"
 msgstr "/Herramientas"

-#: ../pidgin/gtkblist.c:7561
+#: ../pidgin/gtkblist.c:7633
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"

 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "Servidores SSL"

-#: ../pidgin/gtkconv.c:473
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "Orden desconocida."

-#: ../pidgin/gtkconv.c:743 ../pidgin/gtkconv.c:769
+#: ../pidgin/gtkconv.c:749 ../pidgin/gtkconv.c:775
 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:763
+#: ../pidgin/gtkconv.c:769
 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:816
+#: ../pidgin/gtkconv.c:822
 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:846
+#: ../pidgin/gtkconv.c:852
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14564,183 +14833,183 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."

-#: ../pidgin/gtkconv.c:867
+#: ../pidgin/gtkconv.c:873
 msgid "_Buddy:"
 msgstr "_Amigo:"

-#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1200
-#: ../pidgin/gtksavedstatuses.c:1536
+#: ../pidgin/gtkconv.c:884 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Mensaje:"

-#: ../pidgin/gtkconv.c:942
+#: ../pidgin/gtkconv.c:948
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"

-#: ../pidgin/gtkconv.c:980
+#: ../pidgin/gtkconv.c:986
 msgid "Save Conversation"
 msgstr "Guardar conversación"

-#: ../pidgin/gtkconv.c:1126 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1132 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Buscar"

-#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1158 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "Término a _buscar:"

-#: ../pidgin/gtkconv.c:1629
+#: ../pidgin/gtkconv.c:1659
 msgid "Un-Ignore"
 msgstr "No ignorar"

-#: ../pidgin/gtkconv.c:1632
+#: ../pidgin/gtkconv.c:1662
 msgid "Ignore"
 msgstr "Ignorar"

-#: ../pidgin/gtkconv.c:1652
+#: ../pidgin/gtkconv.c:1682
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"

-#: ../pidgin/gtkconv.c:1675
+#: ../pidgin/gtkconv.c:1705
 msgid "Last said"
 msgstr "Dicho la última vez"

-#: ../pidgin/gtkconv.c:2624
+#: ../pidgin/gtkconv.c:2660
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."

-#: ../pidgin/gtkconv.c:2675
+#: ../pidgin/gtkconv.c:2711
 msgid "Save Icon"
 msgstr "Guardar icono"

-#: ../pidgin/gtkconv.c:2727
+#: ../pidgin/gtkconv.c:2763
 msgid "Animate"
 msgstr "Animar"

-#: ../pidgin/gtkconv.c:2732
+#: ../pidgin/gtkconv.c:2768
 msgid "Hide Icon"
 msgstr "Ocultar icono"

-#: ../pidgin/gtkconv.c:2735
+#: ../pidgin/gtkconv.c:2771
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."

-#: ../pidgin/gtkconv.c:2739
+#: ../pidgin/gtkconv.c:2775
 msgid "Set Custom Icon..."
 msgstr "Configurar icono personalizado..."

-#: ../pidgin/gtkconv.c:2752
+#: ../pidgin/gtkconv.c:2788
 msgid "Remove Custom Icon"
 msgstr "Eliminar icono personalizado"

-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2913
 msgid "Show All"
 msgstr "Mostrar todo"

 #. Conversation menu
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Conversation"
 msgstr "/_Conversación"

-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."

-#: ../pidgin/gtkconv.c:2908
+#: ../pidgin/gtkconv.c:2939
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."

-#: ../pidgin/gtkconv.c:2910
+#: ../pidgin/gtkconv.c:2941
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"

-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2942
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."

-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2944
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/Limpia_r deslizable"

-#: ../pidgin/gtkconv.c:2917
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/_Enviar archivo..."

-#: ../pidgin/gtkconv.c:2918
+#: ../pidgin/gtkconv.c:2949
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."

-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2951
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"

-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."

-#: ../pidgin/gtkconv.c:2924
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/M_ore"
 msgstr "/Conversación/_Más"

-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."

-#: ../pidgin/gtkconv.c:2930
+#: ../pidgin/gtkconv.c:2961
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."

-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2963
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversación/_Desbloquear..."

-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."

-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."

-#: ../pidgin/gtkconv.c:2941
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Insertar en_lace..."

-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Insertar imag_en..."

-#: ../pidgin/gtkconv.c:2949
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"

 #. Options
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2984
 msgid "/_Options"
 msgstr "/_Opciones"

-#: ../pidgin/gtkconv.c:2954
+#: ../pidgin/gtkconv.c:2985
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"

-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2986
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"

-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2988
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"

-#: ../pidgin/gtkconv.c:2958
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"

-#: ../pidgin/gtkconv.c:3085
+#: ../pidgin/gtkconv.c:3116
 msgid "/Conversation/More"
 msgstr "/Conversación/Más"

-#: ../pidgin/gtkconv.c:3141
+#: ../pidgin/gtkconv.c:3172
 msgid "/Options"
 msgstr "/Opciones"

@@ -14749,172 +15018,175 @@
 #. 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:3176 ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3207 ../pidgin/gtkconv.c:3239
 msgid "/Conversation"
 msgstr "/Conversación"

-#: ../pidgin/gtkconv.c:3216
+#: ../pidgin/gtkconv.c:3247
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"

-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3253
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."

-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."

-#: ../pidgin/gtkconv.c:3232
+#: ../pidgin/gtkconv.c:3263
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"

-#: ../pidgin/gtkconv.c:3236
+#: ../pidgin/gtkconv.c:3267
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."

-#: ../pidgin/gtkconv.c:3242
+#: ../pidgin/gtkconv.c:3273
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."

-#: ../pidgin/gtkconv.c:3246
+#: ../pidgin/gtkconv.c:3277
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."

-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Unblock..."
 msgstr "/Conversación/Desbloquear..."

-#: ../pidgin/gtkconv.c:3254
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."

-#: ../pidgin/gtkconv.c:3258
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."

-#: ../pidgin/gtkconv.c:3264
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."

-#: ../pidgin/gtkconv.c:3268
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."

-#: ../pidgin/gtkconv.c:3274
+#: ../pidgin/gtkconv.c:3305
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"

-#: ../pidgin/gtkconv.c:3277
+#: ../pidgin/gtkconv.c:3308
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"

-#: ../pidgin/gtkconv.c:3290
+#: ../pidgin/gtkconv.c:3321
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"

-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3324
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"

-#: ../pidgin/gtkconv.c:3370 ../pidgin/gtkconv.c:3412
+#: ../pidgin/gtkconv.c:3402
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."

-#: ../pidgin/gtkconv.c:3415
-msgid "User has typed something and stopped"
-msgstr "El usuario ha escrito algo y ha parado"
+#: ../pidgin/gtkconv.c:3472
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr "\n%s ha dejado de escribir"

 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3599 ../pidgin/gtkconv.c:8264
+#: ../pidgin/gtkconv.c:3638 ../pidgin/gtkconv.c:8309
 msgid "S_end To"
 msgstr "_Enviar a"

-#: ../pidgin/gtkconv.c:4311
+#: ../pidgin/gtkconv.c:4350
 msgid "_Send"
 msgstr "_Enviar"

 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4418
+#: ../pidgin/gtkconv.c:4486
 msgid "0 people in room"
 msgstr "0 personas en la conversación"

-#: ../pidgin/gtkconv.c:5775 ../pidgin/gtkconv.c:5896
+#: ../pidgin/gtkconv.c:5784 ../pidgin/gtkconv.c:5905
 #, 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:6523 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6535 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "Tecleando"

-#: ../pidgin/gtkconv.c:6527
-msgid "Stopped Typing"
-msgstr "Deja de escribi_r"
-
-#: ../pidgin/gtkconv.c:6530
-msgid "Nick Said"
-msgstr "Apodo dijo"
-
-#: ../pidgin/gtkconv.c:6533 ../pidgin/gtkdocklet.c:685
-msgid "Unread Messages"
-msgstr "Mensajes sin leer"
-
 #: ../pidgin/gtkconv.c:6539
+msgid "Stopped Typing"
+msgstr "Deja de escribi_r"
+
+#: ../pidgin/gtkconv.c:6542
+msgid "Nick Said"
+msgstr "Apodo dijo"
+
+#: ../pidgin/gtkconv.c:6545 ../pidgin/gtkdocklet.c:686
+msgid "Unread Messages"
+msgstr "Mensajes sin leer"
+
+#: ../pidgin/gtkconv.c:6551
 msgid "New Event"
 msgstr "Nuevo acontecimiento"

-#: ../pidgin/gtkconv.c:7745
+#: ../pidgin/gtkconv.c:7781
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: limpia todos los históricos de las ventanas de conversación."

-#: ../pidgin/gtkconv.c:7946
+#: ../pidgin/gtkconv.c:7985
 msgid "Confirm close"
 msgstr "Confirmar cierre"

-#: ../pidgin/gtkconv.c:7978
+#: ../pidgin/gtkconv.c:8017
 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:8597
+#: ../pidgin/gtkconv.c:8650
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"

-#: ../pidgin/gtkconv.c:8603
+#: ../pidgin/gtkconv.c:8656
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"

-#: ../pidgin/gtkconv.c:8611
+#: ../pidgin/gtkconv.c:8664
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"

-#: ../pidgin/gtkconv.c:8617
+#: ../pidgin/gtkconv.c:8670
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"

-#: ../pidgin/gtkconv.c:9133
+#: ../pidgin/gtkconv.c:9184
 msgid "Close conversation"
 msgstr "Cerrar conversación"

-#: ../pidgin/gtkconv.c:9736
+#: ../pidgin/gtkconv.c:9788
 msgid "Last created window"
 msgstr "Última ventana creada"

-#: ../pidgin/gtkconv.c:9738
+#: ../pidgin/gtkconv.c:9790
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"

-#: ../pidgin/gtkconv.c:9740 ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkconv.c:9792 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "Ventana nueva"

-#: ../pidgin/gtkconv.c:9742
+#: ../pidgin/gtkconv.c:9794
 msgid "By group"
 msgstr "Por grupo"

-#: ../pidgin/gtkconv.c:9744
+#: ../pidgin/gtkconv.c:9796
 msgid "By account"
 msgstr "Por cuenta"

@@ -14942,43 +15214,43 @@
 msgid "_Both Icon & Text"
 msgstr "_Tanto iconos como texto"

-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filtro"

-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Pulsar el botón derecho para más opciones."

-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Nivel "

-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Seleccione el nivel del filtro de depuración."

-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Todos"

-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Misceláneo"

-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Advertencia"

-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Error "

-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Error fatal"

-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
 msgid "lead developer"
 msgstr "desarrollador principal"

@@ -14991,6 +15263,7 @@
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
 #: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "desarrollador"

@@ -15002,345 +15275,349 @@
 msgid "support/QA"
 msgstr "soporte/QA"

-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"

-#: ../pidgin/gtkdialogs.c:99
+#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "Contribuyente senior/QA"

-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:110
 msgid "win32 port"
 msgstr "adaptación a win32"

-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
 msgid "maintainer"
 msgstr "mantenedor"

-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:113
 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:114
+#: ../pidgin/gtkdialogs.c:116
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseñador de controladores [lazy bum]"

-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:117
 msgid "XMPP developer"
 msgstr "desarrollador XMPP"

-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:118
 msgid "original author"
 msgstr "autor original"

-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Afrikaans"
 msgstr "Afrikaans"

 # Amhario
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:230
 msgid "Arabic"
 msgstr "Árabe"

-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr "Latín bieloruso"

-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:231
 msgid "Bulgarian"
 msgstr "Búlgaro"

-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "Bengalí"

-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "Bosnio"

-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
 msgid "Catalan"
 msgstr "Catalán"

-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalán"

-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:234
 msgid "Czech"
 msgstr "Checo"

-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "Danés"

-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:235
 msgid "German"
 msgstr "Alemán"

-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "Butaní"

-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "Griego"

-#: ../pidgin/gtkdialogs.c:156
-msgid "Australian English"
-msgstr "Inglés australiano"
-
 #: ../pidgin/gtkdialogs.c:157
-msgid "Canadian English"
-msgstr "Inglés canadiense"
+msgid "Australian English"
+msgstr "Inglés australiano"

 #: ../pidgin/gtkdialogs.c:158
+msgid "Canadian English"
+msgstr "Inglés canadiense"
+
+#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "Inglés británico"

-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "Esperanto"

-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Spanish"
 msgstr "Español"

-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "Estonio"

-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "Eusquera(Vasco)"

-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "Persa"

-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Finnish"
 msgstr "Finlandés"

-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "French"
 msgstr "Francés"

-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:246
 msgid "Galician"
 msgstr "Gallego"

-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "Gujarati"

-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "Grupo de traducción al Gujarati"

-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:247
 msgid "Hebrew"
 msgstr "Hebreo"

-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "Hindú"

-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:248
 msgid "Hungarian"
 msgstr "Húngaro"

-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "Indonesio"

-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:249
 msgid "Italian"
 msgstr "Italiano"

-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
 msgid "Japanese"
 msgstr "Japonés"

-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:253
 msgid "Georgian"
 msgstr "Georgiano"

-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductores al georgiano de Ubuntu"

-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "Kannada"

-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "Grupo de traducción al kannada"

-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Korean"
 msgstr "Coreano"

-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "Kurdo"

-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "Laosiano"

-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Lithuanian"
 msgstr "Lituano"

-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:258
 msgid "Macedonian"
 msgstr "Macedonio"

-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
-#: ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"

-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "Nepalés"

-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "Danés, Flamenco"

-#: ../pidgin/gtkdialogs.c:193
-msgid "Norwegian Nynorsk"
-msgstr "Noruego Nynorsk"
-
 #: ../pidgin/gtkdialogs.c:194
+msgid "Norwegian Nynorsk"
+msgstr "Noruego Nynorsk"
+
+#: ../pidgin/gtkdialogs.c:195
 msgid "Punjabi"
 msgstr "Punjabí"

-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
 msgid "Polish"
 msgstr "Polaco"

-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "Portugués"

-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"

-#: ../pidgin/gtkdialogs.c:200
-msgid "Pashto"
-msgstr "Afgano"
-
 #: ../pidgin/gtkdialogs.c:201
+msgid "Pashto"
+msgstr "Afgano"
+
+#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "Rumano"

-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Russian"
 msgstr "Ruso"

-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:266
 msgid "Slovak"
 msgstr "Eslovaco"

-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:267
 msgid "Slovenian"
 msgstr "Esloveno"

-#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "Albanés"

-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:268 ../pidgin/gtkdialogs.c:269
 msgid "Serbian"
 msgstr "Serbio"

-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:268
-#: ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:210
+msgid "Sinhala"
+msgstr "Sinhala"
+
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:271
 msgid "Swedish"
 msgstr "Sueco"

-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Tamil"
 msgstr "Tamil"

-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Telugu"
 msgstr "Telugu"

-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:214
 msgid "Thai"
 msgstr "Thai"

-#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:272
 msgid "Turkish"
 msgstr "Turco"

-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:216
 msgid "Urdu"
 msgstr "Urdu"

-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "Vietnamese"
 msgstr "Vietnamita"

-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"

-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:273
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"

-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Hong Kong Chinese"
 msgstr "Chino de Hong Kong"

-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:274
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"

 # Amhario
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:229
 msgid "Amharic"
 msgstr "Amhárico"

-#: ../pidgin/gtkdialogs.c:360
+#: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"

-#: ../pidgin/gtkdialogs.c:403
+#: ../pidgin/gtkdialogs.c:395
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15352,59 +15629,69 @@
 "is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
-msgstr "%s es un cliente gráfico y modular de mensajería basado en libpurple capaz de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu y QQ todos al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo los términos de la GPL (versión 2 o posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» que se distribuye con %s. Las personas que han contribuido a %s tienen los derechos de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista completa de personas que han contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:421
+msgstr ""
+"%s es un cliente gráfico y modular de mensajería basado en libpurple capaz "
+"de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu y QQ todos "
+"al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y "
+"redistribuir este programa bajo los términos de la GPL (versión 2 o "
+"posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» "
+"que se distribuye con %s. Las personas que han contribuido a %s tienen los "
+"derechos de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista "
+"completa de personas que han contribuido. Este programa se distribuye sin "
+"ninguna garantía.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:413
 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:426
+#: ../pidgin/gtkdialogs.c:418
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"

-#: ../pidgin/gtkdialogs.c:441
+#: ../pidgin/gtkdialogs.c:433
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"

-#: ../pidgin/gtkdialogs.c:456
+#: ../pidgin/gtkdialogs.c:448
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"

-#: ../pidgin/gtkdialogs.c:471
+#: ../pidgin/gtkdialogs.c:463
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"

-#: ../pidgin/gtkdialogs.c:486
+#: ../pidgin/gtkdialogs.c:478
 msgid "Artists"
 msgstr "Artistas"

-#: ../pidgin/gtkdialogs.c:501
+#: ../pidgin/gtkdialogs.c:493
 msgid "Current Translators"
 msgstr "Traductores actuales"

-#: ../pidgin/gtkdialogs.c:521
+#: ../pidgin/gtkdialogs.c:513
 msgid "Past Translators"
 msgstr "Traductores anteriores"

-#: ../pidgin/gtkdialogs.c:539
+#: ../pidgin/gtkdialogs.c:531
 msgid "Debugging Information"
 msgstr "Información de depuración"

-#: ../pidgin/gtkdialogs.c:761 ../pidgin/gtkdialogs.c:900
-#: ../pidgin/gtkdialogs.c:981
+#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:886
+#: ../pidgin/gtkdialogs.c:967
 msgid "_Name"
 msgstr "_Nombre"

-#: ../pidgin/gtkdialogs.c:766 ../pidgin/gtkdialogs.c:905
-#: ../pidgin/gtkdialogs.c:986
+#: ../pidgin/gtkdialogs.c:752 ../pidgin/gtkdialogs.c:891
+#: ../pidgin/gtkdialogs.c:972
 msgid "_Account"
 msgstr "_Cuenta"

-#: ../pidgin/gtkdialogs.c:913
+#: ../pidgin/gtkdialogs.c:899
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"

-#: ../pidgin/gtkdialogs.c:915
+#: ../pidgin/gtkdialogs.c:901
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -15412,11 +15699,11 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información."

-#: ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:991
 msgid "View User Log"
 msgstr "Ver registro de usuario"

-#: ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:993
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15424,32 +15711,32 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información de registro."

-#: ../pidgin/gtkdialogs.c:1027
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Alias Contact"
 msgstr "Apodo para contacto"

-#: ../pidgin/gtkdialogs.c:1028
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."

-#: ../pidgin/gtkdialogs.c:1050
+#: ../pidgin/gtkdialogs.c:1036
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."

-#: ../pidgin/gtkdialogs.c:1052
+#: ../pidgin/gtkdialogs.c:1038
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"

-#: ../pidgin/gtkdialogs.c:1073
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Chat"
 msgstr "Apodo en el chat"

-#: ../pidgin/gtkdialogs.c:1074
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."

-#: ../pidgin/gtkdialogs.c:1113
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15464,15 +15751,15 @@
 "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:1121
+#: ../pidgin/gtkdialogs.c:1107
 msgid "Remove Contact"
 msgstr "Eliminar contacto"

-#: ../pidgin/gtkdialogs.c:1124
+#: ../pidgin/gtkdialogs.c:1110
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"

-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1141
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15481,15 +15768,15 @@
 "Está a punto de fusionar el grupo llamado %s con el grupo llamado %s. ¿Desea "
 "continuar?"

-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1148
 msgid "Merge Groups"
 msgstr "Fusionar grupos"

-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1151
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"

-#: ../pidgin/gtkdialogs.c:1215
+#: ../pidgin/gtkdialogs.c:1201
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15498,29 +15785,29 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"

-#: ../pidgin/gtkdialogs.c:1218
+#: ../pidgin/gtkdialogs.c:1204
 msgid "Remove Group"
 msgstr "Eliminar grupo"

-#: ../pidgin/gtkdialogs.c:1221
+#: ../pidgin/gtkdialogs.c:1207
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"

-#: ../pidgin/gtkdialogs.c:1254
+#: ../pidgin/gtkdialogs.c:1240
 #, 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:1257
+#: ../pidgin/gtkdialogs.c:1243
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"

-#: ../pidgin/gtkdialogs.c:1260
+#: ../pidgin/gtkdialogs.c:1246
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"

-#: ../pidgin/gtkdialogs.c:1281
+#: ../pidgin/gtkdialogs.c:1267
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15528,11 +15815,11 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"

-#: ../pidgin/gtkdialogs.c:1284
+#: ../pidgin/gtkdialogs.c:1270
 msgid "Remove Chat"
 msgstr "Eliminar chat"

-#: ../pidgin/gtkdialogs.c:1287
+#: ../pidgin/gtkdialogs.c:1273
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"

@@ -15544,23 +15831,23 @@
 msgid "Change Status"
 msgstr "Cambiar estado:"

-#: ../pidgin/gtkdocklet.c:680
+#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "Mostrar la lista de amigos"

-#: ../pidgin/gtkdocklet.c:706
+#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "Mensaje nuevo..."

-#: ../pidgin/gtkdocklet.c:721
+#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "Sin sonido"

-#: ../pidgin/gtkdocklet.c:728
+#: ../pidgin/gtkdocklet.c:729
 msgid "Blink on New Message"
 msgstr "Parpadear con nuevo mensaje"

-#: ../pidgin/gtkdocklet.c:738
+#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "Salir"

@@ -15628,81 +15915,98 @@
 msgid "Time Remaining:"
 msgstr "Tiempo restante:"

-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias _terminen"

-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Limpiar transferencias terminadas"

 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "_Detalles de la transferencia de archivos"

 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausar"

 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Continuar"

-#: ../pidgin/gtkimhtml.c:817
+#: ../pidgin/gtkimhtml.c:820
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"

-#: ../pidgin/gtkimhtml.c:834 ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtml.c:837 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"

-#: ../pidgin/gtkimhtml.c:847 ../pidgin/gtkimhtml.c:4305
-#: ../pidgin/gtkimhtmltoolbar.c:1307
-msgid "_Smile!"
-msgstr "¡_Sonría!"
-
-#: ../pidgin/gtkimhtml.c:853 ../pidgin/gtkimhtml.c:4299
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1265
-msgid "_Insert"
-msgstr "_Insertar"
-
-#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtml.c:4293
-#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
-msgid "_Font"
-msgstr "_Tipografía"
-
-#: ../pidgin/gtkimhtml.c:1415
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"

-#: ../pidgin/gtkimhtml.c:1416
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."

-#: ../pidgin/gtkimhtml.c:1419
+#: ../pidgin/gtkimhtml.c:1399
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"

-#: ../pidgin/gtkimhtml.c:1420
+#: ../pidgin/gtkimhtml.c:1400
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratón esté encima."

-#: ../pidgin/gtkimhtml.c:1637
+#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:52
+msgid "Sent Message Name Color"
+msgstr "Enviar color en mensajes con nombre"
+
+#: ../pidgin/gtkimhtml.c:1404
+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
+msgid "Received Message Name Color"
+msgstr "Color en mensajes recibidos con nombre"
+
+#: ../pidgin/gtkimhtml.c:1408
+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
+msgid "\"Attention\" Name Color"
+msgstr "Color en nombre «atención»"
+
+#: ../pidgin/gtkimhtml.c:1412
+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."
+
+#: ../pidgin/gtkimhtml.c:1415 ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr "Color para mensajes de acciones con nombre"
+
+#: ../pidgin/gtkimhtml.c:1416
+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
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar dirección de correo electrónico"

-#: ../pidgin/gtkimhtml.c:1649
+#: ../pidgin/gtkimhtml.c:1648
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"

-#: ../pidgin/gtkimhtml.c:1659
+#: ../pidgin/gtkimhtml.c:1658
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"

-#: ../pidgin/gtkimhtml.c:3414
+#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15712,7 +16016,7 @@
 "\n"
 "Tomando PNG por omisión."

-#: ../pidgin/gtkimhtml.c:3417
+#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15722,7 +16026,7 @@
 "\n"
 "Tomando PNG por omisión."

-#: ../pidgin/gtkimhtml.c:3446
+#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15734,7 +16038,7 @@
 "\n"
 "%s"

-#: ../pidgin/gtkimhtml.c:3449
+#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15745,35 +16049,35 @@
 "\n"
 "%s"

-#: ../pidgin/gtkimhtml.c:3527 ../pidgin/gtkimhtml.c:3539
+#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "Guardar imagen"

-#: ../pidgin/gtkimhtml.c:3567
+#: ../pidgin/gtkimhtml.c:3577
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."

-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Seleccionar tipografía"

-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"

-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"

-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"

-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Descripción"

-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15781,31 +16085,38 @@
 "Introduzca el URL y la descripción del enlace que quiere insertar. La "
 "descripción es opcional."

-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:428
 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:430 ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "Insertar enlace"

-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
+msgid "_Insert"
+msgstr "_Insertar"
+
+#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No se pudo almacenar la imagen: %s\n"

-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Insertar imagen"

-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:712
+msgid "Smile!"
+msgstr "¡Sonría!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:764
 msgid "This theme has no available smileys."
 msgstr "Este tema no tiene emoticonos disponibles."

-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
-msgid "Smile!"
-msgstr "¡Sonría!"
+#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
+msgid "_Font"
+msgstr "_Tipografía"

 #: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
@@ -15815,15 +16126,15 @@
 msgid "Ungroup Items"
 msgstr "Desagrupar items"

-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:337
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Negrita"

-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:346
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Cursiva"

-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:355
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Subrayado"

@@ -15919,7 +16230,19 @@
 msgid "_Horizontal rule"
 msgstr "Regla _horizontal"

-#: ../pidgin/gtklog.c:293
+#: ../pidgin/gtkimhtmltoolbar.c:1307
+msgid "_Smile!"
+msgstr "¡_Sonría!"
+
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr "Falló el borrado del registro"
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr "Compruebe los permisos e inténtelo de nuevo."
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -15928,7 +16251,7 @@
 "¿Está seguro que desea borrar de forma permanente el registro de la "
 "conversación con %s que empezó en %s?"

-#: ../pidgin/gtklog.c:304
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -15937,7 +16260,7 @@
 "¿Está seguro que desea borrar de forma permanente el registro de la "
 "conversación en %s que empezó en %s?"

-#: ../pidgin/gtklog.c:309
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -15946,6 +16269,14 @@
 "¿Está seguro que desea borrar de forma permanente el registro del sistema "
 "que comezó en %s?"

+#: ../pidgin/gtklog.c:323
+msgid "Delete Log?"
+msgstr "¿Borrar el registro?"
+
+#: ../pidgin/gtklog.c:334
+msgid "Delete Log..."
+msgstr "Borrar el registro..."
+
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -15956,66 +16287,17 @@
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight='bold' size='larger'>Conversación con %s de %s</span>"

-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-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»."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Sólo se registrarán los mensajes instantáneos si está habilitada la "
-"preferencia «Registrar todos los mensajes instantáneos»."
-
-#: ../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."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "No se encontraron registros"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Acceder a la carpeta de registros"

-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Tamaño total del registro:"
-
-#: ../pidgin/gtklog.c:710
-#, c-format
-msgid "Conversations in %s"
-msgstr "Conversaciones en %s"
-
-#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
-#, c-format
-msgid "Conversations with %s"
-msgstr "Conversaciones con %s"
-
-#: ../pidgin/gtklog.c:810
-msgid "System Log"
-msgstr "Registro del Sistema"
-
-#: ../pidgin/gtkmain.c:398
+#: ../pidgin/gtkmain.c:385
 #, 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:400
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16026,8 +16308,9 @@
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
@@ -16039,12 +16322,43 @@
 "  -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 opción NOMBRE\n"
-"                       indica la(s) cuenta(s) a usar, separadas por comas)\n"
-"  --display=DISPLAY    sesión X que se debe utilizar\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:528
+#: ../pidgin/gtkmain.c:401
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+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"
+"  -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"
+"                       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
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16085,77 +16399,79 @@

 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:725 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"

-#: ../pidgin/gtknotify.c:350
+#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"

-#: ../pidgin/gtknotify.c:403
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"

-#: ../pidgin/gtknotify.c:546
+#: ../pidgin/gtknotify.c:551
 #, 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:570
+#: ../pidgin/gtknotify.c:575
 #, 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:998
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador «%s» no es válida."

-#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
-#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"

-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
+#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar «%s»: %s"

-#: ../pidgin/gtknotify.c:1154
+#: ../pidgin/gtknotify.c:1173
 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:265
+#: ../pidgin/gtkplugin.c:270
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."

-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:289
 msgid "Multiple plugins will be unloaded."
 msgstr "Se desactivarán múltiples complementos."

-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:293
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"

-#: ../pidgin/gtkplugin.c:308
+#: ../pidgin/gtkplugin.c:313
 msgid "Could not unload plugin"
 msgstr "No se pudo descargar el complemente"

-#: ../pidgin/gtkplugin.c:309
+#: ../pidgin/gtkplugin.c:314
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr "No se pudo descargar el complemento, se deshabilitará la próxima vez que arranque el programa."
-
-#: ../pidgin/gtkplugin.c:417
+msgstr ""
+"No se pudo descargar el complemento, se deshabilitará la próxima vez que "
+"arranque el programa."
+
+#: ../pidgin/gtkplugin.c:422
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16166,7 +16482,7 @@
 "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"

-#: ../pidgin/gtkplugin.c:427
+#: ../pidgin/gtkplugin.c:432
 #, c-format
 msgid ""
 "%s\n"
@@ -16177,11 +16493,15 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\\n\n"
 "Compruebe el sitio web del complemento para obtener una actualización.</span>"

-#: ../pidgin/gtkplugin.c:553
+#: ../pidgin/gtkplugin.c:569
+msgid "Author"
+msgstr "Autor"
+
+#: ../pidgin/gtkplugin.c:610
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"

-#: ../pidgin/gtkplugin.c:616
+#: ../pidgin/gtkplugin.c:677
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"

@@ -16280,24 +16600,19 @@
 msgid "_Recurring"
 msgstr "_Recurrente"

-#: ../pidgin/gtkpounce.c:1258
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"

-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "(por omisión)"
-
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Falló el desempaque de tema de emoticonos"

-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Instalar tema"

-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:646
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -16305,132 +16620,136 @@
 "Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
 "instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."

-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Icono"

-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "Icono del área de notificación del sistema"

-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "_Mostrar icono del área de notificación del sistema:"

-#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"

-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "Ocultar ventana de conversación"

-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"

-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "Cuando estoy fuera"

 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "Solapas"

-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas con _solapas"

-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botones de _cierre en las solapas"

-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_Colocación:"

-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "Arriba"

-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "Abajo"

-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "Izquierda"

-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "Derecha"

-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "Vertical a la izquierda"

-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "Vertical a la derecha"

-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "_Nuevas conversaciones:"

-#: ../pidgin/gtkprefs.c:996
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"

-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:946
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Cerrar MIs inmediatamente cuando se cierra la pestaña"
+
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "Mostrar información _detallada"

-#: ../pidgin/gtkprefs.c:1001
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"

-#: ../pidgin/gtkprefs.c:1008
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les esté escribiendo"

-#: ../pidgin/gtkprefs.c:1011
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografía"

-#: ../pidgin/gtkprefs.c:1015
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"

-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"

-#: ../pidgin/gtkprefs.c:1020
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar las nuevas ventana de conversación"

-#: ../pidgin/gtkprefs.c:1024
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "Tipografía"

-#: ../pidgin/gtkprefs.c:1026
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr "Utilizar la tipografía de documento del _tema"

-#: ../pidgin/gtkprefs.c:1028
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "Utilizar la tipografía del _tema"

-#: ../pidgin/gtkprefs.c:1030
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "Tipografía para las conversaciones:"

-#: ../pidgin/gtkprefs.c:1044
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "Formato por omisión"

-#: ../pidgin/gtkprefs.c:1063
+#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16438,63 +16757,63 @@
 "Así se verá el texto de los mensajes que envíe cuando utilice protocolos que "
 "soportan el formateo."

-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
 msgstr "No se pudo iniciar el programa de configuración de proxy."

-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1082
 msgid "Cannot start browser configuration program."
 msgstr "No se pudo iniciar el programa de configuración del navegador."

-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"

-#: ../pidgin/gtkprefs.c:1167
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"

-#: ../pidgin/gtkprefs.c:1171
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la dirección IP"

-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "_IP pública:"

-#: ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "Puertos"

-#: ../pidgin/gtkprefs.c:1214
+#: ../pidgin/gtkprefs.c:1161
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activar reenvío de puertos automático"

-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"

-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "Puerto _inicial:"

-#: ../pidgin/gtkprefs.c:1227
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "Puerto _final:"

-#: ../pidgin/gtkprefs.c:1235
+#: ../pidgin/gtkprefs.c:1182
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy y navegador"

-#: ../pidgin/gtkprefs.c:1243
+#: ../pidgin/gtkprefs.c:1190
 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:1251
+#: ../pidgin/gtkprefs.c:1198
 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:1256
+#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16502,95 +16821,99 @@
 "Puede configurar las preferencias del proxy y del navegador\n"
 "en las preferencias de GNOME."

-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "Configurar _proxy"

-#: ../pidgin/gtkprefs.c:1268
+#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "Configurar _navegador"

-#: ../pidgin/gtkprefs.c:1274
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "Servidor proxy"

-#: ../pidgin/gtkprefs.c:1279
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "Sin proxy"

-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "_Usuario:"

-#: ../pidgin/gtkprefs.c:1423
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"

-#: ../pidgin/gtkprefs.c:1424
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"

-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"

-#: ../pidgin/gtkprefs.c:1426
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"

-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"

-#: ../pidgin/gtkprefs.c:1428
+#: ../pidgin/gtkprefs.c:1375
+msgid "Desktop Default"
+msgstr "Valores por omisión del escritorio"
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "Valores por omisión de Gnome"

-#: ../pidgin/gtkprefs.c:1429
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"

-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"

-#: ../pidgin/gtkprefs.c:1431
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"

-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"

-#: ../pidgin/gtkprefs.c:1441
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "Manual"

-#: ../pidgin/gtkprefs.c:1494
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "Selección de navegador"

-#: ../pidgin/gtkprefs.c:1498
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "_Navegador:"

-#: ../pidgin/gtkprefs.c:1506
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"

-#: ../pidgin/gtkprefs.c:1508
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "Navegador por omisión"

-#: ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "Ventana existente"

-#: ../pidgin/gtkprefs.c:1511
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "Nueva solapa"

-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16599,63 +16922,63 @@
 "_Manual:\n"
 "(%s para URL)"

-#: ../pidgin/gtkprefs.c:1566
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "Formato de _registro:"

-#: ../pidgin/gtkprefs.c:1571
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantáneos"

-#: ../pidgin/gtkprefs.c:1573
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"

-#: ../pidgin/gtkprefs.c:1575
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"

-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "Selección de sonido"

-#: ../pidgin/gtkprefs.c:1735
+#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "El más silencioso"

-#: ../pidgin/gtkprefs.c:1737
+#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "Más silencioso"

-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "Silencio"

-#: ../pidgin/gtkprefs.c:1743
+#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "Ruidoso"

-#: ../pidgin/gtkprefs.c:1745
+#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "Más ruidoso"

-#: ../pidgin/gtkprefs.c:1747
+#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "El más ruidoso"

-#: ../pidgin/gtkprefs.c:1813
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_Método:"

-#: ../pidgin/gtkprefs.c:1815
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "Timbre de la consola"

-#: ../pidgin/gtkprefs.c:1822
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "Sin sonido"

-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16664,203 +16987,202 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"

-#: ../pidgin/gtkprefs.c:1857
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversación obtiene el _foco"

-#: ../pidgin/gtkprefs.c:1859
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "Habilitar sonidos:"

-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "Volumen:"

-#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "Reproducir"

-#: ../pidgin/gtkprefs.c:2028
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"

-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratón"

-#: ../pidgin/gtkprefs.c:2042
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"

-#: ../pidgin/gtkprefs.c:2046
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"

 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2052
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "Auto-ausencia"

-#: ../pidgin/gtkprefs.c:2054
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando esté _inactivo"

-#: ../pidgin/gtkprefs.c:2058
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"

-#: ../pidgin/gtkprefs.c:2066
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"

 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2087
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "Estado al arrancar"

-#: ../pidgin/gtkprefs.c:2089
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi última _salida al empezar"

-#: ../pidgin/gtkprefs.c:2095
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"

-#: ../pidgin/gtkprefs.c:2134
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "Interfaz"

-#: ../pidgin/gtkprefs.c:2136
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"

-#: ../pidgin/gtkprefs.c:2143
+#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "Navegador"

-#: ../pidgin/gtkprefs.c:2147
+#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"

-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"

-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Permitir sólo a los usuarios en mi lista de amigos"

-#: ../pidgin/gtkprivacy.c:82
-msgid "Allow only the users below"
-msgstr "Permitir sólo a los siguientes usuarios"
-
 #: ../pidgin/gtkprivacy.c:83
+msgid "Allow only the users below"
+msgstr "Permitir sólo a los siguientes usuarios"
+
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Bloquear todos los usuarios"

-#: ../pidgin/gtkprivacy.c:84
+#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Bloquear sólo los siguientes usuarios"

-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Privacidad"

-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Los cambios a la configuración de privacidad tienen efecto inmediatamente."

-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Establecer privacidad para:"

-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+msgid "Remove Al_l"
+msgstr "Quitar to_do"
+
+#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Permitir al usuario"

-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario al que le permita contactar con vd."

-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Introduzca el nombre de usuario al que quiere permitir que contacte con vd."

-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Permitir"

-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "¿Permitir a %s contactar con vd.?"

-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "¿Está seguro que quiere permitir que %s le contacte?"

-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Bloquear al usuario"

-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."

-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."

-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"

-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "¿Está seguro de que quiere bloquear a %s?"

-#: ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Aplicar"

-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"

-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"

-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "Sobreescribir"

-#: ../pidgin/gtkrequest.c:1513
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"

-#: ../pidgin/gtkrequest.c:1651 ../pidgin/gtkrequest.c:1665
+#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."

-#. Create the window.
-#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
-msgid "Room List"
-msgstr "Lista de salas"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:756
+#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Obtener la lista"

 #. add button
-#: ../pidgin/gtkroomlist.c:764
+#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Añadir chat"

@@ -16869,72 +17191,72 @@
 msgstr "¿Está seguro que desea borrar los estados guardados y seleccionados?"

 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Usar"

-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ya se está utilizando ese título. Debe elegir un título único."

-#: ../pidgin/gtksavedstatuses.c:976
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Diferente"

-#: ../pidgin/gtksavedstatuses.c:1165
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Título:"

-#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
+#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "E_stado:"

 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1217
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"

 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1281
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"

-#: ../pidgin/gtksavedstatuses.c:1488
+#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"

-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "Esperando la conexión a la red"

-#: ../pidgin/gtkstatusbox.c:1072
+#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "Nuevo estado..."

-#: ../pidgin/gtkstatusbox.c:1073
+#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "Estados guardados..."

-#: ../pidgin/gtkutils.c:634
+#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"

-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
 #, 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:1404 ../pidgin/gtkutils.c:1426
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"

-#: ../pidgin/gtkutils.c:1500
+#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."

-#: ../pidgin/gtkutils.c:1501
+#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16943,12 +17265,12 @@
 "%s no puede transferir una carpeta. Tendrá que enviar los archivos que "
 "contiene individualmente."

-#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
-#: ../pidgin/gtkutils.c:1554
+#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"

-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1585
 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."
@@ -16956,23 +17278,23 @@
 "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:1542 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"

-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"

-#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"

-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1597
 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:1555
+#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16980,7 +17302,7 @@
 "Puede enviar esta imagen como una transferencia de archivo, o usarla como "
 "icono de amigo para este usuario."

-#: ../pidgin/gtkutils.c:1556
+#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16993,11 +17315,11 @@
 #. * 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:1615
+#: ../pidgin/gtkutils.c:1664
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"

-#: ../pidgin/gtkutils.c:1615
+#: ../pidgin/gtkutils.c:1664
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -17005,7 +17327,7 @@
 "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
 "a lo que apunta el lanzador más que el lanzador en sí."

-#: ../pidgin/gtkutils.c:2350
+#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17016,27 +17338,27 @@
 "<b>Tamaño de archivo:</b> %s\n"
 "<b>Tamaño de imagen:</b> %dx%d"

-#: ../pidgin/gtkutils.c:2646
+#: ../pidgin/gtkutils.c:2704
 #, 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:2648
+#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "Error en icono"

-#: ../pidgin/gtkutils.c:2649
+#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"

-#: ../pidgin/gtkutils.c:2749
+#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo «%s»: %s"

-#: ../pidgin/gtkutils.c:2798
+#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17076,6 +17398,10 @@
 msgid "_Open Mail"
 msgstr "_Abrir correo"

+#: ../pidgin/pidgintooltip.c:100
+msgid "Pidgin Tooltip"
+msgstr "Consejos de Pidgin"
+
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Emoticonos de Pidgin"
@@ -17092,35 +17418,31 @@
 msgid "none"
 msgstr "ninguno"

-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr "Mostrar estadísticas"
-
-#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
+#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Probabilidad de respuesta"

-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Configuración de estadísticas"

 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Tiempo de espera máximo para respuestas:"

-#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:148
+#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutos"

 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Diferencia máxima de «visto por última vez»:"

 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Umbral:"

@@ -17130,18 +17452,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "Predicción de disponibilidad de contactos"

 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:940
+#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predicción de disponibilidad de contactos."

 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:941
+#: ../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."
@@ -17248,20 +17570,20 @@
 msgid "Received Messages"
 msgstr "Mensajes recibidos"

-#: ../pidgin/plugins/convcolors.c:218 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar el color para %s"

-#: ../pidgin/plugins/convcolors.c:367
+#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Ignorar formato entrante"

-#: ../pidgin/plugins/convcolors.c:368
+#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Aplicar en los chats"

-#: ../pidgin/plugins/convcolors.c:369
+#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Aplicar en los MIs"

@@ -17374,26 +17696,26 @@
 msgstr "Mensajería Instantáneos"

 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccione una persona de su agenda mostrada abajo, o añada una nueva "
 "persona."

-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Grupo:"

 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Nueva persona"

 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"

@@ -17416,34 +17738,34 @@
 msgid "_Associate Buddy"
 msgstr "_Asociar amigo"

-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:242
+#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send e-mail"
 msgstr "No se pudo enviar el correo electrónico"

-#: ../pidgin/plugins/gevolution/gevolution.c:241
+#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "No se encontró el ejecutable de Evolution en la ruta."

-#: ../pidgin/plugins/gevolution/gevolution.c:247
+#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An e-mail address was not found for this buddy."
 msgstr "No se ha encontrado una dirección de correo para este amigo."

-#: ../pidgin/plugins/gevolution/gevolution.c:273
+#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Añadir a la agenda"

-#: ../pidgin/plugins/gevolution/gevolution.c:285
+#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send E-Mail"
 msgstr "Enviar correo electrónico"

 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
+#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Configuración de la integración con Evolution"

 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
+#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccione todas las cuentas a los que los amigos se añadirán de forma "
@@ -17455,7 +17777,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
+#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Integración con Evolution"

@@ -17463,38 +17785,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
 #: ../pidgin/plugins/gevolution/gevolution.c:532
+#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Introduzca la información de la persona a continuación."

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
+#: ../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."

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo de cuenta:"

 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "Información opcional:"

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "Nombre:"

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "Apellidos:"

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "E-mail:"
 msgstr "Correo electrónico:"

@@ -17728,7 +18050,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
+#: ../pidgin/plugins/notify.c:905
 msgid "Message Notification"
 msgstr "Notificación de mensajes"

@@ -17736,7 +18058,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:908 ../pidgin/plugins/notify.c:910
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -17772,52 +18094,56 @@
 "- Envía un mensaje a las personas en su lista inmediatamente cuando se "
 "conectan"

-#: ../pidgin/plugins/pidginrc.c:41
+#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Color del puntero"

-#: ../pidgin/plugins/pidginrc.c:42
+#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Color secundario del puntero"

-#: ../pidgin/plugins/pidginrc.c:43
+#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Color de hiperenlace"

 #: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr "Color para mensajes resaltados por nombre"
+
+#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separación horizontal GtkTreeView"

-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Entrada de conversaciones"

-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Diálogo de solicitud"

-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Diálogo de notificación"

-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Seleccionar el color"

-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:306
 msgid "Select Interface Font"
 msgstr "Seleccionar tipografía de la interfaz"

-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipografía para %s"

-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "Tipografía de la interfaz GTK+"

-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"

@@ -17841,36 +18167,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Colores de la interfaz"

-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Tamaño de los controles"

-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Tipografía"

-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Herramientas de ficheros Gtkrc"

-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Escribir la configuración en %s%sgtkrc-2.0"

-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Volver a leer archivos de configuración gtkrc"

-#: ../pidgin/plugins/pidginrc.c:543
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de tema GTK+ de Pidgin"

-#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
+#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 "Da acceso a los parámetros de configuración de gtkrc que se utilizan "
@@ -17937,70 +18263,70 @@
 "Comprueba periódicamente si hay nuevas versiones disponibles y notifica al "
 "usuario mostrándole el registro de cambios."

-#: ../pidgin/plugins/spellchk.c:1962
+#: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "Corrección duplicada"

-#: ../pidgin/plugins/spellchk.c:1963
+#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "La palabra específica ya existe en la lista de corrección."

-#: ../pidgin/plugins/spellchk.c:2177
+#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "Reemplazos de texto"

-#: ../pidgin/plugins/spellchk.c:2200
+#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "Usted escribe"

-#: ../pidgin/plugins/spellchk.c:2214
+#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "Usted envía"

-#: ../pidgin/plugins/spellchk.c:2228
+#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "Solamente palabras enteras"

-#: ../pidgin/plugins/spellchk.c:2240
+#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "Distingue mayúsculas de minúsculas"

-#: ../pidgin/plugins/spellchk.c:2266
+#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "Añadir una regla nueva de reemplazo de texto"

-#: ../pidgin/plugins/spellchk.c:2282
+#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "Usted _escribe:"

-#: ../pidgin/plugins/spellchk.c:2299
+#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "Usted _envía:"

 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#: ../pidgin/plugins/spellchk.c:2296
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Ajustar al formato _exacto (desmarcar para gestionar mayúsculas y minúsculas "
 "automáticamente)"

-#: ../pidgin/plugins/spellchk.c:2313
+#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "Reemplazar solamente palabras _enteras"

-#: ../pidgin/plugins/spellchk.c:2338
+#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "Opciones de reemplazos de texto general"

-#: ../pidgin/plugins/spellchk.c:2339
+#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "Habilitar la sustitución de la última palabra al enviar"

-#: ../pidgin/plugins/spellchk.c:2372
+#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "Reemplazo de texto"

-#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
+#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Reemplaza el texto de los mensajes salientes según las reglas definidas por "
@@ -18274,6 +18600,74 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."

+#~ msgid "Pounce only when my status is not available"
+#~ msgstr "Sólo avisar cuando mi estado es «no disponible»"
+
+#~ msgid "Current media"
+#~ msgstr "Medio actual"
+
+#~ msgid ""
+#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
+#~ "supported by MySpace."
+#~ msgstr ""
+#~ "Lo siento, MySpace no permite el uso de contraseñas de más de %d "
+#~ "caracteres de longitud (la suya tiene %d)."
+
+#~ msgid ""
+#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+#~ "username and choose a username and try to login again."
+#~ msgstr ""
+#~ "Por favor, vaya a http://editprofile.myspace.com/index.cfm?"
+#~ "fuseaction=profile.username, escoja un nombre de usuario e intente "
+#~ "conectarse de nuevo."
+
+#~ msgid "Screen name sent"
+#~ msgstr "Se ha enviado el nombre de usuario"
+
+#~ msgid "Screen name"
+#~ msgstr "Nombre de usuario"
+
+#~ msgid "Use recent buddies group"
+#~ msgstr "Usar grupo de amigos reciente"
+
+#~ msgid "Show how long you have been idle"
+#~ msgstr "Mostrar cuánto tiempo se ha estado inactivo"
+
+#~ msgid "Cannot find/access ~/.silc directory"
+#~ msgstr "No se puede encontrar o acceder al directorio ~/.silc"
+
+#~ msgid "%s changed status from %s to %s"
+#~ msgstr "el estado de %s cambió de %s a %s"
+
+#~ msgid "%s is now %s"
+#~ msgstr "%s es ahora %s"
+
+#~ msgid "%s is no longer %s"
+#~ msgstr "%s ya no está %s "
+
+#~ msgid "_Merge"
+#~ msgstr "_Fusionar"
+
+#~ msgid ""
+#~ "Please enter the screen name of the person you would like to add to your "
+#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
+#~ "buddy. The alias will be displayed in place of the screen name whenever "
+#~ "possible.\n"
+#~ msgstr ""
+#~ "Introduzca el nombre de usuario de la persona que usted quiere añadir a "
+#~ "la lista. Puede, opcionalmente, introducir un sobrenombre o apodo. El "
+#~ "sobrenombre se mostrará en lugar del nombre de usuario siempre que sea "
+#~ "posible.\n"
+
+#~ msgid "A_ccount:"
+#~ msgstr "_Cuenta:"
+
+#~ msgid "User has typed something and stopped"
+#~ msgstr "El usuario ha escrito algo y ha parado"
+
+#~ msgid "Display Statistics"
+#~ msgstr "Mostrar estadísticas"
+
 #~ msgid "Sort by status"
 #~ msgstr "Ordenar por estado"

@@ -18308,9 +18702,6 @@
 #~ msgid "Add Buddy _Pounce"
 #~ msgstr "Añadir _aviso de amigo"

-#~ msgid "Add a _Buddy"
-#~ msgstr "Añadir un _amigo"
-
 #~ msgid "Add a C_hat"
 #~ msgstr "Añadir un _chat"

@@ -18421,9 +18812,6 @@
 #~ msgid "Socket send error"
 #~ msgstr "Error de envío al socket"

-#~ msgid "Connection refused"
-#~ msgstr "Conexión rehusada"
-
 #~ msgid "Norwegian"
 #~ msgstr "Noruego"

@@ -18893,13 +19281,6 @@
 #~ msgid "Invalid Username"
 #~ msgstr "Nombre de usuario no válido"

-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<B>Apodo:</b> %s<br>"

@@ -19028,12 +19409,6 @@
 #~ msgid "Wrong Password"
 #~ msgstr "Contraseña errónea"

-#~ msgid "Message (optional) :"
-#~ msgstr "Mensaje (opcional) :"
-
-#~ msgid "Invalid username."
-#~ msgstr "Nombre de usuario no válido."
-
 #~ msgid "<b>IP Address:</b> %s<br>"
 #~ msgstr "<b>Dirección IP:</b> %s<br>"

@@ -19298,9 +19673,6 @@
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "El chat no está disponible"

-#~ msgid "Unable to login to AIM"
-#~ msgstr "No se pudo conectar con AIM"
-
 #~ msgid ""
 #~ "Transfer of file %s timed out.\n"
 #~ " Try enabling proxy servers for file transfers in Accounts->%s->Edit "
@@ -19373,9 +19745,6 @@
 #~ msgid " left the room (%s)."
 #~ msgstr " salió de la sala (%s)."

-#~ msgid "Conversation in %s on %s"
-#~ msgstr "Conversaciones en %s sobre %s"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">De:</span> %s\n"

@@ -19468,9 +19837,6 @@
 #~ msgid "Permit"
 #~ msgstr "Permitir"

-#~ msgid "Accept Defaults"
-#~ msgstr "Aceptar valores por omisión"
-
 #~ msgid ""
 #~ "Transfer of file %s timed out.\n"
 #~ " Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
@@ -21678,9 +22044,6 @@
 #~ msgid "I'm Back"
 #~ msgstr "¡Ya he vuelto!"

-#~ msgid "Buddy"
-#~ msgstr "Amigo"
-
 #~ msgid "[Click to edit]"
 #~ msgstr "[Haga click para editar]"